- application/core/* -> CS compliant

- application/libraries/* -> CS compliant
- FHC_Model isEntitled method now return error() or success()
- Updated all code that uses isEntitled method from FHC_Model
- Removed Squiz.PHP.DisallowSizeFunctionsInLoops from CS ruleset
- Removed depracated method replace from DB_Model
- Removed unused method pgArrayPhp from DB_Model
- Renamed method arrayMergeIndex to _arrayCombine in DB_Model and set as private
- Added method _manageUDFs to DB_Model (a wrapper for UDFLib->manageUDFs)

application/models/codex/Orgform_model.php

@@ -12,11 +12,13 @@ class Orgform_model extends DB_Model
 		$this->pk = 'orgform_kurzbz';
 	}
 	
+	/**
+	 * Returns all the orgform except VBB and ZGS
+	 */
 	public function getOrgformLV()
 	{
 		// Checks rights
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$query = "SELECT *
 					FROM bis.tbl_orgform
@@ -25,4 +27,4 @@ class Orgform_model extends DB_Model
 		
 		return $this->execQuery($query);
 	}
-}
+}

application/models/crm/Akte_model.php

@@ -13,19 +13,12 @@ class Akte_model extends DB_Model
 	}
 	
 	/**
-	 * 
+	 * getAkten
 	 */
 	public function getAkten($person_id, $dokument_kurzbz = null, $stg_kz = null, $prestudent_id = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_dokument', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentstudiengang', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$query = 'SELECT akte_id,
 						 person_id,
@@ -79,17 +72,12 @@ class Akte_model extends DB_Model
 	}
 	
 	/**
-	 * 
+	 * getAktenAccepted
 	 */
 	public function getAktenAccepted($person_id, $dokument_kurzbz = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		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,
@@ -130,21 +118,13 @@ class Akte_model extends DB_Model
 	}
 	
 	/**
-	 * 
+	 * getAktenAcceptedDms
 	 */
 	public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('campus.tbl_dms', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('campus.tbl_dms_version', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		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,
@@ -193,4 +173,4 @@ class Akte_model extends DB_Model
 		
 		return $this->execQuery($query, $parametersArray);
 	}
-}
+}

application/models/crm/Dokumentprestudent_model.php

@@ -12,10 +12,13 @@ class Dokumentprestudent_model extends DB_Model
 		$this->pk = array('prestudent_id', 'dokument_kurzbz');
 	}
 	
+	/**
+	 * setAccepted
+	 */
 	public function setAccepted($prestudent_id, $studiengang_kz)
 	{
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$result = null;
 		
@@ -41,10 +44,13 @@ class Dokumentprestudent_model extends DB_Model
 		return $result;
 	}
 	
+	/**
+	 * setAcceptedDocuments
+	 */
 	public function setAcceptedDocuments($prestudent_id, $dokument_kurzbz)
 	{
-		if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$result = null;
 		
@@ -68,4 +74,4 @@ class Dokumentprestudent_model extends DB_Model
 		
 		return $result;
 	}
-}
+}

application/models/crm/Dokumentstudiengang_model.php

@@ -12,11 +12,13 @@ class Dokumentstudiengang_model extends DB_Model
 		$this->pk = array('studiengang_kz', 'dokument_kurzbz');
 	}
 	
+	/**
+	 * getDokumentstudiengangByStudiengang_kz
+	 */
 	public function getDokumentstudiengangByStudiengang_kz($studiengang_kz, $onlinebewerbung = null, $pflicht = null, $nachreichbar = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_dokument', 's', FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_dokument', 's', FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$this->addJoin('public.tbl_dokument', 'dokument_kurzbz');
 			
@@ -39,4 +41,4 @@ class Dokumentstudiengang_model extends DB_Model
 		
 		return $this->loadWhere($parameterArray);
 	}
-}
+}

application/models/crm/Prestudent_model.php

