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

- Added new model CL/Messages_model.php

Browse Source 
- Moved logic from controllers system/Messages and ViewMessage to CL/Messages_model
- Better code
- MessageLib and PersonLogLib methods do not use anymore show_error and return success/error object
- helpers/hlp_message_helper: hasData function changed
This commit is contained in:
Paolo
2019-02-25 15:23:31 +01:00
parent 0645095af0
commit 2d7cc09d02
8 changed files with 320 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/MessageLib.php
+14 -18
View File
@@ -760,23 +760,23 @@ class MessageLib
public function getMessageVarsPerson()
{
$variablesArray = array();
$variables = $this->_ci->MessageModel->getMessageVarsPerson();
$variables = $this->_ci->MessageModel->getMessageVarsPerson();
if (isError($variables))
{
show_error($variables->retval);
return $variables;
}
elseif (hasData($variables))
{
$tmpVariablesArray = getData($variables);
// Skip person_id
for ($i = 1; $i < count($variables->retval); $i++)
for ($i = 1; $i < count($tmpVariablesArray); $i++)
{
$variablesArray['{'.str_replace(' ', '_', strtolower($variables->retval[$i])).'}'] = $variables->retval[$i];
$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}'] = $tmpVariablesArray[$i];
}
array_shift($variables->retval); // Remove person_id
}
return $variablesArray;
return success($variablesArray);
}
/**
@@ -787,20 +787,21 @@ class MessageLib
$oe_kurzbz = array();
$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
$benutzerResult = $this->_ci->BenutzerfunktionModel->getByPersonId($sender_id);
if (isError($benutzerResult))
$benutzer = $this->_ci->BenutzerfunktionModel->getByPersonId($sender_id);
if (isError($benutzer))
{
show_error($benutzerResult->retval);
return $benutzer;
}
elseif (hasData($benutzerResult))
elseif (hasData($benutzer))
{
foreach ($benutzerResult->retval as $val)
foreach (getData($benutzer) as $val)
{
$oe_kurzbz[] = $val->oe_kurzbz;
}
}
return $oe_kurzbz;
return success($oe_kurzbz);
}
/**
@@ -809,13 +810,8 @@ class MessageLib
public function getIsAdmin($sender_id)
{
$this->_ci->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
$isAdmin = $this->_ci->BenutzerrolleModel->isAdminByPersonId($sender_id);
if (isError($isAdmin))
{
show_error($isAdmin->retval);
}
return $isAdmin->retval;
return $this->_ci->BenutzerrolleModel->isAdminByPersonId($sender_id);
}
//------------------------------------------------------------------------------------------------------------------