Merge branch 'master' into permissions

application/controllers/MailJob.php

@@ -25,7 +25,7 @@ class MailJob extends Auth_Controller
 		parent::__construct(array());
 
 		// 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)

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

application/controllers/ViewMessage.php

@@ -92,7 +92,7 @@ class ViewMessage extends FHC_Controller
 	{
 		$token = $this->input->get('token');
 
-		if (empty($token))
+		if (isEmptyString($token))
 		{
 			show_error('no token supplied');
 		}

application/controllers/Vilesci.php

@@ -1,9 +1,9 @@
-	<?php
+<?php
+
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Vilesci extends Auth_Controller
 {
-
 	public function __construct()
 	{
 		parent::__construct(

application/controllers/api/v1/CheckUserAuth.php

@@ -24,9 +24,6 @@ class CheckUserAuth extends REST_Controller
 	public function __construct()
 	{
 		parent::__construct();
-
-		// Loads the authentication library
-		$this->load->library('AuthLib');
 	}
 
 	/**

application/controllers/api/v1/Test.php

@@ -13,7 +13,7 @@ class Test extends REST_Controller
     {
 		parent::__construct();
 
-		// Loads return messages
+		// Loads helper message to manage returning messages
 		$this->load->helper('message');
     }
 

application/controllers/api/v1/codex/Gemeinde.php

@@ -23,7 +23,7 @@ class Gemeinde extends APIv1_Controller
 	{
 		parent::__construct(array('Gemeinde' => 'basis/gemeinde:rw', 'GemeindeByPlz' => 'basis/gemeinde:r'));
 		// Load model GemeindeModel
-		$this->load->model("codex/gemeinde_model", "GemeindeModel");
+		$this->load->model('codex/gemeinde_model', 'GemeindeModel');
 	}
 
 	/**

application/controllers/api/v1/crm/RtPerson.php

@@ -23,7 +23,7 @@ class RtPerson extends APIv1_Controller
 	{
 		parent::__construct(array('RtPerson' => 'basis/rtperson:rw'));
 		// Load model StatusModel
-		$this->load->model("crm/RtPerson_model", "RtPersonModel");
+		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
 	}
 
 	/**

application/controllers/api/v1/organisation/Studienplan.php

@@ -29,7 +29,7 @@ class Studienplan extends APIv1_Controller
 			)
 		);
 		// Load model PersonModel
-		$this->load->model("organisation/studienplan_model", "StudienplanModel");
+		$this->load->model('organisation/studienplan_model', 'StudienplanModel');
 	}
 
 	public function getStudienplan()

application/controllers/api/v1/ressource/Ort.php

@@ -23,7 +23,7 @@ class Ort extends APIv1_Controller
 	{
 		parent::__construct(array('Ort' => 'basis/ort:rw', 'All' => 'basis/ort:r'));
 		// Load model OrtModel
-		$this->load->model("ressource/ort_model", "OrtModel");
+		$this->load->model('ressource/ort_model', 'OrtModel');
 	}
 
 	/**

application/controllers/crm/Statusgrund.php

@@ -20,9 +20,9 @@ class Statusgrund extends Auth_Controller
 			)
 		);
 
-        $this->load->model("crm/Status_model", "StatusModel");
-        $this->load->model("crm/Statusgrund_model", "StatusgrundModel");
-        $this->load->model("system/Sprache_model", "SpracheModel");
+        $this->load->model('crm/Status_model', 'StatusModel');
+        $this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+        $this->load->model('system/Sprache_model', 'SpracheModel');
     }
 
 	public function index()

application/controllers/organisation/Studienjahr.php

@@ -25,7 +25,7 @@ class Studienjahr extends Auth_Controller
 			)
 		);
 
-		$this->load->model("organisation/Studienjahr_model", "StudienjahrModel");
+		$this->load->model('organisation/Studienjahr_model', 'StudienjahrModel');
 	}
 
 	/**

application/controllers/organisation/Studiensemester.php

@@ -25,8 +25,8 @@ class Studiensemester extends Auth_Controller
 			)
 		);
 
-		$this->load->model("organisation/Studiensemester_model", "StudiensemesterModel");
-		$this->load->model("organisation/Studienjahr_model", "StudienjahrModel");
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('organisation/Studienjahr_model', 'StudienjahrModel');
 	}
 
 	/**

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

application/controllers/system/Filters.php

@@ -7,6 +7,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * Provides data to the ajax get calls about the filter
  * Accepts ajax post calls to change the filter data
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterWidget has its
+ * 		own permissions check
  */
 class Filters extends FHC_Controller
 {
@@ -19,6 +21,10 @@ class Filters extends FHC_Controller
     {
         parent::__construct();
 
+		// Loads authentication helper
+		// NOTE: needed to load custom filters do not remove!
+		$this->load->helper('fhcauth');
+
 		// Loads the FiltersLib with HTTP GET/POST parameters
 		$this->_loadFiltersLib();
 
@@ -209,7 +215,7 @@ class Filters extends FHC_Controller
 	{
 		if (!$this->filterslib->isAllowed())
 		{
-			$this->_terminateWithJsonError('You are not allowed to access to this content');
+			$this->terminateWithJsonError('You are not allowed to access to this content');
 		}
 	}
 
@@ -238,18 +244,7 @@ class Filters extends FHC_Controller
 		}
 		else // Otherwise an error will be written in the output
 		{
-			$this->_terminateWithJsonError('Parameter "'.self::FILTER_PAGE_PARAM.'" not provided!');
+			$this->terminateWithJsonError('Parameter "'.self::FILTER_PAGE_PARAM.'" not provided!');
 		}
 	}
-
-	/**
-	 * Terminate the execution of the page after have printed a message encoded to JSON.
-	 * Used directly header and echo to speed up the output before the exit command stops the execution.
-	 */
-	private function _terminateWithJsonError($message)
-	{
-		header('Content-Type: application/json');
-		echo json_encode(error($message));
-		exit;
-	}
 }

application/controllers/system/Messages.php

@@ -29,12 +29,15 @@ class Messages extends Auth_Controller
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
-		$this->loadPhrases(array(
-								'global',
-								'person',
-								'lehre',
-								'ui',
-								'infocenter'));
+		$this->loadPhrases(
+			array(
+				'global',
+				'person',
+				'lehre',
+				'ui',
+				'infocenter'
+			)
+		);
 
 		$this->_setAuthUID(); // sets property uid
 	}

application/controllers/system/Phrases.php

@@ -29,9 +29,6 @@ class Phrases extends Auth_Controller
 
         // Loads the widget library
 		$this->load->library('WidgetLib');
-
-        // Loads helper message to manage returning messages
-		$this->load->helper('message');
     }
 
 	/**
@@ -64,7 +61,7 @@ class Phrases extends Auth_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);
@@ -87,7 +84,7 @@ class Phrases extends Auth_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);
@@ -102,7 +99,7 @@ class Phrases extends Auth_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)

application/controllers/system/UDF.php

@@ -13,13 +13,6 @@ class UDF extends Auth_Controller
 			)
 		);
 
-        // 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');
     }
@@ -90,8 +83,8 @@ class UDF extends Auth_Controller
 		$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))

application/controllers/system/Vorlage.php

@@ -25,10 +25,10 @@ class Vorlage extends Auth_Controller
 			)
 		);
 
-        // Loads the vorlage library
-        $this->load->library('VorlageLib');
+		// Loads the vorlage library
+		$this->load->library('VorlageLib');
 
-        // Loads the widget library
+		// Loads the widget library
 		$this->load->library('WidgetLib');
     }
 
@@ -61,7 +61,7 @@ class Vorlage extends Auth_Controller
 
 	public function view($vorlage_kurzbz = null)
 	{
-		if (empty($vorlage_kurzbz)) exit;
+		if (isEmptyString($vorlage_kurzbz)) exit;
 
 		$vorlagentext = $this->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz);
 
@@ -78,7 +78,7 @@ class Vorlage extends Auth_Controller
 
 	public function edit($vorlage_kurzbz = null)
 	{
-		if (empty($vorlage_kurzbz)) exit;
+		if (isEmptyString($vorlage_kurzbz)) exit;
 
 		$vorlage = $this->vorlagelib->getVorlage($vorlage_kurzbz);
 

application/controllers/system/aufnahme/PrestudentMultiAssign.php

@@ -14,9 +14,6 @@ class PrestudentMultiAssign extends Auth_Controller
 			)
 		);
 
-        // Loads helper message to manage returning messages
-		$this->load->helper('message');
-
 		// Loads the widget library
 		$this->load->library('WidgetLib');
     }
@@ -156,27 +153,27 @@ class PrestudentMultiAssign extends Auth_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;
 		}

application/controllers/system/extensions/Manager.php

@@ -22,7 +22,7 @@ class Manager extends Auth_Controller
 		);
 
 		// Load helpers to upload files
-		$this->load->helper(array('form', 'url'));
+		$this->load->helper('form');
 
 		// Loads the extensions library
 		$this->load->library('ExtensionsLib');

application/controllers/system/infocenter/InfoCenter.php

@@ -163,8 +163,8 @@ class InfoCenter extends Auth_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)
@@ -232,7 +232,7 @@ class InfoCenter extends Auth_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
 						)
 					);
@@ -288,7 +288,7 @@ class InfoCenter extends Auth_Controller
 	{
 		$prestudent_id = $this->input->post('prestudentid');
 
-		if (empty($prestudent_id))
+		if (isEmptyString($prestudent_id))
 			$result = error('Prestudentid missing');
 		else
 		{
@@ -297,14 +297,14 @@ class InfoCenter extends Auth_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(
@@ -711,7 +711,12 @@ class InfoCenter extends Auth_Controller
 			'#',											// link
 			array(),										// children
 			'',												// icon
-			true											// expand
+			true,											// expand
+			null, 											// subscriptDescription
+			null, 											// subscriptLinkClass
+			null, 											// subscriptLinkValue
+			'', 											// target
+			1 												// sort
 		);
 
 		$filtersArray['nichtabgeschickt'] = $this->navigationlib->oneLevel(
@@ -719,7 +724,12 @@ class InfoCenter extends Auth_Controller
 			'#',												// link
 			array(),											// children
 			'',													// icon
-			true												// expand
+			true,												// expand
+			null, 											// subscriptDescription
+			null, 											// subscriptLinkClass
+			null, 											// subscriptLinkValue
+			'', 											// target
+			2 												// sort
 		);
 
 		$this->_fillFilters($listFiltersSent, $filtersArray['abgeschickt']);
@@ -732,7 +742,12 @@ class InfoCenter extends Auth_Controller
 				'#',				// link
 				array(),			// children
 				'',					// icon
-				true				// expand
+				true,				// expand
+				null, 											// subscriptDescription
+				null, 											// subscriptLinkClass
+				null, 											// subscriptLinkValue
+				'', 											// target
+				3 												// sort
 			);
 
 			$this->_fillCustomFilters($listCustomFilters, $filtersArray['personal']);
@@ -745,7 +760,12 @@ class InfoCenter extends Auth_Controller
 					'#',			// link
 					$filtersArray,	// children
 					'',				// icon
-					true			// expand
+					true,			// expand
+					null,			// subscriptDescription
+					null,			// subscriptLinkClass
+					null, 			// subscriptLinkValue
+					'', 			// target
+					10 				// sort
 				)
 			)
 		);
@@ -773,7 +793,12 @@ class InfoCenter extends Auth_Controller
 					$link,			// link
 					array(),		// children
 					'angle-left',	// icon
-					true			// expand
+					true,			// expand
+					null, 			// subscriptDescription
+					null, 			// subscriptLinkClass
+					null, 			// subscriptLinkValue
+					'', 			// target
+					1 				// sort
 				)
 			)
 		);
@@ -823,7 +848,12 @@ class InfoCenter extends Auth_Controller
 				'#',				// link
 				array(),			// children
 				'',					// icon
-				true				// expand
+				true,				// expand
+				null,				// subscriptDescription
+				null,				// subscriptLinkClass
+				null,				// subscriptLinkValue
+				'', 				// target
+				15 					// sort
 			);
 
 			$this->_fillCustomFilters($listCustomFilters, $filtersArray['children']['personal']);
@@ -836,7 +866,12 @@ class InfoCenter extends Auth_Controller
 					'#',						// link
 					(isset($filtersArray['children'])?$filtersArray['children']:''),	// children
 					'',							// icon
-					true						// expand
+					true,						// expand
+					null, 						// subscriptDescription
+					null, 						// subscriptLinkClass
+					null, 						// subscriptLinkValue
+					'', 						// target
+					10 							// sort
 				)
 			)
 		);
@@ -1177,9 +1212,9 @@ class InfoCenter extends Auth_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
@@ -1192,8 +1227,8 @@ class InfoCenter extends Auth_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);
 		}
 
@@ -1254,7 +1289,7 @@ class InfoCenter extends Auth_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.');