@@ -13,17 +13,15 @@ class Prestudent_model extends DB_Model
 	}
 
 	/**
-	 * @return void
+	 * getLastStatuses
 	 */
 	public function getLastStatuses($person_id, $studiensemester_kurzbz = null, $studiengang_kz = null, $status_kurzbz = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$query = 'SELECT *
 					FROM public.tbl_prestudent p
@@ -60,7 +58,7 @@ class Prestudent_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * updateAufnahmegruppe
 	 */
 	public function updateAufnahmegruppe($prestudentIdArray, $aufnahmegruppe)
 	{
@@ -85,8 +83,12 @@ class Prestudent_model extends DB_Model
 	 *	- stufe and aufnahmegruppe
 	 *	- reihungstest score
 	 */
-	public function getPrestudentMultiAssign($studiengang = null, $studiensemester = null, $gruppe = null, $reihungstest = null, $stufe = null)
+	public function getPrestudentMultiAssign(
+		$studiengang = null, $studiensemester = null, $gruppe = null, $reihungstest = null, $stufe = null
+	)
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		$this->addSelect(
 			'p.person_id,
 			prestudent_id,

application/models/crm/Prestudentstatus_model.php

@@ -14,17 +14,15 @@ class Prestudentstatus_model extends DB_Model
 	}
 
 	/**
-	 * @return void
+	 * getLastStatus
 	 */
 	public function getLastStatus($prestudent_id, $studiensemester_kurzbz = '', $status_kurzbz = '')
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$query = 'SELECT tbl_prestudentstatus.*,
 						 bezeichnung AS studienplan_bezeichnung,
@@ -53,10 +51,12 @@ class Prestudentstatus_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * updateStufe
 	 */
 	public function updateStufe($prestudentIdArray, $stufe)
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		return $this->execQuery(
 			'UPDATE public.tbl_prestudentstatus
 				SET rt_stufe = ?
@@ -82,8 +82,8 @@ class Prestudentstatus_model extends DB_Model
 	public function getStatusByFilter($prestudent_id, $status_kurzbz = '', $ausbildungssemester = '', $studiensemester_kurzbz = '')
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$query = '
 			SELECT

application/models/organisation/Studiengang_model.php

@@ -13,15 +13,14 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * getAllForBewerbung
 	 */
 	public function getAllForBewerbung()
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('lehre.vw_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('bis.tbl_lgartcode', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('bis.tbl_lgartcode', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		if (isError($ent = $this->isEntitled('lehre.vw_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 
 		$allForBewerbungQuery = 'SELECT DISTINCT studiengang_kz,
 										typ,
@@ -100,10 +99,12 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * getStudienplan
 	 */
 	public function getStudienplan($studiensemester_kurzbz, $ausbildungssemester, $aktiv, $onlinebewerbung)
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		// Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz
 		$this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz');
 		// Then join with table lehre.tbl_studienplan on column studienordnung_id
@@ -135,10 +136,12 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * getStudiengangBewerbung
 	 */
 	public function getStudiengangBewerbung()
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		// Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz
 		$this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz');
 		// Join table lehre.tbl_studienordnung with table lehre.tbl_akadgrad on column akadgrad_id
@@ -150,7 +153,8 @@ class Studiengang_model extends DB_Model
 		// Then join with table lehre.tbl_bewerbungsfrist on column studiensemester_kurzbz
 		$this->addJoin(
 			'public.tbl_bewerbungstermine',
-			'tbl_bewerbungstermine.studiensemester_kurzbz = ss.studiensemester_kurzbz AND tbl_bewerbungstermine.studienplan_id = ss.studienplan_id',
+			'tbl_bewerbungstermine.studiensemester_kurzbz = ss.studiensemester_kurzbz
+			AND tbl_bewerbungstermine.studienplan_id = ss.studienplan_id',
 			'LEFT'
 		);
 		// Ordering by studiengang_kz and studienplan_id
@@ -166,7 +170,9 @@ class Studiengang_model extends DB_Model
 			'public.tbl_studiengang.aktiv = TRUE
 			AND public.tbl_studiengang.onlinebewerbung = TRUE
 			AND ((tbl_bewerbungstermine.beginn <= NOW() AND tbl_bewerbungstermine.ende >= NOW()) OR tbl_bewerbungstermine.beginn IS NULL)
-			AND ss.studiensemester_kurzbz IN (SELECT DISTINCT studiensemester_kurzbz FROM public.tbl_bewerbungstermine WHERE beginn <= NOW() AND ende >= NOW())
+			AND ss.studiensemester_kurzbz IN (
+				SELECT DISTINCT studiensemester_kurzbz FROM public.tbl_bewerbungstermine WHERE beginn <= NOW() AND ende >= NOW()
+			)
 			AND ss.semester = 1
 			AND lehre.tbl_studienplan.aktiv = TRUE'
 			,
@@ -180,10 +186,12 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * getAppliedStudiengang
 	 */
 	public function getAppliedStudiengang($person_id, $studiensemester_kurzbz, $titel)
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		// Then join with table public.tbl_prestudent
 		$this->addJoin('public.tbl_prestudent', 'studiengang_kz');
 		// Join table public.tbl_prestudentstatus
@@ -227,10 +235,12 @@ class Studiengang_model extends DB_Model
 	}
 	
 	/**
-	 *
+	 * getAppliedStudiengangFromNow
 	 */
 	public function getAppliedStudiengangFromNow($person_id, $titel)
 	{
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
+		
 		// Then join with table public.tbl_prestudent
 		$this->addJoin('public.tbl_prestudent', 'studiengang_kz');
 		// Join table public.tbl_prestudentstatus
@@ -278,20 +288,20 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * getAvailableReihungstestByPersonId
 	 */
 	public function getAvailableReihungstestByPersonId($person_id)
 	{
-		if (($isEntitled = $this->isEntitled('lehre.tbl_studienordnung', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_reihungstest', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_reihungstest', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('lehre.tbl_studienordnung', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz');
 
@@ -334,4 +344,4 @@ class Studiengang_model extends DB_Model
 			array('reihungstest')
 		);
 	}
-}
+}

application/models/organisation/Studiensemester_model.php

@@ -13,11 +13,13 @@ class Studiensemester_model extends DB_Model
 		$this->hasSequence = false;
 	}
 	
+	/**
+	 * getLastOrAktSemester
+	 */
 	public function getLastOrAktSemester($days = 60)
 	{
 		// Checks rights
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		if (!is_numeric($days))
 		{
@@ -33,11 +35,13 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query);
 	}
 	
+	/**
+	 * getNextFrom
+	 */
 	public function getNextFrom($studiensemester_kurzbz)
 	{
 		// Checks rights
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$query = 'SELECT studiensemester_kurzbz,
 						 start,
@@ -55,13 +59,13 @@ class Studiensemester_model extends DB_Model
 	}
 	
 	/**
-	 * @return void
+	 * getNearest
 	 */
 	public function getNearest($semester = '')
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.vw_studiensemester', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.vw_studiensemester', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$query = 'SELECT studiensemester_kurzbz,
 						 start,
@@ -86,4 +90,4 @@ class Studiensemester_model extends DB_Model
 		
 		return $this->execQuery($query);
 	}
-}
+}

application/models/person/Person_model.php

@@ -12,28 +12,31 @@ class Person_model extends DB_Model
 		$this->pk = 'person_id';
 	}
 
