From 581cb69a6f566e30c515eec4ba296d8c9b7ef85d Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 10:45:57 +0200 Subject: [PATCH 1/6] - FiltersLib: fixed typo that prevents to save custom filters --- application/libraries/FiltersLib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php index bf8be6c5d..716b65d5f 100644 --- a/application/libraries/FiltersLib.php +++ b/application/libraries/FiltersLib.php @@ -540,7 +540,7 @@ class FiltersLib $saveCustomFilter = false; // by default returns a failure $trimed = trim($customFilterDescription); // Checks parameter customFilterDescription if not valid stop the execution - if (!isset($customFilterDescription) || empty($triemd)) + if (!isset($customFilterDescription) || empty($trimed)) { return $saveCustomFilter; } From d8bcc25ac2fbd068e63d4aba8966df3923808670 Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 11:10:40 +0200 Subject: [PATCH 2/6] Now the helper message is loaded only by these controllers and models: - APIv1_Controller - FHC_Controller - MessageToken_model --- application/controllers/Redirect.php | 3 - application/controllers/system/Phrases.php | 3 - .../system/aufnahme/PrestudentMultiAssign.php | 57 +++++++++---------- application/core/FHC_Controller.php | 4 ++ application/core/FHC_Model.php | 3 - application/core/FS_Model.php | 27 ++++----- .../models/system/MessageToken_model.php | 1 + application/widgets/html/HTMLWidget.php | 29 +++++----- 8 files changed, 57 insertions(+), 70 deletions(-) diff --git a/application/controllers/Redirect.php b/application/controllers/Redirect.php index 660709b6f..e372683a4 100644 --- a/application/controllers/Redirect.php +++ b/application/controllers/Redirect.php @@ -26,9 +26,6 @@ class Redirect extends FHC_Controller // Loads config file fhcomplete $this->config->load('fhcomplete'); - // Loads message helper - $this->load->helper('message'); - // Loads model MessageTokenModel $this->load->model('system/MessageToken_model', 'MessageTokenModel'); } diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php index d1f4ce98a..8f640928b 100644 --- a/application/controllers/system/Phrases.php +++ b/application/controllers/system/Phrases.php @@ -16,9 +16,6 @@ class Phrases extends FHC_Controller // Loads the widget library $this->load->library('WidgetLib'); - - // Loads helper message to manage returning messages - $this->load->helper('message'); } /** diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php index 242dd693f..d539fe342 100644 --- a/application/controllers/system/aufnahme/PrestudentMultiAssign.php +++ b/application/controllers/system/aufnahme/PrestudentMultiAssign.php @@ -7,14 +7,11 @@ class PrestudentMultiAssign extends VileSci_Controller public function __construct() { parent::__construct(); - - // Loads helper message to manage returning messages - $this->load->helper('message'); - + // Loads the widget library $this->load->library('WidgetLib'); } - + public function index() { $studiengang = $this->input->post('studiengang'); @@ -22,27 +19,27 @@ class PrestudentMultiAssign extends VileSci_Controller $aufnahmegruppe = $this->input->post('aufnahmegruppe'); $reihungstest = $this->input->post('reihungstest'); $stufe = $this->input->post('stufe'); - + // Converts string 'null' to a null value $stufe = ($stufe == 'null' ? null : $stufe); $studiengang = ($studiengang == 'null' ? null : $studiengang); $reihungstest = ($reihungstest == 'null' ? null : $reihungstest); $aufnahmegruppe = ($aufnahmegruppe == 'null' ? null : $aufnahmegruppe); $studiensemester = ($studiensemester == 'null' ? null : $studiensemester); - + $returnUsers = null; if ($studiengang != null || $studiensemester != null || $aufnahmegruppe!= null || $reihungstest != null || $stufe != null) { $returnUsers = $this->_getPrestudents($studiengang, $studiensemester, $aufnahmegruppe, $reihungstest, $stufe); } - + $users = null; if (hasData($returnUsers)) { $users = $returnUsers->retval; } - + if ($returnUsers == null || isSuccess($returnUsers)) { $viewData = array( @@ -53,7 +50,7 @@ class PrestudentMultiAssign extends VileSci_Controller 'stufe' => $stufe, 'users' => $users ); - + $this->load->view('system/aufnahme/prestudentMultiAssign', $viewData); } else if (isError($returnUsers)) @@ -61,7 +58,7 @@ class PrestudentMultiAssign extends VileSci_Controller show_error($returnUsers->retval); } } - + /** * To assign a stufe to one or more prestudents */ @@ -69,16 +66,16 @@ class PrestudentMultiAssign extends VileSci_Controller { $prestudentIdArray = $this->input->post('prestudent_id'); $stufe = $this->input->post('stufe'); - + // Converts string 'null' to a null value $stufe = ($stufe == 'null' ? null : $stufe); - + // Load model PrestudentstatusModel $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - + // Set the HTTP header $this->output->set_header('Content-Type: application/json; charset=utf-8'); - + $result = error("No valid parameters"); if (isset($stufe) && isset($prestudentIdArray) @@ -86,7 +83,7 @@ class PrestudentMultiAssign extends VileSci_Controller && count($prestudentIdArray) > 0) { $result = $this->PrestudentstatusModel->updateStufe($prestudentIdArray, $stufe); - + if (isSuccess($result)) { echo '{"msg": "Data correctly saved"}'; @@ -101,7 +98,7 @@ class PrestudentMultiAssign extends VileSci_Controller echo '{"msg": "'.$result->retval.'"}'; } } - + /** * To assign one or more prestudents to a gruppe */ @@ -109,16 +106,16 @@ class PrestudentMultiAssign extends VileSci_Controller { $prestudentIdArray = $this->input->post('prestudent_id'); $aufnahmegruppe = $this->input->post('aufnahmegruppe'); - + // Converts string 'null' to a null value $aufnahmegruppe = ($aufnahmegruppe == 'null' ? null : $aufnahmegruppe); - + // Load model PrestudentstatusModel $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - + // Set the HTTP header $this->output->set_header('Content-Type: application/json; charset=utf-8'); - + $result = error("No valid parameters"); if (isset($aufnahmegruppe) && isset($prestudentIdArray) @@ -126,7 +123,7 @@ class PrestudentMultiAssign extends VileSci_Controller && count($prestudentIdArray) > 0) { $result = $this->PrestudentModel->updateAufnahmegruppe($prestudentIdArray, $aufnahmegruppe); - + if (isSuccess($result)) { echo '{"msg": "Data correctly saved"}'; @@ -141,7 +138,7 @@ class PrestudentMultiAssign extends VileSci_Controller echo '{"msg": "'.$result->retval.'"}'; } } - + /** * Get the prestudents using search parameters */ @@ -149,32 +146,32 @@ class PrestudentMultiAssign extends VileSci_Controller { // Load model prestudentm_model $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - + if ($studiengang == '' || empty($studiengang)) { $studiengang = null; } - + if ($studiensemester == '' || empty($studiensemester)) { $studiensemester = null; } - + if ($aufnahmegruppe == '' || empty($aufnahmegruppe)) { $aufnahmegruppe = null; } - + if ($reihungstest == '' || empty($reihungstest)) { $reihungstest = null; } - + if ($stufe == '' || empty($stufe)) { $stufe = null; } - + return $this->PrestudentModel->getPrestudentMultiAssign( $studiengang, $studiensemester, @@ -183,4 +180,4 @@ class PrestudentMultiAssign extends VileSci_Controller $stufe ); } -} \ No newline at end of file +} diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php index 7417a4ca6..0827ac764 100644 --- a/application/core/FHC_Controller.php +++ b/application/core/FHC_Controller.php @@ -17,7 +17,11 @@ class FHC_Controller extends CI_Controller $this->_controllerId = null; // set _controllerId as null by default + // Loads helper fhcauth to manage the authentication $this->load->helper('fhcauth'); + + // Loads helper message to manage returning messages + $this->load->helper('message'); } //------------------------------------------------------------------------------------------------------------------ diff --git a/application/core/FHC_Model.php b/application/core/FHC_Model.php index d880fc5b8..39e1f6245 100644 --- a/application/core/FHC_Model.php +++ b/application/core/FHC_Model.php @@ -17,9 +17,6 @@ class FHC_Model extends CI_Model $this->lang->load('fhc_model'); $this->lang->load('fhcomplete'); - // Load return message helper - $this->load->helper('message'); - // Loads the permission library $this->load->library('PermissionLib'); } diff --git a/application/core/FS_Model.php b/application/core/FS_Model.php index 8b006e91a..3e28e2a82 100644 --- a/application/core/FS_Model.php +++ b/application/core/FS_Model.php @@ -10,16 +10,13 @@ class FS_Model extends FHC_Model public function __construct($filepath = null) { parent::__construct(); - + // Load the filesystem library $this->load->library('FilesystemLib'); - - // Load return message helper - $this->load->helper('message'); - + $this->filepath = $filepath; } - + /** --------------------------------------------------------------- * Read data from file system * @@ -29,13 +26,13 @@ class FS_Model extends FHC_Model { // Check Class-Attributes if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check method parameters if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; - + if (!is_null($data = $this->filesystemlib->read($this->filepath, $filename))) { return success(base64_encode($data)); @@ -45,7 +42,7 @@ class FS_Model extends FHC_Model return error(FHC_MODEL_ERROR, FHC_ERROR); } } - + /** --------------------------------------------------------------- * Writing data to file system * @@ -56,7 +53,7 @@ class FS_Model extends FHC_Model { // Check Class-Attributes if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check method parameters if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); if (is_null($content)) return error(FHC_MODEL_ERROR, FHC_ERROR); @@ -84,7 +81,7 @@ class FS_Model extends FHC_Model { // Check Class-Attributes if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check method parameters if (is_null($content)) return error(FHC_MODEL_ERROR, FHC_ERROR); if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); @@ -112,7 +109,7 @@ class FS_Model extends FHC_Model { // Check Class-Attributes if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check method parameters if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); @@ -128,7 +125,7 @@ class FS_Model extends FHC_Model return error(FHC_MODEL_ERROR, FHC_ERROR); } } - + /** --------------------------------------------------------------- * Rename a file * @@ -139,11 +136,11 @@ class FS_Model extends FHC_Model { // Check Class-Attributes if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check method parameters if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); if (is_null($newFilename)) return error(FHC_MODEL_ERROR, FHC_ERROR); - + // Check rights if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::UPDATE_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php index fb7f81a0a..a7f5b6b5c 100644 --- a/application/models/system/MessageToken_model.php +++ b/application/models/system/MessageToken_model.php @@ -8,6 +8,7 @@ class MessageToken_model extends CI_Model { /** * Constructor + * NOTE: here are loaded libs, models, helpers, etc. because MessageToken_model extends directly the CI_Model */ public function __construct() { diff --git a/application/widgets/html/HTMLWidget.php b/application/widgets/html/HTMLWidget.php index 9e737a8b7..9639890ea 100644 --- a/application/widgets/html/HTMLWidget.php +++ b/application/widgets/html/HTMLWidget.php @@ -10,12 +10,12 @@ class HTMLWidget extends Widget const HTML_DEFAULT_VALUE = ''; // Default value of the html element const HTML_NAME = 'name'; // HTML name attribute const HTML_ID = 'id'; // HTML id attribute - + // External block definition const EXTERNAL_BLOCK = 'externalBlock'; // External block name const EXTERNAL_START_BLOCK_HTML_TAG = '
'; // External block start tag const EXTERNAL_END_BLOCK_HTML_TAG = '
'; // External block end tag - + // HTML attributes const LABEL = 'title'; const REGEX = 'regex'; @@ -26,21 +26,18 @@ class HTMLWidget extends Widget const MAX_LENGTH = 'max-length'; const MIN_LENGTH = 'min-length'; const PLACEHOLDER = 'placeholder'; - + /** * It gets also the htmlArgs array as parameter, it will be used to set the HTML properties */ public function __construct($name, $args = array(), $htmlArgs = array()) { parent::__construct($name, $args); - + // Initialising HTML properties $this->_setHtmlProperties($htmlArgs); - - // Loads helper message to manage returning messages - $this->load->helper('message'); } - + /** * Initialising html properties, such as the id and name attributes of the HTML element */ @@ -50,19 +47,19 @@ class HTMLWidget extends Widget if (!isset($this->_args[HTMLWidget::HTML_ARG_NAME])) { $this->_args[HTMLWidget::HTML_ARG_NAME] = array(); - + // Avoids that elements in a HTML page have the same name or id $randomIdentifier = uniqid(rand(0, 1000)); $this->_args[HTMLWidget::HTML_ARG_NAME][HTMLWidget::HTML_ID] = $randomIdentifier; $this->_args[HTMLWidget::HTML_ARG_NAME][HTMLWidget::HTML_NAME] = $randomIdentifier; - + foreach($htmlArgs as $argName => $argValue) { $this->_args[HTMLWidget::HTML_ARG_NAME][$argName] = $argValue; } } } - + /** * Prints an attribute name and eventually also the value extracted from $htmlArgs * Set $isValuePresent to false the value should not be displayed @@ -76,12 +73,12 @@ class HTMLWidget extends Widget if ($isValuePresent === true) { $value = $htmlArgs[$attribute]; - + if (is_bool($value)) { $value = $value ? 'true' : 'false'; } - + echo sprintf('%s="%s"', $attribute, $value); } else @@ -91,7 +88,7 @@ class HTMLWidget extends Widget } } } - + /** * Prints the external block start tag */ @@ -103,7 +100,7 @@ class HTMLWidget extends Widget echo HTMLWidget::EXTERNAL_START_BLOCK_HTML_TAG; } } - + /** * Prints the external block end tag */ @@ -115,4 +112,4 @@ class HTMLWidget extends Widget echo HTMLWidget::EXTERNAL_END_BLOCK_HTML_TAG; } } -} \ No newline at end of file +} From d4e6027c7c039265ee96d406a51e4e02fa5bf698 Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 11:26:42 +0200 Subject: [PATCH 3/6] Removed load->helper->('message') from libs --- application/libraries/DmsLib.php | 3 --- application/libraries/FiltersLib.php | 2 -- application/libraries/MessageLib.php | 2 -- application/libraries/NavigationLib.php | 2 -- application/libraries/PhrasesLib.php | 3 --- application/libraries/VorlageLib.php | 3 --- 6 files changed, 15 deletions(-) diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php index 7b5eeb62e..317b02157 100644 --- a/application/libraries/DmsLib.php +++ b/application/libraries/DmsLib.php @@ -17,9 +17,6 @@ class DmsLib $this->ci->load->model('content/Dms_model', 'DmsModel'); $this->ci->load->model('content/DmsVersion_model', 'DmsVersionModel'); $this->ci->load->model('content/DmsFS_model', 'DmsFSModel'); - - // Loads helper message to manage returning messages - $this->ci->load->helper('message'); } /** diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php index 716b65d5f..e0a3acbbb 100644 --- a/application/libraries/FiltersLib.php +++ b/application/libraries/FiltersLib.php @@ -80,8 +80,6 @@ class FiltersLib { $this->_ci =& get_instance(); // get code igniter instance - // Loads helper message to manage returning messages - $this->_ci->load->helper('message'); // Loads helper session to manage the php session $this->_ci->load->helper('session'); diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php index bed87d184..d95f62689 100644 --- a/application/libraries/MessageLib.php +++ b/application/libraries/MessageLib.php @@ -37,8 +37,6 @@ class MessageLib // Loads fhc helper $this->ci->load->helper('fhc'); - // Loads helper message to manage returning messages - $this->ci->load->helper('message'); // Loads phrases $this->ci->lang->load('message'); diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php index b760d39c9..8b37f2498 100644 --- a/application/libraries/NavigationLib.php +++ b/application/libraries/NavigationLib.php @@ -32,8 +32,6 @@ class NavigationLib // Loads navigation configs $this->_ci->config->load('navigation'); - // Loads helper message to manage returning messages - $this->_ci->load->helper('message'); // Loads helper session to manage the php session $this->_ci->load->helper('session'); diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 9de367cad..de75c2f4c 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -22,9 +22,6 @@ class PhrasesLib $this->_ci->load->model('system/Phrase_model', 'PhraseModel'); $this->_ci->load->model('system/Phrasentext_model', 'PhrasentextModel'); - // Loads helper message to manage returning messages - $this->_ci->load->helper('message'); - // Workaround to use more parameters in the construct since PHP doesn't support many constructors $this->_extend_construct(func_get_args()); } diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php index ea96f3e18..52f358e45 100644 --- a/application/libraries/VorlageLib.php +++ b/application/libraries/VorlageLib.php @@ -22,9 +22,6 @@ class VorlageLib $this->ci->load->model('system/Vorlagestudiengang_model', 'VorlageStudiengangModel'); $this->ci->load->helper('language'); - // Loads helper message to manage returning messages - $this->ci->load->helper('message'); - //$this->ci->lang->load('fhcomplete'); } /** From 2f0048c0c3f42b26addadfc8f0dfc5ce342e0c14 Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 11:35:58 +0200 Subject: [PATCH 4/6] - Removed load->helper->('message') from the remaining libraries - Removed AuthLib from the autoload config file --- application/config/autoload.php | 2 +- application/libraries/AuthLib.php | 19 +++++++++---------- application/libraries/CallerLib.php | 3 --- .../libraries/OrganisationseinheitLib.php | 3 --- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/application/config/autoload.php b/application/config/autoload.php index 76835381d..baf545db6 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -58,7 +58,7 @@ $autoload['packages'] = array(); | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array('Session', 'AuthLib'); +$autoload['libraries'] = array('Session'); /* | ------------------------------------------------------------------- diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php index 20b14bd01..f686eca4a 100644 --- a/application/libraries/AuthLib.php +++ b/application/libraries/AuthLib.php @@ -27,6 +27,8 @@ require_once FHCPATH.'include/authentication.class.php'; class AuthLib extends authentication { + private $_ci; // CI instance + /** * Construct */ @@ -35,10 +37,7 @@ class AuthLib extends authentication parent::__construct(); // Gets CI instance - $this->ci =& get_instance(); - - // Loads helper message to manage returning messages - $this->ci->load->helper('Message'); + $this->_ci =& get_instance(); } /** @@ -83,9 +82,9 @@ class AuthLib extends authentication $result = error(false); // Load model PersonModel - $this->ci->load->model('person/person_model', 'PersonModel'); + $this->_ci->load->model('person/person_model', 'PersonModel'); - $person = $this->ci->PersonModel->loadWhere(array('zugangscode' => $code)); + $person = $this->_ci->PersonModel->loadWhere(array('zugangscode' => $code)); if (hasData($person)) { @@ -103,9 +102,9 @@ class AuthLib extends authentication $result = error(false); // Load model PersonModel - $this->ci->load->model('person/person_model', 'PersonModel'); + $this->_ci->load->model('person/person_model', 'PersonModel'); - $person = $this->ci->PersonModel->getPersonKontaktByZugangscode($code, $email); + $person = $this->_ci->PersonModel->getPersonKontaktByZugangscode($code, $email); if (hasData($person)) { @@ -124,9 +123,9 @@ class AuthLib extends authentication $finalUserBasicDataByUID = null; // Load model BenutzerModel - $this->ci->load->model('person/Benutzer_model', 'BenutzerModel'); + $this->_ci->load->model('person/Benutzer_model', 'BenutzerModel'); - $benutzer = $this->ci->BenutzerModel->load($uid); + $benutzer = $this->_ci->BenutzerModel->load($uid); if (hasData($benutzer)) { diff --git a/application/libraries/CallerLib.php b/application/libraries/CallerLib.php index d2387a723..33f0def52 100644 --- a/application/libraries/CallerLib.php +++ b/application/libraries/CallerLib.php @@ -33,9 +33,6 @@ class CallerLib // Gets CI instance $this->ci =& get_instance(); - // Loads helper message to manage returning messages - $this->ci->load->helper('Message'); - // Loads permission library $this->ci->load->library('PermissionLib'); } diff --git a/application/libraries/OrganisationseinheitLib.php b/application/libraries/OrganisationseinheitLib.php index b98e8c2c0..746dff255 100644 --- a/application/libraries/OrganisationseinheitLib.php +++ b/application/libraries/OrganisationseinheitLib.php @@ -13,9 +13,6 @@ class OrganisationseinheitLib // Loads model Organisationseinheit_model $this->ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel'); - - // Loads helper message to manage returning messages - $this->ci->load->helper('Message'); } /** From d04b0450daa448ec09ebfae1bef13b815bcc9637 Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 13:12:46 +0200 Subject: [PATCH 5/6] - AuthLib is loaded only in fhcauth_helper, PermissionLib and REST_Controller - Removed all the NOT usefull loads of helpers and libraries - Fixed undefined index in controllers/system/UDF and model system/UDF_model - APIv1_Controller now loads helper fhcauth - FHC_Controller now loads ithe fhc and session helpers too - Added/Fixed comments - PermissionLib does NOT use anymore the getAuthUID function from the fhcauth helper, now relies on AuthLib directly - REST_Controller loads directly the AuthLib when is needed --- application/controllers/MailJob.php | 8 +- .../controllers/api/v1/CheckUserAuth.php | 3 - application/controllers/rdf/Basic.php | 8 +- application/controllers/system/UDF.php | 56 +++--- .../controllers/system/extensions/Manager.php | 2 +- application/core/APIv1_Controller.php | 7 +- application/core/FHC_Controller.php | 11 +- application/helpers/fhcauth_helper.php | 2 +- application/libraries/ExtensionsLib.php | 2 +- application/libraries/FiltersLib.php | 3 - application/libraries/MessageLib.php | 3 - application/libraries/NavigationLib.php | 3 - application/libraries/PermissionLib.php | 17 +- application/libraries/REST_Controller.php | 3 + application/libraries/UDFLib.php | 2 - application/libraries/VorlageLib.php | 2 - application/libraries/WidgetLib.php | 172 +++++++++--------- application/models/system/UDF_model.php | 6 +- application/seeds/005_message.php | 11 +- 19 files changed, 155 insertions(+), 166 deletions(-) diff --git a/application/controllers/MailJob.php b/application/controllers/MailJob.php index 8da4ef95d..3149176f0 100644 --- a/application/controllers/MailJob.php +++ b/application/controllers/MailJob.php @@ -22,13 +22,13 @@ class MailJob extends FHC_Controller public function __construct() { parent::__construct(); - + // Loads MessageLib - $this->load->library("MessageLib"); + $this->load->library('MessageLib'); } - + public function sendMessages($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null) { $this->messagelib->sendAll($numberToSent, $numberPerTimeRange, $email_time_range, $email_from_system); } -} \ No newline at end of file +} diff --git a/application/controllers/api/v1/CheckUserAuth.php b/application/controllers/api/v1/CheckUserAuth.php index ac4195808..e7bc30ae9 100644 --- a/application/controllers/api/v1/CheckUserAuth.php +++ b/application/controllers/api/v1/CheckUserAuth.php @@ -22,9 +22,6 @@ class CheckUserAuth extends APIv1_Controller public function __construct() { parent::__construct(); - - // Loads the authentication library - $this->load->library('AuthLib'); } /** diff --git a/application/controllers/rdf/Basic.php b/application/controllers/rdf/Basic.php index e1f70f969..0ff53a77d 100644 --- a/application/controllers/rdf/Basic.php +++ b/application/controllers/rdf/Basic.php @@ -11,7 +11,7 @@ class Basic extends CI_Controller parent::__construct(); $this->load->library(array('rdf')); - $this->load->helper(array('form', 'url')); + $this->load->helper('form'); } /** @@ -25,7 +25,7 @@ class Basic extends CI_Controller $d['content'] = $this->load->view('rdf/basic', $d, true); $this->load->view('home', $d); } - + /** * Load Sparql-View * @return void @@ -37,7 +37,7 @@ class Basic extends CI_Controller $d['content'] = $this->load->view('rdf/basic_sparql', $d, true); $this->load->view('home', $d); } - + /** * Load foaf-View * @return void @@ -60,7 +60,7 @@ class Basic extends CI_Controller $d['content'] = $this->load->view('rdf/foafmaker', $d, true); $this->load->view('home', $d); } - + /** * Load converter View * @return void diff --git a/application/controllers/system/UDF.php b/application/controllers/system/UDF.php index 464cb72ee..745ffd30c 100644 --- a/application/controllers/system/UDF.php +++ b/application/controllers/system/UDF.php @@ -2,25 +2,19 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -class UDF extends VileSci_Controller +class UDF extends VileSci_Controller { public function __construct() { parent::__construct(); - - // Load session library - $this->load->library('session'); - - // Loads the UDF library - $this->load->library('UDFLib'); - - // + + // $this->load->model('person/Person_model', 'PersonModel'); $this->load->model('crm/Prestudent_model', 'PrestudentModel'); } - + /** - * + * */ public function index() { @@ -33,7 +27,7 @@ class UDF extends VileSci_Controller } unset($this->session->person_id); } - + $prestudent_id = $this->input->get('prestudent_id'); if (isset($this->session->prestudent_id)) { @@ -43,16 +37,16 @@ class UDF extends VileSci_Controller } unset($this->session->prestudent_id); } - + $result = null; if (isset($this->session->result)) { $result = clone $this->session->result; $this->session->set_userdata('result', null); } - + $data = array('result' => $result); - + if (isset($person_id) && is_numeric($person_id)) { if ($this->PersonModel->hasUDF()) @@ -62,7 +56,7 @@ class UDF extends VileSci_Controller $data['personUdfs'] = $personUdfs; } } - + if (isset($prestudent_id) && is_numeric($prestudent_id)) { if ($this->PrestudentModel->hasUDF()) @@ -72,54 +66,54 @@ class UDF extends VileSci_Controller $data['prestudentUdfs'] = $prestudentUdfs; } } - + $this->load->view('system/udf', $data); } - + /** - * + * */ public function saveUDF() { $udfs = $this->input->post(); $validation = $this->_validate($udfs); - + $userdata = array( - 'person_id' => $udfs['person_id'], - 'prestudent_id' => $udfs['prestudent_id'] + 'person_id' => $this->input->post('person_id'), + 'prestudent_id' => $this->input->post('prestudent_id') ); - + if (isSuccess($validation)) { // Load model UDF_model $this->load->model('system/UDF_model', 'UDFModel'); - + $result = $this->UDFModel->saveUDFs($udfs); - + $userdata['result'] = $result; } else { $userdata['result'] = $validation; } - + $this->session->set_userdata($userdata); redirect('system/UDF'); } - + /** - * + * */ private function _validate($udfs) { $validation = error('person_id or prestudent_id is missing'); - + if((isset($udfs['person_id']) && !(is_null($udfs['person_id'])) && ($udfs['person_id'] != '')) || (isset($udfs['prestudent_id']) && !(is_null($udfs['prestudent_id'])) && ($udfs['prestudent_id'] != ''))) { $validation = success(true); } - + return $validation; } -} \ No newline at end of file +} diff --git a/application/controllers/system/extensions/Manager.php b/application/controllers/system/extensions/Manager.php index 9e24f00f5..f2ffcb59e 100644 --- a/application/controllers/system/extensions/Manager.php +++ b/application/controllers/system/extensions/Manager.php @@ -15,7 +15,7 @@ class Manager extends VileSci_Controller parent::__construct(); // Load helpers to upload files - $this->load->helper(array('form', 'url')); + $this->load->helper('form'); // Loads the extensions library $this->load->library('ExtensionsLib'); diff --git a/application/core/APIv1_Controller.php b/application/core/APIv1_Controller.php index 5303bf02d..a8b0a1f06 100644 --- a/application/core/APIv1_Controller.php +++ b/application/core/APIv1_Controller.php @@ -10,10 +10,13 @@ class APIv1_Controller extends REST_Controller public function __construct() { parent::__construct(); - + + // Loads helper fhcauth to manage the authentication + $this->load->helper('fhcauth'); + // Loads return messages $this->load->helper('message'); - + log_message('debug', 'Called API: '.$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']); } } diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php index 0827ac764..c1b680cf2 100644 --- a/application/core/FHC_Controller.php +++ b/application/core/FHC_Controller.php @@ -9,7 +9,10 @@ class FHC_Controller extends CI_Controller private $_controllerId; // contains the unique identifier of a call to a controller /** - * Standard construct for all the controllers, loads the authentication system + * Standard construct for all the controllers + * - initialize the object properties + * - loads the authentication system + * - loads all the helpers that later are always needed */ public function __construct() { @@ -22,6 +25,12 @@ class FHC_Controller extends CI_Controller // Loads helper message to manage returning messages $this->load->helper('message'); + + // Loads helper with generic utility function + $this->load->helper('fhc'); + + // Loads helper session to manage the php session + $this->load->helper('session'); } //------------------------------------------------------------------------------------------------------------------ diff --git a/application/helpers/fhcauth_helper.php b/application/helpers/fhcauth_helper.php index da01d62ba..e8b553dd3 100644 --- a/application/helpers/fhcauth_helper.php +++ b/application/helpers/fhcauth_helper.php @@ -61,7 +61,7 @@ if ( ! function_exists('auth')) function getAuthUID() { $ci =& get_instance(); // get CI instance - $ci->load->library('AuthLib'); // load session library + $ci->load->library('AuthLib'); // load authentication library return $ci->authlib->getUser(); } diff --git a/application/libraries/ExtensionsLib.php b/application/libraries/ExtensionsLib.php index 70edb106b..67fa9d117 100644 --- a/application/libraries/ExtensionsLib.php +++ b/application/libraries/ExtensionsLib.php @@ -733,7 +733,7 @@ class ExtensionsLib ); if (!$_addSoftLinks) { - log_message('error','Failed to create Symlink to '.$extensionPath.$targetDirectory); + log_message('error', 'Failed to create Symlink to '.$extensionPath.$targetDirectory); break; } } diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php index e0a3acbbb..602826320 100644 --- a/application/libraries/FiltersLib.php +++ b/application/libraries/FiltersLib.php @@ -80,9 +80,6 @@ class FiltersLib { $this->_ci =& get_instance(); // get code igniter instance - // Loads helper session to manage the php session - $this->_ci->load->helper('session'); - $this->_filterUniqueId = $this->_getFilterUniqueId($params); // sets the id for the related filter widget } diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php index d95f62689..61812df8c 100644 --- a/application/libraries/MessageLib.php +++ b/application/libraries/MessageLib.php @@ -35,9 +35,6 @@ class MessageLib $this->ci->load->model('system/Recipient_model', 'RecipientModel'); $this->ci->load->model('system/Attachment_model', 'AttachmentModel'); - // Loads fhc helper - $this->ci->load->helper('fhc'); - // Loads phrases $this->ci->lang->load('message'); } diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php index 8b37f2498..18a2d8fc7 100644 --- a/application/libraries/NavigationLib.php +++ b/application/libraries/NavigationLib.php @@ -32,9 +32,6 @@ class NavigationLib // Loads navigation configs $this->_ci->config->load('navigation'); - // Loads helper session to manage the php session - $this->_ci->load->helper('session'); - // Loads library ExtensionsLib $this->_ci->load->library('ExtensionsLib'); diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php index 3000aceea..dfaa22368 100644 --- a/application/libraries/PermissionLib.php +++ b/application/libraries/PermissionLib.php @@ -30,6 +30,7 @@ class PermissionLib const DELETE_RIGHT = 'd'; const REPLACE_RIGHT = 'ui'; + private $_ci; // CI instance private $acl; // conversion array from a source to a permission private static $bb; // benutzerberechtigung @@ -40,22 +41,20 @@ class PermissionLib public function __construct() { // Loads CI instance - $this->ci =& get_instance(); - - // Loads the library to manage the rights system - //$this->ci->load->library('FHC_DB_ACL'); - - // Loads the auth helper - $this->ci->load->helper('fhcauth'); + $this->_ci =& get_instance(); // Loads the array of resources - $this->acl = $this->ci->config->item('fhc_acl'); + $this->acl = $this->_ci->config->item('fhc_acl'); + // Loads authentication library + $this->_ci->load->library('AuthLib'); + + // If it's NOT called from command line if (!is_cli()) { // API Caller rights initialization self::$bb = new benutzerberechtigung(); - self::$bb->getBerechtigungen(getAuthUID()); + self::$bb->getBerechtigungen($this->_ci->authlib->getUser()); } } diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php index e32cf75f7..7575862ba 100644 --- a/application/libraries/REST_Controller.php +++ b/application/libraries/REST_Controller.php @@ -1814,6 +1814,9 @@ abstract class REST_Controller extends CI_Controller { return FALSE; } + // Loads authentication library + $this->load->library('AuthLib'); + if (is_callable([$auth_library_class, $auth_library_function]) === FALSE) { $this->load->library($auth_library_class); diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php index 2d453f068..404b927c5 100644 --- a/application/libraries/UDFLib.php +++ b/application/libraries/UDFLib.php @@ -53,8 +53,6 @@ class UDFLib public function __construct() { $this->_ci =& get_instance(); - - $this->_ci->load->helper('fhc'); } // ------------------------------------------------------------------------------------------------- diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php index 52f358e45..4f463a27d 100644 --- a/application/libraries/VorlageLib.php +++ b/application/libraries/VorlageLib.php @@ -20,8 +20,6 @@ class VorlageLib $this->ci->load->model('system/Vorlage_model', 'VorlageModel'); $this->ci->load->model('system/Vorlagestudiengang_model', 'VorlageStudiengangModel'); - - $this->ci->load->helper('language'); } /** diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php index 0829944d8..739a64d89 100644 --- a/application/libraries/WidgetLib.php +++ b/application/libraries/WidgetLib.php @@ -4,17 +4,17 @@ * @author Jens Segers * @link http://www.jenssegers.be * @license MIT License Copyright (c) 2012 Jens Segers - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -30,16 +30,16 @@ class WidgetLib { const DIR_HTML_WIDGETS = 'html'; const HTML_WIDGET_NAME = 'HTMLWidget'; - + /* default values */ private $_template = 'template'; private $_parser = false; private $_cache_ttl = 0; private $_widget_path = ''; - + private $_ci; private $_partials = array(); - + /** * Construct with configuration array. Codeigniter will use the config file otherwise * @param array $config @@ -47,23 +47,19 @@ class WidgetLib public function __construct($config = array()) { $this->_ci = & get_instance(); - - $this->_ci->load->helper('fhc'); - + // Set the default widget path with APPPATH $this->_widget_path = APPPATH.'widgets/'; - + // Loads widgets to render HTML elements // NOTE: the first one to be loaded must be HTMLWidget loadResource($this->_widget_path.WidgetLib::DIR_HTML_WIDGETS, WidgetLib::HTML_WIDGET_NAME); loadResource($this->_widget_path.WidgetLib::DIR_HTML_WIDGETS); - - if (!empty($config)) - $this->initialize($config); - - log_message('debug', 'Template library initialized'); + + // If config are given then initialize this lib with the given config + if (!empty($config)) $this->initialize($config); } - + /** * Initialize with configuration array * @param array $config @@ -73,14 +69,14 @@ class WidgetLib { foreach ($config as $key => $val) $this->{'_'.$key} = $val; - + if ($this->_widget_path == '') $this->_widget_path = APPPATH.'widgets/'; - + if ($this->_parser && !class_exists('CI_Parser')) $this->_ci->load->library('parser'); } - + /** * Set a partial's content. This will create a new partial when not existing * @param string $index @@ -90,7 +86,7 @@ class WidgetLib { $this->partial($name)->set($value); } - + /** * Access to partials for method chaining * @param string $name @@ -100,7 +96,7 @@ class WidgetLib { return $this->partial($name); } - + /** * Check if a partial exists * @param string $index @@ -110,7 +106,7 @@ class WidgetLib { return array_key_exists($index, $this->_partials); } - + /** * Set the template file * @param string $template @@ -119,7 +115,7 @@ class WidgetLib { $this->_template = $template; } - + /** * Publish the template with the current partials * You can manually pass a template file with extra data, or use the default template from the config file @@ -136,12 +132,12 @@ class WidgetLib { $this->_template = $template; } - + if (!$this->_template) { show_error('There was no template file selected for the current template'); } - + if (is_array($data) || is_object($data)) { foreach ($data as $name => $content) @@ -149,9 +145,9 @@ class WidgetLib $this->partial($name)->set($content); } } - + unset($data); - + if ($this->_parser) { $this->_ci->parser->parse($this->_template, $this->_partials); @@ -161,7 +157,7 @@ class WidgetLib $this->_ci->load->view($this->_template, $this->_partials); } } - + /** * Create a partial object with an optional default content * Can be usefull to use straight from the template file @@ -183,24 +179,24 @@ class WidgetLib { $partial->cache($this->_cache_ttl); } - + // detect local triggers if (method_exists($this, 'trigger_'.$name)) { $partial->bind($this, 'trigger_'.$name); } - + $this->_partials[$name] = $partial; } - + if (!$partial->content() && $default) { $partial->set($default); } - + return $partial; } - + /** * Create a widget object with optional parameters * Can be usefull to use straight from the template file @@ -213,15 +209,15 @@ class WidgetLib { // Loads the widget file, trying to find it also in the subdirectories loadResource($this->_widget_path, $name, true); - + if (!class_exists($name)) { show_error("Widget '".$name."' was not found."); } - + return new $name($name, $data, $htmlArgs); } - + /** * Enable cache for all partials with TTL, default TTL is 60 * @param int $ttl @@ -233,10 +229,10 @@ class WidgetLib { $partial->cache($ttl, $identifier); } - + $this->_cache_ttl = $ttl; } - + // ---- TRIGGERS ----------------------------------------------------------------- /** @@ -255,27 +251,27 @@ class WidgetLib } return $return; } - + if (!stristr($url, 'http://') && !stristr($url, 'https://') && substr($url, 0, 2) != '//') { $url = $this->_ci->config->item('base_url').$url; } - + // legacy support for media if (is_string($attributes)) { $attributes = array('media' => $attributes); } - + if (is_array($attributes)) { $attributeString = ""; - + foreach ($attributes as $key => $value) { $attributeString .= $key.'="'.$value.'" '; } - + return ''."\n\t"; } else @@ -283,7 +279,7 @@ class WidgetLib return ''."\n\t"; } } - + /** * Javascript trigger * @param string $source @@ -300,15 +296,15 @@ class WidgetLib } return $return; } - + if (!stristr($url, 'http://') && !stristr($url, 'https://') && substr($url, 0, 2) != '//') { $url = $this->_ci->config->item('base_url').$url; } - + return ''."\n\t"; } - + /** * Meta trigger * @param string $name @@ -319,12 +315,12 @@ class WidgetLib { $name = htmlspecialchars(strip_tags($name)); $value = htmlspecialchars(strip_tags($value)); - + if ($name == 'keywords' and !strpos($value, ',')) { $content = preg_replace('/[\s]+/', ', ', trim($value)); } - + switch ($type) { case 'meta' : @@ -334,10 +330,10 @@ class WidgetLib $content = ''."\n\t"; break; } - + return $content; } - + /** * Title trigger, keeps it clean * @param string $name @@ -348,7 +344,7 @@ class WidgetLib { return htmlspecialchars(strip_tags($title)); } - + /** * Title trigger, keeps it clean * @param string $name @@ -366,7 +362,7 @@ class Partial { protected $_ci, $_content, $_name, $_cache_ttl = 0, $_cached = false, $_identifier, $_trigger; protected $_args = array(); - + /** * Construct with optional parameters * @param array $args @@ -377,7 +373,7 @@ class Partial $this->_args = $args; $this->_name = $name; } - + /** * Gives access to codeigniter's functions from this class if needed * This will be handy in extending classes @@ -387,7 +383,7 @@ class Partial { return $this->_ci->$name; } - + /** * Alias methods */ @@ -403,7 +399,7 @@ class Partial break; } } - + /** * Returns the content when converted to a string * @return string @@ -412,7 +408,7 @@ class Partial { return (string) $this->content(); } - + /** * Returns the content * @return string @@ -423,10 +419,10 @@ class Partial { $this->cache->save($this->cache_id(), $this->_content, $this->_cache_ttl); } - + return $this->_content; } - + /** * Overwrite the content * @param mixed $content @@ -438,10 +434,10 @@ class Partial { $this->_content = (string) $this->trigger(func_get_args()); } - + return $this; } - + /** * Append something to the content * @param mixed $content @@ -453,10 +449,10 @@ class Partial { $this->_content .= (string) $this->trigger(func_get_args()); } - + return $this; } - + /** * Prepend something to the content * @param mixed $content @@ -468,10 +464,10 @@ class Partial { $this->_content = (string) $this->trigger(func_get_args()).$this->_content; } - + return $this; } - + /** * Set content if partial is empty * @param mixed $default @@ -486,10 +482,10 @@ class Partial $this->_content = $default; } } - + return $this; } - + /** * Load a view inside this partial, overwrite if wanted * @param string $view @@ -511,9 +507,9 @@ class Partial } $data = $array; } - + $content = $this->_ci->load->view($view, $data, true); - + if ($overwrite) { $this->set($content); @@ -525,7 +521,7 @@ class Partial } return $this; } - + /** * Parses a view inside this partial, overwrite if wanted * @param string $view @@ -541,7 +537,7 @@ class Partial { $this->_ci->load->library('parser'); } - + // better object to array if (is_object($data)) { @@ -552,9 +548,9 @@ class Partial } $data = $array; } - + $content = $this->_ci->parser->parse($view, $data, true); - + if ($overwrite) { $this->set($content); @@ -564,10 +560,10 @@ class Partial $this->append($content); } } - + return $this; } - + /** * Loads a widget inside this partial, overwrite if wanted * @param string $name @@ -580,7 +576,7 @@ class Partial if (!$this->_cached) { $widget = $this->template->widget($name, $data); - + if ($overwrite) { $this->set($widget->content()); @@ -592,7 +588,7 @@ class Partial } return $this; } - + /** * Enable cache with TTL, default TTL is 60 * @param int $ttl @@ -604,10 +600,10 @@ class Partial { $this->_ci->load->driver('cache', array('adapter' => 'file')); } - + $this->_cache_ttl = $ttl; $this->_identifier = $identifier; - + if ($cached = $this->_ci->cache->get($this->cache_id())) { $this->_cached = true; @@ -615,7 +611,7 @@ class Partial } return $this; } - + /** * Used for cache identification * @return string @@ -631,7 +627,7 @@ class Partial return $this->_name.'_'.md5(get_class($this).implode('', $this->_args)); } } - + /** * Trigger returns the result if a trigger is set * @param array $args @@ -648,7 +644,7 @@ class Partial return call_user_func_array($this->_trigger, $args); } } - + /** * Bind a trigger function * Can be used like bind($this, "function") or bind("function") @@ -663,12 +659,12 @@ class Partial $args = func_get_args(); $obj = array_shift($args); $func = array_pop($args); - + foreach ($args as $trigger) { $obj = $obj->$trigger; } - + $this->_trigger = array($obj, $func); } else @@ -703,8 +699,8 @@ class Widget extends Partial ob_start(); $this->display($this->_args); $buffer = ob_get_clean(); - - // if no content is produced but there was direct ouput we set + + // if no content is produced but there was direct ouput we set // that output as content if (!$this->_content && $buffer) { @@ -712,7 +708,7 @@ class Widget extends Partial } } } - + return parent::content(); } -} \ No newline at end of file +} diff --git a/application/models/system/UDF_model.php b/application/models/system/UDF_model.php index ae9a91a69..5efb061d1 100644 --- a/application/models/system/UDF_model.php +++ b/application/models/system/UDF_model.php @@ -51,10 +51,12 @@ class UDF_model extends DB_Model $resultPerson = success('person'); $resultPrestudent = success('prestudent'); - $person_id = $udfs['person_id']; + $person_id = null; + if (isset($udfs['person_id'])) $person_id = $udfs['person_id']; unset($udfs['person_id']); - $prestudent_id = $udfs['prestudent_id']; + $prestudent_id = null; + if (isset($udfs['prestudent_id'])) $prestudent_id = $udfs['prestudent_id']; unset($udfs['prestudent_id']); $jsons = array(); diff --git a/application/seeds/005_message.php b/application/seeds/005_message.php index 9497bc074..8e6d6b50e 100644 --- a/application/seeds/005_message.php +++ b/application/seeds/005_message.php @@ -10,7 +10,7 @@ class Seed_Message $this->fhc =& get_instance(); $this->fhc->load->helper('fhc'); } - + public function seed($limit = 50) { echo "Seeding $limit messages "; @@ -18,11 +18,11 @@ class Seed_Message $db = $this->fhc->db->query('SELECT person_id FROM public.tbl_person LIMIT 100;'); $person = $db->result(); $num_persons = $db->num_rows(); - + for ($i = 0; $i < $limit; $i++) { echo "."; - + $data = array ( 'subject' => $this->fhc->faker->sentence(4, true), @@ -43,9 +43,9 @@ class Seed_Message if (!$recipient) show_error($recipient); } - + echo PHP_EOL; - + } public function truncate() @@ -53,4 +53,3 @@ class Seed_Message $this->fhc->db->query('DELETE FROM public.msg_message;'); } } - From 25e66bf9dd3222ee545cf69d9b822f000b5ec63f Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 27 Jun 2018 15:06:04 +0200 Subject: [PATCH 6/6] - Added function isEmptyString to fhc_helper - Added function isEmptyArray to fhc_helper - Adapted the code in application/* to use as much as possible this two new functions - Removed the php function empty almost everywhere --- application/controllers/system/Phrases.php | 6 +- application/controllers/system/Vorlage.php | 148 +++++++++--------- .../system/aufnahme/PrestudentMultiAssign.php | 10 +- .../system/infocenter/InfoCenter.php | 24 +-- application/core/DB_Model.php | 8 +- application/core/FHC_Controller.php | 2 +- application/helpers/fhc_helper.php | 19 +++ application/helpers/sancho_helper.php | 8 +- application/libraries/FiltersLib.php | 45 +++--- application/libraries/MailLib.php | 4 +- application/libraries/MessageLib.php | 28 ++-- application/libraries/NavigationLib.php | 4 +- application/libraries/PhrasesLib.php | 18 +-- application/libraries/UDFLib.php | 9 +- application/libraries/VorlageLib.php | 10 +- application/libraries/WidgetLib.php | 2 +- application/models/content/Ampel_model.php | 3 +- application/models/crm/Akte_model.php | 38 ++--- application/models/person/Person_model.php | 2 +- .../views/system/infocenter/dokpruefung.php | 2 +- .../system/infocenter/studiengangZgvInfo.php | 4 +- .../views/system/infocenter/zgvpruefungen.php | 6 +- application/widgets/Reihungstest_widget.php | 14 +- 23 files changed, 214 insertions(+), 200 deletions(-) diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php index 8f640928b..0b98715de 100644 --- a/application/controllers/system/Phrases.php +++ b/application/controllers/system/Phrases.php @@ -48,7 +48,7 @@ class Phrases extends FHC_Controller */ public function view($phrase_id) { - if (empty($phrase_id)) + if (!is_numeric($phrase_id)) show_error('Invalid phrase_id parameter'); $phrase = $this->phraseslib->getPhrase($phrase_id); @@ -71,7 +71,7 @@ class Phrases extends FHC_Controller */ public function deltext($phrasentext_id, $phrase_id) { - if (empty($phrasentext_id) || empty($phrase_id)) + if (!is_numeric($phrasentext_id) || !is_numeric($phrase_id)) show_error('Invalid phrasentext_id or phrase_id parameter'); $phrase_inhalt = $this->phraseslib->delPhrasentext($phrasentext_id); @@ -86,7 +86,7 @@ class Phrases extends FHC_Controller */ public function edit($phrase_id = null) { - if (empty($phrase_id)) return; + if (!is_numeric($phrase_id)) return; $phrase = $this->phraseslib->getPhrase($phrase_id); if ($phrase->error) diff --git a/application/controllers/system/Vorlage.php b/application/controllers/system/Vorlage.php index 0cf821488..1af0ac052 100644 --- a/application/controllers/system/Vorlage.php +++ b/application/controllers/system/Vorlage.php @@ -2,79 +2,79 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -class Vorlage extends VileSci_Controller +class Vorlage extends VileSci_Controller { public function __construct() { parent::__construct(); - + // Loads the vorlage library $this->load->library('VorlageLib'); - + // Loads the widget library $this->load->library('WidgetLib'); } - + public function index() { $this->load->view('system/vorlage/templates.php'); } - + public function table() { $mimetype = $this->input->post('mimetype'); - + if (is_null($mimetype)) $mimetype = 'text/html'; if ($mimetype == '') $mimetype = null; - + $vorlage = $this->vorlagelib->getVorlageByMimetype($mimetype); - + if ($vorlage->error) show_error($vorlage->retval); - + $data = array ( 'mimetype' => $mimetype, 'vorlage' => $vorlage->retval ); - + $v = $this->load->view('system/vorlage/templatesList.php', $data); } - + public function view($vorlage_kurzbz = null) { - if (empty($vorlage_kurzbz)) exit; - + if (isEmptyString($vorlage_kurzbz)) exit; + $vorlagentext = $this->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz); - + if ($vorlagentext->error) show_error($vorlagentext->retval); - + $data = array ( 'vorlage_kurzbz' => $vorlage_kurzbz, 'vorlagentext' => $vorlagentext->retval ); - + $v = $this->load->view('system/vorlage/templatetextList.php', $data); } - + public function edit($vorlage_kurzbz = null) { - if (empty($vorlage_kurzbz)) exit; - + if (isEmptyString($vorlage_kurzbz)) exit; + $vorlage = $this->vorlagelib->getVorlage($vorlage_kurzbz); - + if ($vorlage->error) show_error($vorlage->retval); - + if (count($vorlage->retval) != 1) show_error('Nachricht nicht vorhanden! ID: '.$vorlage_kurzbz); - + $data = array ( 'vorlage' => $vorlage->retval[0] ); - + $v = $this->load->view('system/vorlage/templatesEdit', $data); } @@ -84,62 +84,62 @@ class Vorlage extends VileSci_Controller 'subject' => 'TestSubject', 'body' => 'TestDevelopmentBodyText' ); - + $v = $this->load->view('system/vorlage/messageWrite', $data); } - + public function save() { $vorlage_kurzbz = $this->input->post('vorlage_kurzbz'); - + $data = array( 'bezeichnung' => $this->input->post('bezeichnung'), 'anmerkung' => $this->input->post('anmerkung'), 'mimetype' => $this->input->post('mimetype'), 'attribute' => $this->input->post('attribute') ); - + $vorlage = $this->vorlagelib->saveVorlage($vorlage_kurzbz, $data); - + if ($vorlage->error) show_error($vorlage->retval); - + $vorlage_kurzbz = $vorlage->retval; - + redirect('/system/vorlage/edit/'.$vorlage_kurzbz); } - + public function newText() { $vorlage_kurzbz = $this->input->post('vorlage_kurzbz'); - + $this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel'); $this->OrganisationseinheitModel->addLimit(1); $this->OrganisationseinheitModel->addOrder('oe_kurzbz'); - + $resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null)); - + if ($resultOE->error) show_error($resultOE->retval); - + if (hasData($resultOE)) { $orgeinheit_kurzbz = $resultOE->retval[0]->oe_kurzbz; - + $data = array ( 'vorlage_kurzbz' => $vorlage_kurzbz, 'studiengang_kz' => 0, 'version' => 1, 'oe_kurzbz' => $orgeinheit_kurzbz ); - + $vorlagetext = $this->vorlagelib->insertVorlagetext($data); - + if ($vorlagetext->error) show_error($vorlagetext->retval); - + $vorlagestudiengang_id = $vorlagetext->retval; - + redirect('/system/vorlage/editText/'.$vorlagestudiengang_id); } else @@ -147,72 +147,72 @@ class Vorlage extends VileSci_Controller show_error('No valid organisation unit found'); } } - + public function editText($vorlagestudiengang_id) { $vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id); - + if ($vorlagetext->error) show_error($vorlagetext->retval); - + $data = $vorlagetext->retval[0]; - + // Preview-Data $schema = $this->vorlagelib->getVorlage($data->vorlage_kurzbz); - + $data->schema = $schema->retval[0]->attribute; - + $this->load->view('system/vorlage/templatetextEdit', $data); } - + public function linkDocuments($vorlagestudiengang_id) { $data = array(); - + $this->load->model('system/Vorlagedokument_model', 'VorlagedokumentModel'); - + $return = $this->VorlagedokumentModel->loadDokumenteFromVorlagestudiengang($vorlagestudiengang_id); - + $data['documents'] = $return->retval; - + $this->load->model('system/Dokument_model', 'DokumentModel'); $this->DokumentModel->addOrder('bezeichnung'); - + $return = $this->DokumentModel->load(); - + $data['allDocuments'] = $return->retval; $data['vorlagestudiengang_id'] = $vorlagestudiengang_id; - + $this->load->view('system/vorlage/templateLinkDocuments', $data); } - + public function saveDocuments($vorlagestudiengang_id, $dokument_kurzbz, $sort) { $insert = array(); - + $insert['vorlagestudiengang_id'] = $vorlagestudiengang_id; $insert['dokument_kurzbz'] = $dokument_kurzbz; $insert['sort'] = $sort; - + $this->load->model('system/Vorlagedokument_model', 'VorlagedokumentModel'); - + $this->VorlagedokumentModel->insert($insert); } - + public function deleteDocumentLink($vorlagestudiengang_id) { $this->load->model('system/Vorlagedokument_model', 'VorlagedokumentModel'); - + $this->VorlagedokumentModel->delete($vorlagestudiengang_id); } - + public function changeSort($vorlagestudiengang_id, $sort) { $this->load->model('system/Vorlagedokument_model', 'VorlagedokumentModel'); - + $this->VorlagedokumentModel->update($vorlagestudiengang_id, array('sort' => $sort)); } - + public function saveText() { $data = array( @@ -223,38 +223,38 @@ class Vorlage extends VileSci_Controller 'text' => $this->input->post('text'), 'vorlagestudiengang_id' => $this->input->post('vorlagestudiengang_id') ); - + if ($this->input->post('sprache') == '') $data['sprache'] = null; else $data['sprache'] = $this->input->post('sprache'); - + if ($this->input->post('orgform_kurzbz') == '') $data['orgform_kurzbz'] = null; else $data['orgform_kurzbz'] = $this->input->post('orgform_kurzbz'); - + $vorlagetext = $this->vorlagelib->updateVorlagetext($data['vorlagestudiengang_id'], $data); - + if ($vorlagetext->error) show_error($vorlagetext->retval); - + redirect('/system/vorlage/editText/'.$data['vorlagestudiengang_id']); } - + public function preview($vorlagestudiengang_id) { $jsonDecodedForm = json_decode($this->input->post('formdata'), true); - + $vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id); - + if ($vorlagetext->error) show_error($vorlagetext->retval); - + $data = array( 'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $jsonDecodedForm) ); - + $this->load->view('system/vorlage/templatetextPreview', $data); } -} \ No newline at end of file +} diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php index d539fe342..ecde88891 100644 --- a/application/controllers/system/aufnahme/PrestudentMultiAssign.php +++ b/application/controllers/system/aufnahme/PrestudentMultiAssign.php @@ -147,27 +147,27 @@ class PrestudentMultiAssign extends VileSci_Controller // Load model prestudentm_model $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - if ($studiengang == '' || empty($studiengang)) + if ($studiengang == '' || isEmptyString($studiengang)) { $studiengang = null; } - if ($studiensemester == '' || empty($studiensemester)) + if ($studiensemester == '' || isEmptyString($studiensemester)) { $studiensemester = null; } - if ($aufnahmegruppe == '' || empty($aufnahmegruppe)) + if ($aufnahmegruppe == '' || isEmptyString($aufnahmegruppe)) { $aufnahmegruppe = null; } - if ($reihungstest == '' || empty($reihungstest)) + if ($reihungstest == '' || isEmptyString($reihungstest)) { $reihungstest = null; } - if ($stufe == '' || empty($stufe)) + if ($stufe == '' || isEmptyString($stufe)) { $stufe = null; } diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index c14474431..25561c795 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -144,8 +144,8 @@ class InfoCenter extends FHC_Controller if (isError($personexists)) show_error($personexists->retval); - if (empty($personexists->retval)) - show_error('person does not exist!'); + if (!hasData($personexists)) + show_error('Person does not exist!'); $origin_page = $this->input->get(self::ORIGIN_PAGE); if ($origin_page == self::INDEX_PAGE) @@ -213,7 +213,7 @@ class InfoCenter extends FHC_Controller $person_id, 'saveformalgep', array( - empty($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel, + isEmptyString($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel, is_null($timestamp) ? 'NULL' : $timestamp ) ); @@ -269,7 +269,7 @@ class InfoCenter extends FHC_Controller { $prestudent_id = $this->input->post('prestudentid'); - if (empty($prestudent_id)) + if (isEmptyString($prestudent_id)) $result = error('Prestudentid missing'); else { @@ -278,14 +278,14 @@ class InfoCenter extends FHC_Controller $zgv_code = $this->input->post('zgv') === 'null' ? null : $this->input->post('zgv'); $zgvort = $this->input->post('zgvort'); $zgvdatum = $this->input->post('zgvdatum'); - $zgvdatum = empty($zgvdatum) ? null : date_format(date_create($zgvdatum), 'Y-m-d'); + $zgvdatum = isEmptyString($zgvdatum) ? null : date_format(date_create($zgvdatum), 'Y-m-d'); $zgvnation_code = $this->input->post('zgvnation') === 'null' ? null : $this->input->post('zgvnation'); //zgvmasterdata $zgvmas_code = $this->input->post('zgvmas') === 'null' ? null : $this->input->post('zgvmas'); $zgvmaort = $this->input->post('zgvmaort'); $zgvmadatum = $this->input->post('zgvmadatum'); - $zgvmadatum = empty($zgvmadatum) ? null : date_format(date_create($zgvmadatum), 'Y-m-d'); + $zgvmadatum = isEmptyString($zgvmadatum) ? null : date_format(date_create($zgvmadatum), 'Y-m-d'); $zgvmanation_code = $this->input->post('zgvmanation') === 'null' ? null : $this->input->post('zgvmanation'); $result = $this->PrestudentModel->update( @@ -1193,9 +1193,9 @@ class InfoCenter extends FHC_Controller $orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : ''; $geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich'; $geburtsdatum = date('d.m.Y', strtotime($person->gebdatum)); - $zgvort = !empty($prestudent->zgvort) ? ' in '.$prestudent->zgvort : ''; - $zgvnation = !empty($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : ''; - $zgvdatum = !empty($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : ''; + $zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : ''; + $zgvnation = !isEmptyString($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : ''; + $zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : ''; $dokumenteNachzureichenMail = $dokumenteMail = array(); //convert documents to array so they can be parsed, and keeping only needed fields @@ -1208,8 +1208,8 @@ class InfoCenter extends FHC_Controller foreach ($dokumenteNachzureichen as $dokument) { - $anmerkung = !empty($dokument->anmerkung) ? ' | Anmerkung: '.$dokument->anmerkung : ''; - $nachgereichtam = !empty($dokument->nachgereicht_am) ? ' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; + $anmerkung = !isEmptyString($dokument->anmerkung) ? ' | Anmerkung: '.$dokument->anmerkung : ''; + $nachgereichtam = !isEmptyString($dokument->nachgereicht_am) ? ' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; $dokumenteNachzureichenMail[] = array('dokument_bezeichnung' => $dokument->dokument_bezeichnung, 'anmerkung' => $anmerkung, 'nachgereicht_am' => $nachgereichtam); } @@ -1270,7 +1270,7 @@ class InfoCenter extends FHC_Controller $receiver = $prestudent->studiengangmail; - if (!empty($receiver)) + if (!isEmptyString($receiver)) { //Freigabeinformationmail sent from default system mail to studiengang mail(s) $sent = $this->maillib->send('', $receiver, $subject, $email, '', null, null, 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Inhalt vollständig darzustellen.'); diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php index bcc45ff17..739567992 100644 --- a/application/core/DB_Model.php +++ b/application/core/DB_Model.php @@ -484,9 +484,9 @@ class DB_Model extends FHC_Model $tmpTable = trim($table); // Check parameters - if (empty($tmpTable)) return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); + if (isEmptyString($tmpTable)) return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); - if (!empty($alias)) + if (!isEmptyString($alias)) { $tmpTable .= ' AS '.$alias; } @@ -586,7 +586,7 @@ class DB_Model extends FHC_Model $result = array(); // String that represents the pgsql array, better if not empty - if (!empty($string)) + if (!isEmptyString($string)) { // Magic convertion preg_match_all( @@ -742,7 +742,7 @@ class DB_Model extends FHC_Model $result = null; // If the query is empty don't lose time - if (!empty($query)) + if (!isEmptyString($query)) { // If there are parameters to bind to the query if (is_array($parametersArray) && count($parametersArray) > 0) diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php index c1b680cf2..e3bf558e1 100644 --- a/application/core/FHC_Controller.php +++ b/application/core/FHC_Controller.php @@ -61,7 +61,7 @@ class FHC_Controller extends CI_Controller { $this->_controllerId = $this->input->get(self::FHC_CONTROLLER_ID); - if (!isset($this->_controllerId) || empty($this->_controllerId)) + if (!isset($this->_controllerId) || isEmptyString($this->_controllerId)) { $this->_controllerId = uniqid(); // generate a unique id // Redirect to the same URL, but giving FHC_CONTROLLER_ID as HTTP GET parameter diff --git a/application/helpers/fhc_helper.php b/application/helpers/fhc_helper.php index 19326e4df..425b40e3f 100644 --- a/application/helpers/fhc_helper.php +++ b/application/helpers/fhc_helper.php @@ -148,3 +148,22 @@ function loadResource($path, $resources = null, $subdir = false) } } } + +/** + * Returns true if the given string is empty + * Empty means that the parameter string is null or made of space, tab, vertical tab, line feed, carriage return + * and form feed characters. + */ +function isEmptyString($string) +{ + return ($string == null) || ($string != null && ctype_space($string) === true); +} + +/** + * Returns true if the given array is empty + * Empty means that is null, or is not null and it is not an array, or it is an array but without elements + */ +function isEmptyArray($array) +{ + return ($array == null) || ($array != null && !is_array($array) || (is_array($array) && count($array) == 0)); +} diff --git a/application/helpers/sancho_helper.php b/application/helpers/sancho_helper.php index 210c5115b..a8e9f05c9 100644 --- a/application/helpers/sancho_helper.php +++ b/application/helpers/sancho_helper.php @@ -35,7 +35,7 @@ function sendMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = DE $ci =& get_instance(); $ci->load->library('email'); $ci->load->library('MailLib'); - + $sanchoHeader_img = 'skin/images/sancho/'. $headerImg; $sanchoFooter_img = 'skin/images/sancho/sancho_footer.jpg'; @@ -49,7 +49,7 @@ function sendMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = DE // Set specific mail content into specific content template $content = _parseMailContent($vorlage_kurzbz, $vorlage_data); - + // overall main content data array $layout = array( 'CID_header' => $cid_header, @@ -75,14 +75,14 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data) { $ci =& get_instance(); $ci->load->library('VorlageLib'); - + $result = $ci->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz); if (isSuccess($result)) { // If the text and the subject of the template are not empty if (is_array($result->retval) && count($result->retval) > 0 && - !empty($result->retval[0]->text)) + !isEmptyString($result->retval[0]->text)) { // Parses template text $parsedText = $ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $vorlage_data); diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php index 602826320..1cd7e7691 100644 --- a/application/libraries/FiltersLib.php +++ b/application/libraries/FiltersLib.php @@ -236,9 +236,9 @@ class FiltersLib public function generateDatasetQuery($query, $filters) { $datasetQuery = 'SELECT * FROM ('.$query.') '.self::DATASET_TABLE_ALIAS; - $trimed = trim($query); + // If the given query is valid and the parameter filters is an array - if (!empty($trimed) && $filters != null && is_array($filters)) + if (!isEmptyString($query) && $filters != null && is_array($filters)) { $where = ''; // starts building the SQL where clause @@ -249,8 +249,7 @@ class FiltersLib if ($filtersCounter > 0) $where .= ' AND '; // if it's NOT the last one - $trimed2 = trim($filterDefinition->name); - if (!empty($trimed2)) // if the name of the applied filter is valid + if (!isEmptyString($filterDefinition->name)) // if the name of the applied filter is valid { // ...build the condition $where .= '"'.$filterDefinition->name.'"'.$this->_getDatasetQueryCondition($filterDefinition); @@ -290,16 +289,15 @@ class FiltersLib public function getFilterName($filterJson) { $filterName = $filterJson->name; // always present, used as default - $trimed = (isset($filterJson->namePhrase)?trim($filterJson->namePhrase):''); + // Filter name from phrases system - if (isset($filterJson->namePhrase) && !empty($trimed)) + if (isset($filterJson->namePhrase) && !isEmptyString($filterJson->namePhrase)) { // Loads the library to use the phrases system $this->_ci->load->library('PhrasesLib', array(self::FILTER_PHRASES_CATEGORY)); $tmpFilterNamePhrase = $this->_ci->phraseslib->t(self::FILTER_PHRASES_CATEGORY, $filterJson->namePhrase); - $trimed2 = trim($tmpFilterNamePhrase); - if (isset($tmpFilterNamePhrase) && !empty($trimed2)) // if is not null or an empty string + if (isset($tmpFilterNamePhrase) && !isEmptyString($tmpFilterNamePhrase)) // if is not null or an empty string { $filterName = $tmpFilterNamePhrase; } @@ -339,9 +337,9 @@ class FiltersLib public function removeSelectedField($selectedField) { $removeSelectedField = false; - $trimed = trim($selectedField); + // Checks the parameter selectedField - if (isset($selectedField) && !empty($trimed)) + if (isset($selectedField) && !isEmptyString($selectedField)) { // Retrives all the used fields by the current filter $fields = $this->getElementSession(self::SESSION_FIELDS); @@ -373,9 +371,9 @@ class FiltersLib public function addSelectedField($selectedField) { $removeSelectedField = false; - $trimed = trim($selectedField); + // Checks the parameter selectedField - if (isset($selectedField) && !empty($trimed)) + if (isset($selectedField) && !isEmptyString($selectedField)) { // Retrives all the used fields by the current filter $fields = $this->getElementSession(self::SESSION_FIELDS); @@ -402,9 +400,9 @@ class FiltersLib public function removeAppliedFilter($appliedFilter) { $removeAppliedFilter = false; - $trimed = trim($appliedFilter); + // Checks the parameter appliedFilter - if (isset($appliedFilter) && !empty($trimed)) + if (isset($appliedFilter) && !isEmptyString($appliedFilter)) { // Retrives all the used fields by the current filter $fields = $this->getElementSession(self::SESSION_FIELDS); @@ -490,9 +488,9 @@ class FiltersLib public function addFilter($filter) { $addFilter = false; - $trimed = trim($filter); + // Checks the parameter filter - if (isset($filter) && !empty($trimed)) + if (isset($filter) && !isEmptyString($filter)) { // Retrives all the used fields by the current filter $fields = $this->getElementSession(self::SESSION_FIELDS); @@ -533,9 +531,9 @@ class FiltersLib public function saveCustomFilter($customFilterDescription) { $saveCustomFilter = false; // by default returns a failure - $trimed = trim($customFilterDescription); + // Checks parameter customFilterDescription if not valid stop the execution - if (!isset($customFilterDescription) || empty($trimed)) + if (!isset($customFilterDescription) || isEmptyString($customFilterDescription)) { return $saveCustomFilter; } @@ -652,11 +650,10 @@ class FiltersLib */ private function _getFilterUniqueId($params) { - $trimed = trim($params[self::FILTER_PAGE_PARAM]); if ($params != null && is_array($params) && isset($params[self::FILTER_PAGE_PARAM]) - && !empty($trimed)) + && !isEmptyString($params[self::FILTER_PAGE_PARAM])) { $filterUniqueId = $params[self::FILTER_PAGE_PARAM]; } @@ -686,9 +683,9 @@ class FiltersLib private function _getDatasetQueryCondition($filterDefinition) { $condition = ''; // starts building the condition - $trimed = trim($filterDefinition->operation); + // "operation" is a required property for the applied filter definition - if (!empty($trimed)) + if (!isEmptyString($filterDefinition->operation)) { // Checks what operation is required switch ($filterDefinition->operation) @@ -761,9 +758,9 @@ class FiltersLib break; } } - $trimed = trim($condition); + // if the condition is valid - if (!empty($trimed)) $condition = ' '.$condition; // add a white space before + if (!isEmptyString($condition)) $condition = ' '.$condition; // add a white space before return $condition; } diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php index e7d3435e0..0871273b5 100644 --- a/application/libraries/MailLib.php +++ b/application/libraries/MailLib.php @@ -88,7 +88,7 @@ class MailLib if (!is_null($recipientBCC)) $this->ci->email->bcc($recipientBCC); $this->ci->email->subject($subject); $this->ci->email->message($message); - if (!empty($altMessage)) $this->ci->email->set_alt_message($altMessage); + if (!isEmptyString($altMessage)) $this->ci->email->set_alt_message($altMessage); // Avoid printing on standard output ugly error messages $result = @$this->ci->email->send(); @@ -151,7 +151,7 @@ class MailLib { $valid = false; - if (!empty($emailAddress)) + if (!isEmptyString($emailAddress)) { $valid = filter_var($emailAddress, FILTER_VALIDATE_EMAIL); } diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php index 61812df8c..8d04b9824 100644 --- a/application/libraries/MessageLib.php +++ b/application/libraries/MessageLib.php @@ -44,9 +44,9 @@ class MessageLib */ public function getMessage($msg_id, $person_id) { - if (empty($msg_id)) + if (!is_numeric($msg_id)) return $this->_error('', MSG_ERR_INVALID_MSG_ID); - if (empty($person_id)) + if (!is_numeric($person_id)) return $this->_error('', MSG_ERR_INVALID_RECIPIENTS); $msg = $this->ci->RecipientModel->getMessage($msg_id, $person_id); @@ -59,7 +59,7 @@ class MessageLib */ public function getMessagesByUID($uid, $oe_kurzbz = null, $all = false) { - if (empty($uid)) + if (isEmptyString($uid)) return $this->_error('', MSG_ERR_INVALID_MSG_ID); $msg = $this->ci->RecipientModel->getMessagesByUID($uid, $oe_kurzbz, $all); @@ -72,7 +72,7 @@ class MessageLib */ public function getMessagesByPerson($person_id, $oe_kurzbz = null, $all = false) { - if (empty($person_id)) + if (!is_numeric($person_id)) return $this->_error('', MSG_ERR_INVALID_MSG_ID); $msg = $this->ci->RecipientModel->getMessagesByPerson($person_id, $oe_kurzbz, $all); @@ -85,7 +85,7 @@ class MessageLib */ public function getSentMessagesByPerson($person_id, $oe_kurzbz = null, $all = false) { - if (empty($person_id)) + if (!is_numeric($person_id)) return $this->_error('', MSG_ERR_INVALID_MSG_ID); $msg = $this->ci->MessageModel->getMessagesByPerson($person_id, $oe_kurzbz, $all); @@ -98,7 +98,7 @@ class MessageLib */ public function getMessageByToken($token) { - if (empty($token)) + if (isEmptyString($token)) return $this->_error('', MSG_ERR_INVALID_TOKEN); $result = $this->ci->RecipientModel->getMessageByToken($token); @@ -155,12 +155,12 @@ class MessageLib */ public function updateMessageStatus($message_id, $person_id, $status) { - if (empty($message_id)) + if (!is_numeric($message_id)) { return $this->_error('', MSG_ERR_INVALID_MSG_ID); } - if (empty($person_id)) + if (!is_numeric($person_id)) { return $this->_error('', MSG_ERR_INVALID_USER_ID); } @@ -222,7 +222,7 @@ class MessageLib if ($this->_checkReceiverId($receiver_id)) { // If the text and the subject of the template are not empty - if (!empty($subject) && !empty($body)) + if (!isEmptyString($subject) && !isEmptyString($body)) { $result = $this->_saveMessage($sender_id, $receiver_id, $subject, $body, $relationmessage_id, $oe_kurzbz); // If no errors were occurred @@ -239,12 +239,12 @@ class MessageLib } else { - if (empty($subject)) + if (isEmptyString($subject)) { $result = $this->_error('', MSG_ERR_SUBJECT_EMPTY); break; } - elseif (empty($body)) + elseif (isEmptyString($body)) { $result = $this->_error('', MSG_ERR_BODY_EMPTY); break; @@ -315,7 +315,7 @@ class MessageLib { // If the text and the subject of the template are not empty if (is_array($result->retval) && count($result->retval) > 0 && - !empty($result->retval[0]->text) && !empty($result->retval[0]->subject)) + !isEmptyString($result->retval[0]->text) && !isEmptyString($result->retval[0]->subject)) { // Parses template text $parsedText = $this->ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $data); @@ -349,12 +349,12 @@ class MessageLib $result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND); break; } - elseif (empty($result->retval[0]->text)) + elseif (isEmptyString($result->retval[0]->text)) { $result = $this->_error('', MSG_ERR_INVALID_TEMPLATE); break; } - elseif (empty($result->retval[0]->subject)) + elseif (isEmptyString($result->retval[0]->subject)) { $result = $this->_error('', MSG_ERR_INVALID_TEMPLATE); break; diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php index 18a2d8fc7..ceeddca52 100644 --- a/application/libraries/NavigationLib.php +++ b/application/libraries/NavigationLib.php @@ -300,12 +300,10 @@ class NavigationLib */ private function _getNavigationtPage($params) { - // - $trimed = trim($params[self::NAVIGATION_PAGE_PARAM]); if ($params != null && is_array($params) && isset($params[self::NAVIGATION_PAGE_PARAM]) - && !empty($trimed)) + && !isEmptyString($params[self::NAVIGATION_PAGE_PARAM])) { $navigationPage = $params[self::NAVIGATION_PAGE_PARAM]; } diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index de75c2f4c..62def656a 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -34,7 +34,7 @@ class PhrasesLib */ public function getPhrase($phrase_id) { - if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); + if (isEmptyString($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); return $this->_ci->PhraseModel->load($phrase_id); } @@ -52,7 +52,7 @@ class PhrasesLib */ public function getPhraseInhalt($phrase_id) { - if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); + if (isEmptyString($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); return $this->_ci->PhrasentextModel->loadWhere(array('phrase_id' => $phrase_id)); } @@ -62,7 +62,7 @@ class PhrasesLib */ public function delPhrasentext($phrasentext_id) { - if (empty($phrasentext_id)) return error(MSG_ERR_INVALID_MSG_ID); + if (isEmptyString($phrasentext_id)) return error(MSG_ERR_INVALID_MSG_ID); return $this->_ci->PhrasentextModel->delete(array('phrasentext_id' => $phrasentext_id)); } @@ -72,7 +72,7 @@ class PhrasesLib */ public function savePhrase($phrase_id, $data) { - if (empty($data)) return error(MSG_ERR_INVALID_MSG_ID); + if (isEmptyString($data)) return error(MSG_ERR_INVALID_MSG_ID); return $this->_ci->PhraseModel->update($phrase_id, $data); } @@ -82,7 +82,7 @@ class PhrasesLib */ public function getPhrasentextById($phrasentext_id) { - if (empty($phrasentext_id)) + if (isEmptyString($phrasentext_id)) return error($this->_ci->lang->line('fhc_'.FHC_INVALIDID, false)); return $this->_ci->PhrasentextModel->load($phrasentext_id); @@ -170,7 +170,7 @@ class PhrasesLib */ public function parseVorlagetext($text, $data = array()) { - if (empty($text)) + if (isEmptyString($text)) return error($this->_ci->lang->line('fhc_'.FHC_INVALIDID, false)); return $this->_ci->parser->parse_string($text, $data, true); @@ -193,13 +193,13 @@ class PhrasesLib for ($i = 0; $i < count($this->_phrases); $i++) { $_phrase = $this->_phrases[$i]; // single phrase - $trimed = trim($_phrase->text); + // If the single phrase match the given parameters and is not an empty string if ($_phrase->category == $category && $_phrase->phrase == $phrase && $_phrase->orgeinheit_kurzbz == $orgeinheit_kurzbz && $_phrase->orgform_kurzbz == $orgform_kurzbz - && (!empty($trimed))) + && !isEmptyString($_phrase->text)) { if (!is_array($parameters)) $parameters = array(); // if params is not an array @@ -243,7 +243,7 @@ class PhrasesLib // Use the given language if present, otherwise retrives the language for the logged user $language = DEFAULT_LANGUAGE; - if (count($parameters) == 2 && !empty($parameters[1]) && is_string($parameters[1])) + if (count($parameters) == 2 && !isEmptyString($parameters[1]) && is_string($parameters[1])) { $language = $parameters[1]; } diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php index 404b927c5..eeb546ae3 100644 --- a/application/libraries/UDFLib.php +++ b/application/libraries/UDFLib.php @@ -63,7 +63,8 @@ class UDFLib */ public function UDFWidget($args, $htmlArgs = array()) { - if (!empty($args[UDFLib::SCHEMA_ARG_NAME]) && !empty($args[UDFLib::TABLE_ARG_NAME])) + if ((isset($args[UDFLib::SCHEMA_ARG_NAME]) && !isEmptyString($args[UDFLib::SCHEMA_ARG_NAME])) + && (isset($args[UDFLib::TABLE_ARG_NAME]) && !isEmptyString($args[UDFLib::TABLE_ARG_NAME]))) { // Loads the widget library $this->_ci->load->library('WidgetLib'); @@ -72,7 +73,7 @@ class UDFLib loadResource(APPPATH.'widgets/udf'); // Default external block is true - if (empty($args[UDFLib::FIELD_ARG_NAME]) && !isset($htmlArgs[HTMLWidget::EXTERNAL_BLOCK])) + if (!isset($args[UDFLib::FIELD_ARG_NAME]) && !isset($htmlArgs[HTMLWidget::EXTERNAL_BLOCK])) { $htmlArgs[HTMLWidget::EXTERNAL_BLOCK] = true; } @@ -85,11 +86,11 @@ class UDFLib } else { - if (empty($args[UDFLib::SCHEMA_ARG_NAME])) + if (!isset($args[UDFLib::SCHEMA_ARG_NAME]) || isEmptyString($args[UDFLib::SCHEMA_ARG_NAME])) { show_error(UDFLib::SCHEMA_ARG_NAME.' parameter is missing!'); } - if (empty($args[UDFLib::TABLE_ARG_NAME])) + if (!isset($args[UDFLib::TABLE_ARG_NAME]) || isEmptyString($args[UDFLib::TABLE_ARG_NAME])) { show_error(UDFLib::TABLE_ARG_NAME.' parameter is missing!'); } diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php index 4f463a27d..97ba591c9 100644 --- a/application/libraries/VorlageLib.php +++ b/application/libraries/VorlageLib.php @@ -30,7 +30,7 @@ class VorlageLib */ public function getVorlage($vorlage_kurzbz) { - if (empty($vorlage_kurzbz)) + if (isEmptyString($vorlage_kurzbz)) return error(MSG_ERR_INVALID_MSG_ID); $vorlage = $this->ci->VorlageModel->load($vorlage_kurzbz); @@ -57,7 +57,7 @@ class VorlageLib */ public function saveVorlage($vorlage_kurzbz, $data) { - if (empty($data)) + if (isEmptyArray($data)) return error(MSG_ERR_INVALID_MSG_ID); $vorlage = $this->ci->VorlageModel->update($vorlage_kurzbz, $data); @@ -72,7 +72,7 @@ class VorlageLib */ public function getVorlagetextByVorlage($vorlage_kurzbz) { - if (empty($vorlage_kurzbz)) + if (isEmptyString($vorlage_kurzbz)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); $vorlage = $this->ci->VorlageStudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz)); @@ -90,7 +90,7 @@ class VorlageLib */ public function loadVorlagetext($vorlage_kurzbz, $oe_kurzbz = null, $orgform_kurzbz = null, $sprache = null) { - if (empty($vorlage_kurzbz)) + if (isEmptyString($vorlage_kurzbz)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); // Try to search the template with the given vorlage_kurzbz and other parameters if present @@ -200,7 +200,7 @@ class VorlageLib */ public function parseVorlagetext($text, $data = array()) { - if (empty($text)) + if (isEmptyString($text)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); $text = $this->ci->parser->parse_string($text, $data, true); return $text; diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php index 739a64d89..fb724cd45 100644 --- a/application/libraries/WidgetLib.php +++ b/application/libraries/WidgetLib.php @@ -57,7 +57,7 @@ class WidgetLib loadResource($this->_widget_path.WidgetLib::DIR_HTML_WIDGETS); // If config are given then initialize this lib with the given config - if (!empty($config)) $this->initialize($config); + if (!isEmptyArray($config)) $this->initialize($config); } /** diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php index 44aa015a2..856aeb41c 100644 --- a/application/models/content/Ampel_model.php +++ b/application/models/content/Ampel_model.php @@ -50,8 +50,7 @@ class Ampel_model extends DB_Model */ public function execBenutzerSelect($benutzer_select) { - $trimed = trim($benutzer_select); - if (isset($benutzer_select) && !empty($trimed)) + if (isset($benutzer_select) && !isEmptyString($benutzer_select)) { return $this->execQuery($benutzer_select); } diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php index 8eba43521..a5d67c96f 100644 --- a/application/models/crm/Akte_model.php +++ b/application/models/crm/Akte_model.php @@ -11,7 +11,7 @@ class Akte_model extends DB_Model $this->dbTable = 'public.tbl_akte'; $this->pk = 'akte_id'; } - + /** * getAkten */ @@ -19,7 +19,7 @@ class Akte_model extends DB_Model { // Checks if the operation is permitted by the API caller if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; - + $query = 'SELECT akte_id, person_id, dokument_kurzbz, @@ -41,15 +41,15 @@ class Akte_model extends DB_Model CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden FROM public.tbl_akte WHERE person_id = ?'; - + $parametersArray = array($person_id); - + if (!is_null($dokument_kurzbz)) { $query .= ' AND dokument_kurzbz = ?'; array_push($parametersArray, $dokument_kurzbz); } - + if (!is_null($stg_kz) && !is_null($prestudent_id)) { $query .= ' AND dokument_kurzbz NOT IN ( @@ -65,9 +65,9 @@ class Akte_model extends DB_Model )'; array_push($parametersArray, $stg_kz, $prestudent_id); } - + $query .= ' ORDER BY erstelltam'; - + return $this->execQuery($query, $parametersArray); } @@ -78,7 +78,7 @@ class Akte_model extends DB_Model { // Checks if the operation is permitted by the API caller if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; - + $query = 'SELECT a.akte_id, a.person_id, a.dokument_kurzbz, @@ -103,17 +103,17 @@ class Akte_model extends DB_Model INNER JOIN public.tbl_prestudent p USING(person_id) LEFT JOIN public.tbl_dokumentprestudent dp USING(prestudent_id, dokument_kurzbz) WHERE a.person_id = ?'; - + $parametersArray = array($person_id); - - if (!empty($dokument_kurzbz)) + + if (!isEmptyString($dokument_kurzbz)) { $query .= ' AND a.dokument_kurzbz = ?'; array_push($parametersArray, $dokument_kurzbz); } - + $query .= ' GROUP BY a.akte_id ORDER BY a.erstelltam'; - + return $this->execQuery($query, $parametersArray); } @@ -125,7 +125,7 @@ class Akte_model extends DB_Model // Checks if the operation is permitted by the API caller if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if (isError($ent = $this->isEntitled('campus.tbl_dms', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; - + $query = 'SELECT a.akte_id, a.person_id, a.dokument_kurzbz, @@ -160,17 +160,17 @@ class Akte_model extends DB_Model INNER JOIN (SELECT dms_id, MAX(version) AS version FROM campus.tbl_dms_version GROUP BY dms_id) dvv ON (d.dms_id = dvv.dms_id) INNER JOIN campus.tbl_dms_version dv ON (dv.dms_id = dvv.dms_id AND dv.version = dvv.version) WHERE a.person_id = ?'; - + $parametersArray = array($person_id); - - if (!empty($dokument_kurzbz)) + + if (!isEmptyString($dokument_kurzbz)) { $query .= ' AND a.dokument_kurzbz = ?'; array_push($parametersArray, $dokument_kurzbz); } - + $query .= ' GROUP BY a.akte_id, d.dms_id, dv.dms_id, dv.version ORDER BY a.erstelltam'; - + return $this->execQuery($query, $parametersArray); } diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php index 2647d6105..274b66c2f 100644 --- a/application/models/person/Person_model.php +++ b/application/models/person/Person_model.php @@ -236,7 +236,7 @@ class Person_model extends DB_Model { $person = $persons->retval[$i]; - if (!empty($person->sprache)) + if (!isEmptyString($person->sprache)) { $language = $person->sprache; break; diff --git a/application/views/system/infocenter/dokpruefung.php b/application/views/system/infocenter/dokpruefung.php index fae23c48b..7c431fc46 100644 --- a/application/views/system/infocenter/dokpruefung.php +++ b/application/views/system/infocenter/dokpruefung.php @@ -16,7 +16,7 @@ ?> - titel) ? $dokument->bezeichnung : $dokument->titel ?> + titel) ? $dokument->bezeichnung : $dokument->titel ?> dokument_bezeichnung ?> erstelltam), 'd.m.Y') ?> diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php index 813a87889..1b699d634 100644 --- a/application/views/system/infocenter/studiengangZgvInfo.php +++ b/application/views/system/infocenter/studiengangZgvInfo.php @@ -21,7 +21,7 @@ $this->load->view(
- + p->t('infocenter', 'keineZugangsvoraussetzungenTxt'); ?> load->view(
-load->view('templates/FHC-Footer'); ?> \ No newline at end of file +load->view('templates/FHC-Footer'); ?> diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php index 0dbf6a1f0..b68ac5310 100644 --- a/application/views/system/infocenter/zgvpruefungen.php +++ b/application/views/system/infocenter/zgvpruefungen.php @@ -129,7 +129,7 @@
zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y'); + $zgvdatum = isEmptyString($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y'); if ($infoonly): echo $zgvdatum; else: @@ -188,7 +188,7 @@
zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y'); + $zgvmadatum = isEmptyString($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y'); if ($infoonly): echo $zgvmadatum; else: @@ -305,7 +305,7 @@
prestudentstatus->bewerbung_abgeschicktamum)) + if (isEmptyString($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum)) { $disabled = 'disabled'; $disabledTxt = 'Die Bewerbung muss erst abgeschickt worden sein.'; diff --git a/application/widgets/Reihungstest_widget.php b/application/widgets/Reihungstest_widget.php index 023b501d3..b8bae1ff9 100644 --- a/application/widgets/Reihungstest_widget.php +++ b/application/widgets/Reihungstest_widget.php @@ -6,14 +6,14 @@ class Reihungstest_widget extends DropdownWidget { $this->load->model('crm/Reihungstest_model', 'ReihungstestModel'); $this->ReihungstestModel->addOrder('datum', 'DESC'); - + $this->addSelectToModel($this->ReihungstestModel, 'reihungstest_id', 'CONCAT(datum, \' \', uhrzeit, \' \', anmerkung)'); - + $parametersArray = array(); // If the parameters studiengang or studiensemester are given and are not empty if (isset($widgetData) && is_array($widgetData) - && ((isset($widgetData['studiengang']) && !empty($widgetData['studiengang'])) - || (isset($widgetData['studiensemester']) && !empty($widgetData['studiensemester'])))) + && ((isset($widgetData['studiengang']) && !isEmptyString($widgetData['studiengang'])) + || (isset($widgetData['studiensemester']) && !isEmptyString($widgetData['studiensemester'])))) { if ($widgetData['studiengang'] != null) { @@ -30,14 +30,14 @@ class Reihungstest_widget extends DropdownWidget // Set 0 = 1 in the where clause of the query $parametersArray['0'] = '1'; } - + $this->setElementsArray( $this->ReihungstestModel->loadWhere($parametersArray), true, 'Select a reihungstest...', 'No reihungstest found' ); - + $this->loadDropDownView($widgetData); } -} \ No newline at end of file +}