blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 16:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added private method _replaceKeys to controller system/Messages.php

Browse Source 
- Fixed replacement of keys in the message vars array
This commit is contained in:
Paolo
2019-02-15 15:30:04 +01:00
parent f3bc764930
commit a913482ef4
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+21 -5
View File
@@ -108,6 +108,7 @@ class Messages extends Auth_Controller
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
$prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
// Adds the organisation unit to each prestudent
if (isEmptyString($oe_kurzbz) && hasData($msgVarsData) && hasData($prestudentsData))
{
for ($i = 0; $i < count($msgVarsData->retval); $i++)
@@ -124,7 +125,6 @@ class Messages extends Auth_Controller
}
$send = $this->_send($msgVarsData, null, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
if (isError($send))
{
$this->outputJsonError($send->retval);
@@ -154,7 +154,7 @@ class Messages extends Auth_Controller
$sender_id = getData($authUser)[0]->person_id;
// send message(s)
// Send message(s)
if (hasData($msgVarsData))
{
// Loads the person log library
@@ -163,7 +163,7 @@ class Messages extends Auth_Controller
for ($i = 0; $i < count($msgVarsData->retval); $i++)
{
$parsedText = "";
$msgVarsDataArray = (array)$msgVarsData->retval[$i];
$msgVarsDataArray = $this->_replaceKeys((array)$msgVarsData->retval[$i]); // replaces array keys
// Send without vorlage
if (isEmptyString($vorlage_kurzbz))
@@ -187,7 +187,7 @@ class Messages extends Auth_Controller
if (isError($msg)) return $msg;
//write log entry
// Write log entry
$personLog = $this->personloglib->log(
$msgVarsDataArray['person_id'],
'Action',
@@ -266,7 +266,7 @@ class Messages extends Auth_Controller
}
else
{
$parsedText = $this->messagelib->parseMessageText($text, (array)$data->retval[0]);
$parsedText = $this->messagelib->parseMessageText($text, $this->_replaceKeys((array)$data->retval[0]));
$this->outputJsonSuccess($parsedText);
}
@@ -320,4 +320,20 @@ class Messages extends Auth_Controller
return $authUser;
}
/**
*
*/
private function _replaceKeys($data)
{
$tmpData = array();
// Replaces data array keys to a lowercase without spaces string
foreach ($data as $key => $val)
{
$tmpData[str_replace(' ', '_', strtolower($key))] = $val;
}
return $tmpData;
}
}
application/libraries/MessageLib.php
+1 -9
View File
@@ -750,15 +750,7 @@ class MessageLib
*/
public function parseMessageText($text, $data = array())
{
$tmpData = array();
// Replaces data array keys to a lowercase without spaces string
foreach ($data as $key => $val)
{
$tmpData[str_replace(' ', '_', strtolower($key))] = $data[$key];
}
return $this->_ci->parser->parse_string($text, $tmpData, true);
return $this->_ci->parser->parse_string($text, $data, true);
}
/**