blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-05 14:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed method getOERoot of MessageToken_model and method redirectByToken of controller to retrive the correct root of the organisation unit tree

Browse Source
This commit is contained in:
Paolo
2017-11-16 16:41:20 +01:00
parent 8ca79b6657
commit 50b26ce762
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Redirect.php
+7 -14
View File
@@ -53,22 +53,15 @@ class Redirect extends FHC_Controller
if ($oe_kurzbz != null && $oe_kurzbz != '')
{
$organisationRoot = null;
$getOERoot = $this->MessageTokenModel->getOERoot($oe_kurzbz);
if ($getOERoot) // If no errors occurred
if (isSuccess($getOERoot)) // If no errors occurred
{
// If data are present
if (is_array($getOERoot->result()) && count($getOERoot->result()) > 0)
{
$organisationseinheit = $getOERoot->result()[0];
if ($organisationseinheit->oe_kurzbz == null)
{
show_error('No organisation unit present in the message');
}
else
{
$organisationRoot = $organisationseinheit->oe_kurzbz;
}
}
$organisationRoot = $getOERoot->retval;
}
else
{
show_error('No organisation unit present in the message');
}
$addonAufnahmeUrls = $this->config->item('addons_aufnahme_url');
application/models/system/MessageToken_model.php
+13 -9
View File
@@ -237,17 +237,21 @@ class MessageToken_model extends CI_Model
if ($result) // If no errors occurred
{
// If data are present
if (is_array($result->result()) && count($result->result()) > 0)
if (is_array($result->result())
&& count($result->result()) > 0
&& is_object($result->result()[0])
&& isset($result->result()[0]->oe_kurzbz))
{
$organisationseinheit = $result->result()[0];
// If this organisationseinheit has a parent
if ($organisationseinheit->oe_parent_kurzbz != null)
{
// looks for the parent
$result = $this->getOERoot($organisationseinheit->oe_parent_kurzbz);
}
return success($result->result()[0]->oe_kurzbz);
}
else
{
return error();
}
}
else
{
return error($this->db->error());
}
return $result;