+	/**
+	 * getPersonKontaktByZugangscode
+	 */
 	public function getPersonKontaktByZugangscode($zugangscode, $email)
 	{
 		$this->addJoin('public.tbl_kontakt', 'person_id');
-
+		
 		return $this->loadWhere(array('zugangscode' => $zugangscode, 'kontakt' => $email));
 	}
 
 	/**
-	 *
+	 * checkBewerbung
 	 */
 	public function checkBewerbung($email, $studiensemester_kurzbz = null)
 	{
-		if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_benutzer', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_benutzer', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$checkBewerbungQuery = '';
 		$parametersArray = array($email, $email, $email);
@@ -67,6 +70,9 @@ class Person_model extends DB_Model
 		return $this->execQuery($checkBewerbungQuery, $parametersArray);
 	}
 
+	/**
+	 * updatePerson
+	 */
 	public function updatePerson($person)
 	{
 		if (isset($person['svnr']) && $person['svnr'] != '')
@@ -93,15 +99,15 @@ class Person_model extends DB_Model
 	}
 
 	/**
-	 * @return void
+	 * getPersonFromStatus
 	 */
 	public function getPersonFromStatus($status_kurzbz, $von, $bis)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 
 		$this->addJoin('public.tbl_prestudent', 'person_id');
 
@@ -129,5 +135,4 @@ class Person_model extends DB_Model
 
 		return $result;
 	}
-
 }

application/models/system/Message_model.php

@@ -20,12 +20,12 @@ class Message_model extends DB_Model
 	public function getMessagesByPerson($person_id, $all)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$sql = 'SELECT m.message_id,
 						m.person_id,
