Merge branch 'master' into permissions

application/models/content/Ampel_model.php

@@ -32,11 +32,11 @@ class Ampel_model extends DB_Model
 			$query .= ' email = ? AND';
 		}
 
-		$query .= '
+		$query .= '(
 			(NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
 			    OR (verfallszeit IS NULL)
 			   AND (NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
-			    OR (vorlaufzeit IS NULL AND NOW() < deadline)';
+			    OR (vorlaufzeit IS NULL AND NOW() < deadline))';
 
 		$query .= ' ORDER BY deadline DESC';
 
@@ -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);
 		}

application/models/crm/Akte_model.php

@@ -100,7 +100,7 @@ class Akte_model extends DB_Model
 
 		$parametersArray = array($person_id);
 
-		if (!empty($dokument_kurzbz))
+		if (!isEmptyString($dokument_kurzbz))
 		{
 			$query .= ' AND a.dokument_kurzbz = ?';
 			array_push($parametersArray, $dokument_kurzbz);
@@ -153,7 +153,7 @@ class Akte_model extends DB_Model
 
 		$parametersArray = array($person_id);
 
-		if (!empty($dokument_kurzbz))
+		if (!isEmptyString($dokument_kurzbz))
 		{
 			$query .= ' AND a.dokument_kurzbz = ?';
 			array_push($parametersArray, $dokument_kurzbz);
@@ -191,5 +191,4 @@ class Akte_model extends DB_Model
 
 		return success($dokumente->retval);
 	}
-
 }

application/models/person/Person_model.php

@@ -219,7 +219,7 @@ class Person_model extends DB_Model
 			{
 				$person = $persons->retval[$i];
 
-				if (!empty($person->sprache))
+				if (!isEmptyString($person->sprache))
 				{
 					$language = $person->sprache;
 					break;

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()
 	{
@@ -204,7 +205,7 @@ class MessageToken_model extends CI_Model
 	}
 
 	/**
-	 *
+	 * Searchs for a person by its person_id and checks if it is an employee
 	 */
 	public function isEmployee($person_id)
 	{

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