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

- Create new function getError in helper hlp_return_object_helper that should just returns retval

Browse Source 
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
This commit is contained in:
Paolo
2019-12-18 18:35:19 +01:00
parent 8f3aadd3e2
commit 4e6fc7c607
32 changed files with 174 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Redirect.php
+1 -1
View File
@@ -39,7 +39,7 @@ class Redirect extends FHC_Controller
$msg = $this->MessageTokenModel->getMessageByToken($token);
if ($msg->error)
{
show_error($msg->retval);
show_error(getError($msg));
}
$oe_kurzbz = $msg->retval[0]->oe_kurzbz;
application/controllers/ViewMessage.php
+3 -3
View File
@@ -46,7 +46,7 @@ class ViewMessage extends FHC_Controller
if ($msg->error)
{
show_error(getData($msg));
show_error(getError($msg));
}
if (is_array(getData($msg)) && count(getData($msg)) > 0)
@@ -55,7 +55,7 @@ class ViewMessage extends FHC_Controller
if (isError($setReadMessageStatusByToken))
{
show_error($msg->$setReadMessageStatusByToken);
show_error($msg);
}
$sender_id = getData($msg)[0]->sender_id;
@@ -144,7 +144,7 @@ class ViewMessage extends FHC_Controller
$sendReply = $this->CLMessagesModel->sendReply($subject, $body, $persons, $relationmessage_id, $token);
if (isError($sendReply))
{
show_error(getData($sendReply));
show_error(getError($sendReply));
}
$this->load->view('system/messages/messageReplySent');
application/controllers/crm/Statusgrund.php
+10 -10
View File
@@ -35,7 +35,7 @@ class Statusgrund extends Auth_Controller
$status = $this->StatusModel->load();
if ($status->error)
{
show_error($status->retval);
show_error(getError($status));
}
$data = array (
@@ -50,7 +50,7 @@ class Statusgrund extends Auth_Controller
$statusGrund = $this->StatusgrundModel->loadWhere(array("status_kurzbz" => $status_kurzbz));
if ($statusGrund->error)
{
show_error($statusGrund->retval);
show_error(getError($statusGrund));
}
$data = array (
@@ -66,13 +66,13 @@ class Statusgrund extends Auth_Controller
$statusGrund = $this->StatusgrundModel->load($statusgrund_id);
if ($statusGrund->error)
{
show_error($statusGrund->retval);
show_error(getError($statusGrund));
}
$sprache = $this->SpracheModel->loadWhere(array('content' => true));
if ($sprache->error)
{
show_error($sprache->retval);
show_error(getError($sprache));
}
$data = array (
@@ -89,13 +89,13 @@ class Statusgrund extends Auth_Controller
$status = $this->StatusModel->load($status_id);
if ($status->error)
{
show_error($status->retval);
show_error(getError($status));
}
$sprache = $this->SpracheModel->loadWhere(array('content' => true));
if ($sprache->error)
{
show_error($sprache->retval);
show_error(getError($sprache));
}
$data = array (
@@ -112,7 +112,7 @@ class Statusgrund extends Auth_Controller
$sprache = $this->SpracheModel->loadWhere(array('content' => true));
if ($sprache->error)
{
show_error($sprache->retval);
show_error(getError($sprache));
}
$data = array (
@@ -184,7 +184,7 @@ class Statusgrund extends Auth_Controller
if ($statusgrund->error)
{
show_error($statusgrund->retval);
show_error(getError($statusgrund));
}
redirect("/crm/Statusgrund/editGrund/" . $statusgrund_id . "/" . true);
@@ -252,7 +252,7 @@ class Statusgrund extends Auth_Controller
if ($statusgrund->error)
{
show_error($statusgrund->retval);
show_error(getError($statusgrund));
}
redirect("/crm/Statusgrund/editGrund/" . $statusgrund->retval . "/" . true);
@@ -297,7 +297,7 @@ class Statusgrund extends Auth_Controller
if ($status->error)
{
show_error($status->retval);
show_error(getError($status));
}
redirect("/crm/Statusgrund/editStatus/" . $status_kurzbz . "/" . true);
application/controllers/jobs/AmpelMail.php
+2 -2
View File
@@ -121,13 +121,13 @@ class AmpelMail extends CLI_Controller
}
elseif (isError($result_ampel_user))
{
show_error($result_ampel_user->error);
show_error(getError($result_ampel_user));
}
}
}
elseif (isError($result_active_ampeln))
{
show_error($result_active_ampeln->error);
show_error(getError($result_active_ampeln));
}
// Send mails for new ampeln merged by user
application/controllers/jobs/Prestudentstatus.php
+1 -1
View File
@@ -109,7 +109,7 @@ class Prestudentstatus extends CLI_Controller
}
else
{
show_error($status->retval);
show_error(getError($status));
}
echo "Corrected:".$sum_corrected."\n";
echo "Not Corrected:".$sum_notcorrected."\n";
application/controllers/jobs/ReihungstestJob.php
+12 -13
View File
@@ -35,7 +35,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($result))
{
show_error($result->error);
show_error(getError($result));
}
// Get free places
@@ -48,7 +48,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($result))
{
show_error($result->error);
show_error(getError($result));
}
// Prepare data for mail template 'ReihungstestJob'
@@ -103,7 +103,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($result))
{
show_error($result->error);
show_error(getError($result));
}
$applicants_arr = array();
@@ -118,7 +118,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($applicants))
{
show_error($applicants->error);
show_error(getError($applicants));
}
// Get all Bachelor-Degree-Programs with Mailadress
@@ -131,7 +131,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($bachelorStudiengeange))
{
show_error($bachelorStudiengeange->error);
show_error(getError($bachelorStudiengeange));
}
// If a person ist an applicant of this degree-program send mail with application data
@@ -222,7 +222,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($result))
{
show_error($result->error);
show_error(getError($result));
}
$studiengang = '';
@@ -382,7 +382,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($resultTestsOnDate))
{
show_error($resultTestsOnDate->error);
show_error(getError($resultTestsOnDate));
}
}
@@ -399,7 +399,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($applicants))
{
show_error($applicants->error);
show_error(getError($applicants));
}
foreach ($applicants_arr as $applicant)
@@ -479,7 +479,7 @@ class ReihungstestJob extends CLI_Controller
}
elseif (isError($yesterdays_applicants_arr))
{
show_error($yesterdays_applicants_arr->error);
show_error(getError($yesterdays_applicants_arr));
}
// Get all other prestudenten of the given persons.
@@ -503,7 +503,7 @@ class ReihungstestJob extends CLI_Controller
// Store them, if they have already absolved a placement test in the same study term they have applied for.
$placement_absolvents_arr = $this->PrestudentModel->loadWhere('
person_id IN (' . implode(', ', $person_id_arr) . ') AND
typ = \'b\' AND
typ = \'b\' AND
teilgenommen = \'t\' AND
tbl_reihungstest.studiensemester_kurzbz IN (
SELECT
@@ -548,7 +548,7 @@ class ReihungstestJob extends CLI_Controller
$to = ''; // mail recipient (stg assistance)
$content_arr = array(); // url paths to the new applicants
$base_link = base_url('vilesci/stammdaten/auswertung_fhtw.php');
$i = 0; // loop counter
$len = count($result_arr);
@@ -569,7 +569,7 @@ class ReihungstestJob extends CLI_Controller
{
// Prepare content for mail template
$content_data_arr = $this->_getContentDataNewApplicant($content_arr);
// Send mail
sendSanchoMail(
'BewerberNachReihungstest',
@@ -786,4 +786,3 @@ class ReihungstestJob extends CLI_Controller
}
}
}
application/controllers/lehre/lehrauftrag/Lehrauftrag.php
+1 -1
View File
@@ -114,7 +114,7 @@ class Lehrauftrag extends Auth_Controller
}
elseif (isError($studiensemester))
{
show_error($studiensemester->error);
show_error(getError($studiensemester));
}
}
application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
+7 -7
View File
@@ -78,7 +78,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
}
elseif (isError($studiensemester))
{
show_error($studiensemester->error);
show_error(getError($studiensemester));
}
}
@@ -138,17 +138,17 @@ class LehrauftragAkzeptieren extends Auth_Controller
}
else
{
show_error($result->retval);
show_error(getError($result));
}
}
else
{
show_error($result->retval);
show_error(getError($result));
}
// Set status to accepted
$result = $this->VertragvertragsstatusModel->setStatus($vertrag_id, $this->_uid, 'akzeptiert');
if ($result->retval)
{
$json []= array(
@@ -165,7 +165,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
}
}
}
/**
* Check if lectors latest active Verwendung has inkludierte Lehre
* - inkludierte_lehre is null OR 0: freelancer lector -> has NO inkludierte Lehre
@@ -175,14 +175,14 @@ class LehrauftragAkzeptieren extends Auth_Controller
public function checkInkludierteLehre()
{
$result = $this->BisverwendungModel->getLast($this->_uid);
if (hasData($result))
{
$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
}
else
{
$this->outputJsonError($result->retval);
$this->outputJsonError(getError($result));
}
}
application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
+6 -6
View File
@@ -97,7 +97,7 @@ class LehrauftragErteilen extends Auth_Controller
}
elseif (isError($studiensemester))
{
show_error($studiensemester->error);
show_error(getError($studiensemester));
}
}
@@ -122,10 +122,10 @@ class LehrauftragErteilen extends Auth_Controller
public function approveLehrauftrag()
{
$lehrauftrag_arr = json_decode($this->input->post('selected_data'));
if (is_array($lehrauftrag_arr))
if (is_array($lehrauftrag_arr))
{
foreach ($lehrauftrag_arr as $lehrauftrag)
foreach ($lehrauftrag_arr as $lehrauftrag)
{
$mitarbeiter_uid = (isset($lehrauftrag->mitarbeiter_uid)) ? $lehrauftrag->mitarbeiter_uid : null;
$vertrag_id = (isset($lehrauftrag->vertrag_id)) ? $lehrauftrag->vertrag_id : null;
@@ -146,12 +146,12 @@ class LehrauftragErteilen extends Auth_Controller
}
elseif (isError(($result)))
{
show_error($result->retval);
show_error(getError($result));
}
}
elseif (isError($result))
{
show_error($result->retval);
show_error(getError($result));
}
// Check if user is entitled to approve this lehrauftrag (by permission and organisational unit)
application/controllers/organisation/Studienjahr.php
+7 -7
View File
@@ -44,7 +44,7 @@ class Studienjahr extends Auth_Controller
$studienjahr = $this->StudienjahrModel->load();
if ($studienjahr->error)
{
show_error($studienjahr->retval);
show_error(getError($studienjahr));
}
$data = array(
@@ -66,7 +66,7 @@ class Studienjahr extends Auth_Controller
$studienjahr = $this->StudienjahrModel->load($studienjahr_kurzbez);
if ($studienjahr->error)
{
show_error($studienjahr->retval);
show_error(getError($studienjahr));
}
$data = array(
"studienjahr" => $studienjahr->retval
@@ -86,7 +86,7 @@ class Studienjahr extends Auth_Controller
$allstudienjahrkurzbz = $this->StudienjahrModel->load();
if ($allstudienjahrkurzbz->error)
{
show_error($allstudienjahrkurzbz->retval);
show_error(getError($allstudienjahrkurzbz));
}
$studienjahrkurzbz = $allstudienjahrkurzbz->retval[0]->studienjahr_kurzbz;
$years = $this->__getYearsFromStudienjahr($studienjahrkurzbz);
@@ -125,7 +125,7 @@ class Studienjahr extends Auth_Controller
if ($studienjahr->error)
{
show_error($studienjahr->retval);
show_error(getError($studienjahr));
}
redirect("/organisation/studienjahr/editStudienjahr/".str_replace("/", "_", $data['studienjahr_kurzbz']."?saved=true"));
@@ -153,7 +153,7 @@ class Studienjahr extends Auth_Controller
return $data;
} else
{
show_error($validation->retval);
show_error(getError($validation));
}
}
@@ -188,7 +188,7 @@ class Studienjahr extends Auth_Controller
if ($studienjahr->error)
{
show_error($studienjahr->retval);
show_error(getError($studienjahr));
}
redirect("/organisation/studienjahr/editStudienjahr/".str_replace("/", "_", $data['studienjahr_kurzbz']."?saved=true"));
@@ -207,7 +207,7 @@ class Studienjahr extends Auth_Controller
if ($studienjahr->error)
{
show_error($studienjahr->retval);
show_error(getError($studienjahr));
}
redirect("/organisation/studienjahr/listStudienjahr");
application/controllers/organisation/Studiensemester.php
+8 -8
View File
@@ -45,7 +45,7 @@ class Studiensemester extends Auth_Controller
$semester = $this->StudiensemesterModel->load();
if ($semester->error)
{
show_error($semester->retval);
show_error(getError($semester));
}
$data = array(
@@ -64,13 +64,13 @@ class Studiensemester extends Auth_Controller
$semester = $this->StudiensemesterModel->load($semester_kurzbez);
if ($semester->error)
{
show_error($semester->retval);
show_error(getError($semester));
}
$this->StudienjahrModel->addOrder('studienjahr_kurzbz', "DESC");
$allstudienjahre = $this->StudienjahrModel->load();
if ($allstudienjahre->error)
{
show_error($allstudienjahre->retval);
show_error(getError($allstudienjahre));
}
$data = array(
"semester" => $semester->retval,
@@ -90,7 +90,7 @@ class Studiensemester extends Auth_Controller
$allstudienjahre = $this->StudienjahrModel->load();
if ($allstudienjahre->error)
{
show_error($allstudienjahre->retval);
show_error(getError($allstudienjahre));
}
$data = array(
@@ -117,7 +117,7 @@ class Studiensemester extends Auth_Controller
if ($semester->error)
{
show_error($semester->retval);
show_error(getError($semester));
}
redirect("/organisation/studiensemester/editStudiensemester/".$data['studiensemester_kurzbz']."?saved=true");
@@ -161,7 +161,7 @@ class Studiensemester extends Auth_Controller
return $data;
} else
{
show_error($validation->retval);
show_error(getError($validation));
}
}
@@ -197,7 +197,7 @@ class Studiensemester extends Auth_Controller
if ($semester->error)
{
show_error($semester->retval);
show_error(getError($semester));
}
redirect("/organisation/studiensemester/editStudiensemester/".$data['studiensemester_kurzbz']."?saved=true");
@@ -214,7 +214,7 @@ class Studiensemester extends Auth_Controller
if ($semester->error)
{
show_error($semester->retval);
show_error(getError($semester));
}
redirect("/organisation/studiensemester/listStudiensemester");
application/controllers/person/BPKWartung.php
+3 -3
View File
@@ -71,7 +71,7 @@ class BPKWartung extends Auth_Controller
$personexists = $this->PersonModel->load($person_id);
if (isError($personexists))
show_error($personexists->retval);
show_error(getError($personexists));
if (!hasData($personexists))
show_error('Person does not exist!');
@@ -122,7 +122,7 @@ class BPKWartung extends Auth_Controller
if (isError($stammdaten))
{
show_error($stammdaten->retval);
show_error(getError($stammdaten));
}
if (!isset($stammdaten->retval))
@@ -132,7 +132,7 @@ class BPKWartung extends Auth_Controller
if (isError($adresse))
{
show_error($adresse->retval);
show_error(getError($adresse));
}
$data = array(
application/controllers/system/FASMessages.php
+5 -5
View File
@@ -123,7 +123,7 @@ class FASMessages extends Auth_Controller
$msg = $this->messagelib->getMessage($msg_id, $receiver_id);
if (isError($msg))
{
show_error(getData($msg));
show_error(getError($msg));
}
elseif (!hasData($msg))
{
@@ -147,7 +147,7 @@ class FASMessages extends Auth_Controller
if (isError($msgVarsData))
{
show_error(getData($msgVarsData));
show_error(getError($msgVarsData));
}
return $msgVarsData;
@@ -160,7 +160,7 @@ class FASMessages extends Auth_Controller
{
$variables = $this->messagelib->getMessageVarsPerson();
if (isError($variables)) show_error(getData($variables));
if (isError($variables)) show_error(getError($variables));
return getData($variables);
}
@@ -172,7 +172,7 @@ class FASMessages extends Auth_Controller
{
$oe_kurzbz = $this->messagelib->getOeKurzbz($sender_id);
if (isError($oe_kurzbz)) show_error(getData($oe_kurzbz));
if (isError($oe_kurzbz)) show_error(getError($oe_kurzbz));
return getData($oe_kurzbz);
}
@@ -184,7 +184,7 @@ class FASMessages extends Auth_Controller
{
$isAdmin = $this->messagelib->getIsAdmin($sender_id);
if (isError($isAdmin)) show_error(getData($isAdmin));
if (isError($isAdmin)) show_error(getError($isAdmin));
return getData($isAdmin);
}
application/controllers/system/Messages.php
+8 -8
View File
@@ -51,7 +51,7 @@ class Messages extends Auth_Controller
$authUser = $this->CLMessagesModel->getAuthUser();
if (isError($authUser))
{
show_error(getData($authUser));
show_error(getError($authUser));
}
else
{
@@ -59,19 +59,19 @@ class Messages extends Auth_Controller
}
$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
if (isError($msgVarsData)) show_error(getData($msgVarsData));
if (isError($msgVarsData)) show_error(getError($msgVarsData));
// Retrieves message vars for a person from view view vw_msg_vars_person
$variables = $this->messagelib->getMessageVarsPerson();
if (isError($variables)) show_error(getData($variables));
if (isError($variables)) show_error(getError($variables));
// Organisation units used to get the templates
$oe_kurzbz = $this->messagelib->getOeKurzbz($sender_id);
if (isError($oe_kurzbz)) show_error(getData($oe_kurzbz));
if (isError($oe_kurzbz)) show_error(getError($oe_kurzbz));
// Admin or commoner?
$isAdmin = $this->messagelib->getIsAdmin($sender_id);
if (isError($isAdmin)) show_error(getData($isAdmin));
if (isError($isAdmin)) show_error(getError($isAdmin));
$data = array (
'recipients' => getData($msgVarsData),
@@ -122,7 +122,7 @@ class Messages extends Auth_Controller
$send = $this->CLMessagesModel->send($msgVarsData, null, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
if (isError($send))
{
$this->outputJsonError(getData($send));
$this->outputJsonError(getError($send));
}
else
{
@@ -152,7 +152,7 @@ class Messages extends Auth_Controller
if (isError($result) || !hasData($result))
{
$this->outputJsonError(getData($result));
$this->outputJsonError(getError($result));
}
else
{
@@ -181,7 +181,7 @@ class Messages extends Auth_Controller
if (isError($data) || !hasData($data))
{
$this->outputJsonError(getData($data));
$this->outputJsonError(getError($data));
}
else
{
application/controllers/system/Phrases.php
+9 -9
View File
@@ -45,7 +45,7 @@ class Phrases extends Auth_Controller
{
$phrases = $this->phraseslib->getPhraseByApp('aufnahme');
if ($phrases->error)
show_error($phrases->retval);
show_error(getError($phrases));
$data = array(
'app' => 'aufnahme',
@@ -67,7 +67,7 @@ class Phrases extends Auth_Controller
$phrase_inhalt = $this->phraseslib->getPhraseInhalt($phrase_id);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
show_error(getError($phrase_inhalt));
$data = array(
'phrase_id' => $phrase_id,
@@ -88,7 +88,7 @@ class Phrases extends Auth_Controller
$phrase_inhalt = $this->phraseslib->delPhrasentext($phrasentext_id);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
show_error(getError($phrase_inhalt));
redirect('/system/Phrases/view/'.$phrase_id);
}
@@ -102,7 +102,7 @@ class Phrases extends Auth_Controller
$phrase = $this->phraseslib->getPhrase($phrase_id);
if ($phrase->error)
show_error($phrase->retval);
show_error(getError($phrase));
if (count($phrase->retval) != 1)
show_error('Phrase nicht vorhanden! ID: '.$phrase_id);
@@ -124,7 +124,7 @@ class Phrases extends Auth_Controller
$phrase = $this->phraseslib->savePhrase($phrase_id, $data);
if ($phrase->error)
show_error($phrase->retval);
show_error(getError($phrase));
$phrase_id = $phrase->retval;
@@ -145,7 +145,7 @@ class Phrases extends Auth_Controller
$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
if ($resultOE->error)
show_error($resultOE->retval);
show_error(getError($resultOE));
if (hasData($resultOE))
{
@@ -161,7 +161,7 @@ class Phrases extends Auth_Controller
$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
show_error(getError($phrase_inhalt0);
$phrase_inhalt_id = $phrase_inhalt->retval;
@@ -180,7 +180,7 @@ class Phrases extends Auth_Controller
{
$phrase_inhalt = $this->phraseslib->getPhrasentextById($phrasentext_id);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
show_error(getError($phrase_inhalt));
$data = $phrase_inhalt->retval[0];
@@ -204,7 +204,7 @@ class Phrases extends Auth_Controller
$phrase_inhalt = $this->phraseslib->updatePhraseInhalt($phrase_inhalt_id, $data);
if ($phrase_inhalt->error)
show_error($phrase_inhalt->retval);
show_error(getError($phrase_inhalt));
redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
application/controllers/system/Vorlage.php
+9 -9
View File
@@ -49,7 +49,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->getVorlageByMimetype($mimetype);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
$data = array (
'mimetype' => $mimetype,
@@ -66,7 +66,7 @@ class Vorlage extends Auth_Controller
$vorlagentext = $this->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz);
if ($vorlagentext->error)
show_error($vorlagentext->retval);
show_error(getError($vorlagentext));
$data = array (
'vorlage_kurzbz' => $vorlage_kurzbz,
@@ -83,7 +83,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->getVorlage($vorlage_kurzbz);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
if (count($vorlage->retval) != 1)
show_error('Nachricht nicht vorhanden! ID: '.$vorlage_kurzbz);
@@ -119,7 +119,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->saveVorlage($vorlage_kurzbz, $data);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
$vorlage_kurzbz = $vorlage->retval;
@@ -137,7 +137,7 @@ class Vorlage extends Auth_Controller
$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
if ($resultOE->error)
show_error($resultOE->retval);
show_error(getError($resultOE));
if (hasData($resultOE))
{
@@ -153,7 +153,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$vorlagestudiengang_id = $vorlagetext->retval;
@@ -170,7 +170,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$data = $vorlagetext->retval[0];
@@ -254,7 +254,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->updateVorlagetext($data['vorlagestudiengang_id'], $data);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
redirect('/system/vorlage/editText/'.$data['vorlagestudiengang_id']);
}
@@ -266,7 +266,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$data = array(
'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $jsonDecodedForm)
application/controllers/system/aufnahme/PrestudentMultiAssign.php
+1 -1
View File
@@ -61,7 +61,7 @@ class PrestudentMultiAssign extends Auth_Controller
}
else if (isError($returnUsers))
{
show_error($returnUsers->retval);
show_error(getError($returnUsers));
}
}
application/controllers/system/infocenter/InfoCenter.php
+19 -21
View File
@@ -194,7 +194,7 @@ class InfoCenter extends Auth_Controller
$personexists = $this->PersonModel->load($person_id);
if (isError($personexists))
show_error($personexists->retval);
show_error(getError($personexists));
if (!hasData($personexists))
show_error('Person does not exist!');
@@ -205,8 +205,7 @@ class InfoCenter extends Auth_Controller
// mark person as locked for editing
$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
if (isError($result))
show_error($result->retval);
if (isError($result)) show_error(getError($result));
}
$persondata = $this->_loadPersonData($person_id);
@@ -232,8 +231,7 @@ class InfoCenter extends Auth_Controller
{
$result = $this->PersonLockModel->unlockPerson($person_id, self::APP);
if (isError($result))
show_error($result->retval);
if (isError($result)) show_error(getError($result));
$redirectLink = '/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
@@ -665,7 +663,7 @@ class InfoCenter extends Auth_Controller
if (isError($notizen))
{
show_error($notizen->retval);
show_error(getError($notizen));
}
$this->load->view('system/infocenter/notizen.php', array('notizen' => $notizen->retval));
@@ -693,14 +691,14 @@ class InfoCenter extends Auth_Controller
if (isError($akte))
{
show_error($akte->retval);
show_error(getError($akte));
}
$aktecontent = $this->dmslib->getAkteContent($akte_id);
if (isError($aktecontent))
{
show_error($aktecontent->retval);
show_error(getError($aktecontent));
}
$this->output
@@ -1171,7 +1169,7 @@ class InfoCenter extends Auth_Controller
if (isError($locked))
{
show_error($locked->retval);
show_error(getError($locked));
}
$lockedby = null;
@@ -1190,7 +1188,7 @@ class InfoCenter extends Auth_Controller
if (isError($stammdaten))
{
show_error($stammdaten->retval);
show_error(getError($stammdaten));
}
if (!isset($stammdaten->retval))
@@ -1200,21 +1198,21 @@ class InfoCenter extends Auth_Controller
if (isError($dokumente))
{
show_error($dokumente->retval);
show_error(getError($dokumente));
}
$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
if (isError($dokumente_nachgereicht))
{
show_error($dokumente_nachgereicht->retval);
show_error(getError($dokumente_nachgereicht));
}
$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
if (isError($messages))
{
show_error($messages->retval);
show_error(getError($messages));
}
$logs = $this->personloglib->getLogs($person_id);
@@ -1223,21 +1221,21 @@ class InfoCenter extends Auth_Controller
if (isError($notizen))
{
show_error($notizen->retval);
show_error(getError($notizen));
}
$notizen_bewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung%');
if (isError($notizen_bewerbung))
{
show_error($notizen_bewerbung->retval);
show_error(getError($notizen_bewerbung));
}
$user_person = $this->PersonModel->getByUid($this->_uid);
if (isError($user_person))
{
show_error($user_person->retval);
show_error(getError($user_person));
}
$data = array (
@@ -1268,7 +1266,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudenten))
{
show_error($prestudenten->retval);
show_error(getError($prestudenten));
}
foreach ($prestudenten->retval as $prestudent)
@@ -1277,7 +1275,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudentWithZgv))
{
show_error($prestudentWithZgv->retval);
show_error(getError($prestudentWithZgv));
}
$zgvpruefung = $prestudentWithZgv->retval[0];
@@ -1385,13 +1383,13 @@ class InfoCenter extends Auth_Controller
$starta = $this->StudiensemesterModel->load($a->prestudentstatus->studiensemester_kurzbz);
if (!hasData($starta))
{
show_error($starta->retval);
show_error(getError($starta));
}
$startb = $this->StudiensemesterModel->load($b->prestudentstatus->studiensemester_kurzbz);
if (!hasData($startb))
{
show_error($startb->retval);
show_error(getError($startb));
}
$starta = date_format(date_create($starta->retval[0]->start), 'Y-m-d');
@@ -1463,7 +1461,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudent))
{
show_error($prestudent->retval);
show_error(getError($prestudent));
}
$person_id = $prestudent->retval[0]->person_id;
application/helpers/hlp_return_object_helper.php
+15
View File
@@ -125,3 +125,18 @@ function getCode($result)
return $code;
}
/**
* Returns the property retval if present, otherwise null
*/
function getError($result)
{
$error = null;
if (isset($result->retval))
{
$error = $result->retval;
}
return $error;
}
application/libraries/AuthLib.php
+2 -2
View File
@@ -390,7 +390,7 @@ class AuthLib
}
elseif (isError($hta)) // display error and stop execution
{
$this->_showError($hta->retval);
$this->_showError(getError($hta));
}
return $hta; // if success then is returned!
@@ -550,7 +550,7 @@ class AuthLib
}
elseif (isError($auth)) // blocking error
{
$this->_showError(getData($auth)); // display a generic error message and logs the occurred error
$this->_showError(getError($auth)); // display a generic error message and logs the occurred error
}
}
// else the user is already logged, then loads authentication helper and continue with the execution
application/libraries/DmsLib.php
+2 -2
View File
@@ -249,7 +249,7 @@ class DmsLib
}
else
{
return error($dmscontent->retval);
return error(getError($dmscontent));
}
}
else
@@ -259,7 +259,7 @@ class DmsLib
}
else
{
return error($akte->retval);
return error(getError($akte));
}
}
application/libraries/DocumentLib.php
+1 -1
View File
@@ -68,7 +68,7 @@ class DocumentLib
}
else
{
return error($ret->retval);
return error(getError($ret));
}
case 'application/pdf':
return success($filename);
application/libraries/PersonLogLib.php
+1 -1
View File
@@ -76,7 +76,7 @@ class PersonLogLib
return $decoded_logs;
}
else
show_error($result->retval);
show_error(getError($result));
}
/**
application/libraries/UDFLib.php
+1 -1
View File
@@ -540,7 +540,7 @@ class UDFLib
{
if (is_object($udfResults) && isset($udfResults->retval))
{
show_error($udfResults->retval);
show_error(getError($udfResults));
}
elseif (is_string($udfResults))
{
application/models/accounting/Konto_model.php
+1 -2
View File
@@ -22,8 +22,7 @@ class Konto_model extends DB_Model
$this->addJoin('wawi.tbl_konto_kostenstelle', 'konto_id');
$konten = $this->loadWhere(array('kostenstelle_id' => $kostenstelle_id));
if ($konten->error)
return error($konten->retval);
if ($konten->error) return $konten;
return $konten;
}
application/models/crm/Akte_model.php
+1 -2
View File
@@ -186,8 +186,7 @@ class Akte_model extends DB_Model
$dokumente = $this->loadWhere($where);
if($dokumente->error)
return error($dokumente->retval);
if($dokumente->error) return $dokumente;
return success($dokumente->retval);
}
application/models/crm/Prestudent_model.php
+4 -4
View File
@@ -214,7 +214,7 @@ class Prestudent_model extends DB_Model
if ($lastStatus->error)
{
return error($lastStatus->retval);
return $lastStatus;
}
if (count($lastStatus->retval) > 0)
@@ -222,7 +222,7 @@ class Prestudent_model extends DB_Model
//get Studiengangname from Studienplan and -ordnung
$studienordnung = $this->PrestudentstatusModel->getStudienordnungFromPrestudent($prestudent_id);
if ($studienordnung->error)
return error($studienordnung->retval);
return $studienordnung;
if (count($studienordnung->retval) > 0)
{
@@ -239,7 +239,7 @@ class Prestudent_model extends DB_Model
$language = $this->SpracheModel->load($lastStatus->retval[0]->sprache);
if ($language->error)
return error($language->retval);
return $language;
if (count($language->retval) > 0)
$lastStatus->retval[0]->sprachedetails = $language->retval[0];
@@ -257,7 +257,7 @@ class Prestudent_model extends DB_Model
)
);
if ($bewerbungstermin->error)
return error($bewerbungstermin->retval);
return $bewerbungstermin;
if (count($bewerbungstermin->retval) > 0)
{
application/models/crm/Prestudentstatus_model.php
+2 -2
View File
@@ -123,7 +123,7 @@ class Prestudentstatus_model extends DB_Model
if ($lastStatus->error)
{
return error($lastStatus->retval);
return $lastStatus;
}
if (count($lastStatus->retval) > 0)
@@ -158,7 +158,7 @@ class Prestudentstatus_model extends DB_Model
if ($lastStatus->error)
{
return error($lastStatus->retval);
return $lastStatus;
}
if (count($lastStatus->retval) > 0)
application/models/education/Lehrveranstaltung_model.php
+3 -3
View File
@@ -65,7 +65,7 @@ class Lehrveranstaltung_model extends DB_Model
$result = $this->StudiensemesterModel->getAusbildungssemesterByStudiensemesterAndStudiengang($studiensemester_kurzbz, $studiengang_kz_item);
if (isError($result))
return error($result->retval);
return error(getError($result));
foreach ($result->retval as $semester)
{
@@ -104,7 +104,7 @@ class Lehrveranstaltung_model extends DB_Model
if (count($studiengang_kz_arr) > 0)
$query .= " AND tbl_lehrveranstaltung.studiengang_kz IN (". implode(", ", $studiengang_kz_arr).")";
if (count($lehrveranstaltung_id_arr) > 0)
{
$query .= " AND tbl_lehrveranstaltung.lehrveranstaltung_id IN (". implode(', ', $lehrveranstaltung_id_arr).")";
@@ -144,7 +144,7 @@ class Lehrveranstaltung_model extends DB_Model
WHERE
vw_student_lehrveranstaltung.studiensemester_kurzbz=?
AND
vw_student_lehrveranstaltung.lehrveranstaltung_id=?
vw_student_lehrveranstaltung.lehrveranstaltung_id=?
ORDER BY nachname, vorname, person_id, tbl_bisio.bis DESC";
return $this->execQuery($query, array($studiensemester_kurzbz, $lehrveranstaltung_id));
application/models/person/Person_model.php
+4 -6
View File
@@ -158,8 +158,7 @@ class Person_model extends DB_Model
$person = $this->load($person_id);
if($person->error)
return error($person->retval);
if($person->error) return $person;
//return null if not found
if(count($person->retval) < 1)
@@ -170,14 +169,13 @@ class Person_model extends DB_Model
$this->KontaktModel->addOrder('kontakttyp');
$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustellung' => true) : array('person_id' => $person_id);
$kontakte = $this->KontaktModel->loadWhere($where);
if($kontakte->error)
return error($kontakte->retval);
if($kontakte->error) return $kontakte;
$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustelladresse' => true) : array('person_id' => $person_id);
$this->AdresseModel->addSelect('public.tbl_adresse.*, bis.tbl_nation.kurztext AS nationkurztext');
$this->AdresseModel->addJoin('bis.tbl_nation', 'tbl_adresse.nation = tbl_nation.nation_code', 'LEFT');
$adressen = $this->AdresseModel->loadWhere($where);
if($adressen->error)
return error($adressen->retval);
if($adressen->error) return $adressen;
$stammdaten = $person->retval[0];
$stammdaten->kontakte = $kontakte->retval;
application/models/system/PersonLock_model.php
+3 -6
View File
@@ -29,8 +29,7 @@ class PersonLock_model extends DB_Model
$result = $this->loadWhere($lockdata);
if ($result->error)
return error($result->retval);
if ($result->error) return $result;
if (count($result->retval) > 0)
return success($result->retval);
@@ -49,8 +48,7 @@ class PersonLock_model extends DB_Model
{
$locked = $this->checkIfLocked($person_id, $app);
if ($locked->error)
return error($locked->retval);
if ($locked->error) return $locked;
//insert only if not already locked
if ($locked->retval === null)
@@ -77,8 +75,7 @@ class PersonLock_model extends DB_Model
foreach ($locks->retval as $lock)
{
$result = $this->delete($lock->lock_id);
if ($result->error)
return error($result->retval);
if ($result->error) return $result;
$deleted[] = $lock;
}
application/widgets/html/DropdownWidget.php
+22 -22
View File
@@ -17,32 +17,32 @@ class DropdownWidget extends HTMLWidget
const SELECTED_ELEMENT = 'selectedElement';
// Default HTML value
const HTML_DEFAULT_VALUE = 'null';
const SIZE = 'size'; // size of the dropdown
const MULTIPLE = 'multiple'; // multiple attribute
// Alias of $this->_args[HTMLWidget::HTML_ARG_NAME] for a better code readability
protected $htmlParameters;
/**
*
*
*/
public function __construct($name, $args = array(), $htmlArgs = array())
{
parent::__construct($name, $args, $htmlArgs);
// If the selectd element is not set then set it to HTML_DEFAULT_VALUE
if (!isset($this->_args[DropdownWidget::SELECTED_ELEMENT]))
{
$this->_args[DropdownWidget::SELECTED_ELEMENT] = DropdownWidget::HTML_DEFAULT_VALUE;
}
$this->htmlParameters =& $this->_args[HTMLWidget::HTML_ARG_NAME]; // Reference for a better code readability
// By default is not a multiple dropdown
unset($this->htmlParameters[DropdownWidget::MULTIPLE]);
}
/**
* Set this dropdown as multiple:
* - Setting the multiple attribute
@@ -53,23 +53,23 @@ class DropdownWidget extends HTMLWidget
$this->htmlParameters[DropdownWidget::MULTIPLE] = DropdownWidget::MULTIPLE;
$this->htmlParameters[HTMLWidget::HTML_NAME] .= '[]';
}
/**
* Checks if this object is a multiple dropdown
*/
public function isMultipleDropdown()
{
$isMultipleDropdown = false;
if (isset($this->htmlParameters[DropdownWidget::MULTIPLE])
&& $this->htmlParameters[DropdownWidget::MULTIPLE] == DropdownWidget::MULTIPLE)
{
$isMultipleDropdown = true;
}
return $isMultipleDropdown;
}
/**
* Add the correct select to the model used to load a list of elemets for this dropdown
* @param model $model the model used to load elements
@@ -88,7 +88,7 @@ class DropdownWidget extends HTMLWidget
)
);
}
/**
* Set the array used to populate the dropdown
* @param array $elements list used to populate this dropdown
@@ -102,12 +102,12 @@ class DropdownWidget extends HTMLWidget
)
{
$tmpElements = array();
if (isError($elements))
{
if (is_object($elements) && isset($elements->retval))
{
show_error($elements->retval);
show_error(getError($elements));
}
else if (is_string($elements))
{
@@ -133,11 +133,11 @@ class DropdownWidget extends HTMLWidget
{
$tmpElements = $elements->retval;
}
$this->_args[DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME] = $tmpElements;
}
}
/**
* Adds an element to the beginning of the array
*/
@@ -146,17 +146,17 @@ class DropdownWidget extends HTMLWidget
$element = new stdClass();
$element->{DropdownWidget::ID_FIELD} = $id;
$element->{DropdownWidget::DESCRIPTION_FIELD} = $stdDescription;
if (!hasData($elements))
{
$element->{DropdownWidget::DESCRIPTION_FIELD} = $noDataDescription;
}
array_unshift($elements->retval, $element);
return $elements->retval;
}
/**
* Loads the dropdown view with all the elements to be displayed
*/
@@ -164,4 +164,4 @@ class DropdownWidget extends HTMLWidget
{
$this->view('widgets/dropdown', $this->_args);
}
}
}