- 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/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;
 	}

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);
 		}

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;

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];
 		}

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];
 				}

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!');
 			}

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;

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);
     }
 
     /**