@@ -68,7 +68,7 @@ class Message_model extends DB_Model
 	}
 	
 	/**
-	 * 
+	 * getMessageVars
 	 */
 	public function getMessageVars()
 	{
@@ -85,7 +85,7 @@ class Message_model extends DB_Model
 	}
 	
 	/**
-	 * 
+	 * getMsgVarsDataByPrestudentId
 	 */
 	public function getMsgVarsDataByPrestudentId($prestudent_id)
 	{
@@ -93,4 +93,4 @@ class Message_model extends DB_Model
 		
 		return $this->execQuery(sprintf($query, is_array($prestudent_id) ? 'IN' : '='), array($prestudent_id));
 	}
-}
+}

application/models/system/Phrase_model.php

@@ -13,15 +13,15 @@ class Phrase_model extends DB_Model
 	}
 
 	/**
-	 * 
+	 * getPhrases
 	 */
 	public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('system.tbl_phrase', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('system.tbl_phrasentext', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('system.tbl_phrase', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('system.tbl_phrasentext', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$parametersArray = array('app' => $app, 'sprache' => $sprache);
 
@@ -60,4 +60,4 @@ class Phrase_model extends DB_Model
 		
 		return $this->execQuery($query, $parametersArray);
 	}
-}
+}

application/models/system/Recipient_model.php

@@ -19,14 +19,14 @@ class Recipient_model extends DB_Model
 	public function getMessage($message_id, $person_id)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$query = 'SELECT mr.message_id,
 						 mr.person_id,
@@ -56,12 +56,12 @@ class Recipient_model extends DB_Model
 	public function getMessageByToken($token)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$sql = 'SELECT r.message_id,
 						m.person_id as sender_id,
@@ -90,14 +90,14 @@ class Recipient_model extends DB_Model
 	public function getMessagesByPerson($person_id, $all)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$sql = 'SELECT DISTINCT ON (r.message_id) r.message_id,
 						m.person_id,
@@ -152,14 +152,14 @@ class Recipient_model extends DB_Model
 		// if same user
 		if ($uid === getAuthUID())
 		{
-			if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-				return $isEntitled;
+			if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+				return $ent;
 		}
 		// if different user, for reading messages from other users
 		else
 		{
-			if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-				return $isEntitled;
+			if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+				return $ent;
 		}
 
 		// get Data
@@ -208,12 +208,12 @@ class Recipient_model extends DB_Model
 	public function getMessages($kontaktType, $sent, $limit = null, $message_id = null)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$query = 'SELECT mm.message_id,
 						 ks.kontakt as sender,
@@ -266,10 +266,10 @@ class Recipient_model extends DB_Model
 	public function getCountUnreadMessages($person_id)
 	{
 		// Checks if the operation is permitted by the API caller
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
-		if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
+		if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))
+			return $ent;
 		
 		$sql = 'SELECT COUNT(r.message_id) AS unreadMessages
 				  FROM public.tbl_msg_recipient r JOIN public.tbl_msg_status s
@@ -288,4 +288,4 @@ class Recipient_model extends DB_Model
 		
 		return $this->execQuery($sql, $parametersArray);
 	}
-}
+}

application/models/system/Vorlage_model.php

@@ -12,14 +12,16 @@ class Vorlage_model extends DB_Model
 		$this->pk = 'vorlage_kurzbz';
 	}
 
+	/**
+	 * Returns mume types
+	 */
 	public function getMimeTypes()
 	{
 		// Checks rights
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$query = 'SELECT DISTINCT mimetype FROM public.tbl_vorlage ORDER BY mimetype';
 		
 		return $this->execQuery($query);
 	}
-}
+}

application/models/system/Vorlagedokument_model.php

@@ -13,13 +13,12 @@ class Vorlagedokument_model extends DB_Model
 	}
 
 	/**
-	 *
+	 * loadDokumenteFromVorlagestudiengang
 	 */
 	public function loadDokumenteFromVorlagestudiengang($vorlagestudiengang_id)
 	{
 		// Checks rights
-		if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
-			return $isEntitled;
+		if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent;
 		
 		$qry = 'SELECT vorlagedokument_id,
 						sort,
@@ -33,4 +32,4 @@ class Vorlagedokument_model extends DB_Model
 		
 		return $this->execQuery($qry, array($vorlagestudiengang_id));
 	}
-}
+}