blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +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/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);