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

- Better code

Browse Source 
- Better errors handling
- Fixed include path for view messageList.php
This commit is contained in:
Paolo
2019-02-15 14:37:14 +01:00
parent fad7894ec8
commit f3bc764930
4 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+9 -3
View File
@@ -124,6 +124,7 @@ class Messages extends Auth_Controller
}
$send = $this->_send($msgVarsData, null, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
if (isError($send))
{
$this->outputJsonError($send->retval);
@@ -148,6 +149,7 @@ class Messages extends Auth_Controller
$body = $this->input->post('body');
$authUser = $this->_getAuthUser();
if (isError($authUser)) return $authUser;
$sender_id = getData($authUser)[0]->person_id;
@@ -172,7 +174,7 @@ class Messages extends Auth_Controller
// Send with vorlage
else
{
if (isset($msgVars) && is_array($msgVars))
if (is_array($msgVars))
{
// Additional message variables
foreach ($msgVars as $key => $msgvar)
@@ -186,7 +188,7 @@ class Messages extends Auth_Controller
if (isError($msg)) return $msg;
//write log entry
$this->personloglib->log(
$personLog = $this->personloglib->log(
$msgVarsDataArray['person_id'],
'Action',
array(
@@ -201,7 +203,11 @@ class Messages extends Auth_Controller
);
}
return success('success');
return success('Messages sent successfully');
}
else
{
return $msgVarsData;
}
}
application/controllers/system/infocenter/InfoCenter.php
+1 -1
View File
@@ -631,7 +631,7 @@ class InfoCenter extends Auth_Controller
public function reloadMessages($person_id)
{
$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
$this->load->view('system/messageList.php', array('messages' => $messages->retval));
$this->load->view('system/messages/messageList.php', array('messages' => $messages->retval));
}
/**