Merge remote-tracking branch 'origin/master'

application/controllers/system/Filters.php

@@ -39,11 +39,11 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($this->_getFilterUniqueId());
 
-		$json->selectedFields = $session['selectedFields'];
-		$json->columnsAliases = $session['columnsAliases'];
-		$json->additionalColumns = $session['additionalColumns'];
-		$json->checkboxes = $session['checkboxes'];
-		$json->dataset = $session['dataset'];
+		$json->selectedFields = $this->_getFromSession('selectedFields');
+		$json->columnsAliases = $this->_getFromSession('columnsAliases');
+		$json->additionalColumns = $this->_getFromSession('additionalColumns');
+		$json->checkboxes = $this->_getFromSession('checkboxes');
+		$json->dataset = $this->_getFromSession('dataset');
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
@@ -57,11 +57,11 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($this->_getFilterUniqueId());
 
-		$json->allSelectedFields = $session['allSelectedFields'];
-		$json->allColumnsAliases = $session['allColumnsAliases'];
+		$json->allSelectedFields = $this->_getFromSession('allSelectedFields');
+		$json->allColumnsAliases = $this->_getFromSession('allColumnsAliases');
 
-		$json->selectedFields = $session['selectedFields'];
-		$json->columnsAliases = $session['columnsAliases'];
+		$json->selectedFields = $this->_getFromSession('selectedFields');
+		$json->columnsAliases = $this->_getFromSession('columnsAliases');
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
@@ -79,11 +79,11 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($filterUniqueId);
 
-		$allSelectedFields = $session['allSelectedFields'];
-		$allColumnsAliases = $session['allColumnsAliases'];
+		$allSelectedFields = $this->_getFromSession('allSelectedFields');
+		$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
 
-		$json->selectedFields = $session['selectedFields'];
-		$json->columnsAliases = $session['columnsAliases'];
+		$json->selectedFields = $this->_getFromSession('selectedFields');
+		$json->columnsAliases = $this->_getFromSession('columnsAliases');
 
 		if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
 		{
@@ -121,10 +121,10 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($this->_getFilterUniqueId());
 
-		$json->allSelectedFields = $session['allSelectedFields'];
-		$json->allColumnsAliases = $session['allColumnsAliases'];
+		$json->allSelectedFields = $this->_getFromSession('allSelectedFields');
+		$json->allColumnsAliases = $this->_getFromSession('allColumnsAliases');
 
-		$json->selectedFilters = $session['selectedFilters'];
+		$json->selectedFilters = $this->_getFromSession('selectedFilters');
 		$json->selectedFiltersAliases = array();
 		$json->selectedFiltersMetaData = array();
 
@@ -132,10 +132,10 @@ class Filters extends VileSci_Controller
 		$json->selectedFiltersActiveFiltersOperation = array();
 		$json->selectedFiltersActiveFiltersOption = array();
 
-		$metaData = $session['metaData'];
-		$activeFilters = $session['activeFilters'];
-		$activeFiltersOperation = $session['activeFiltersOperation'];
-		$activeFiltersOption = $session['activeFiltersOption'];
+		$metaData = $this->_getFromSession('metaData');
+		$activeFilters = $this->_getFromSession('activeFilters');
+		$activeFiltersOperation = $this->_getFromSession('activeFiltersOperation');
+		$activeFiltersOption = $this->_getFromSession('activeFiltersOption');
 
 		for ($i = 0; $i < count($json->selectedFilters); $i++)
 		{
@@ -302,11 +302,11 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($filterUniqueId);
 
-		$allSelectedFields = $session['allSelectedFields'];
-		$allColumnsAliases = $session['allColumnsAliases'];
+		$allSelectedFields = $this->_getFromSession('allSelectedFields');
+		$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
 
-		$selectedFields = $session['selectedFields'];
-		$columnsAliases = $session['columnsAliases'];
+		$selectedFields = $this->_getFromSession('selectedFields');
+		$columnsAliases = $this->_getFromSession('columnsAliases');
 
 		if (($pos = array_search($fieldName, $selectedFields)) !== false)
 		{
@@ -341,10 +341,10 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($filterUniqueId);
 
-		$selectedFilters = $session['selectedFilters'];
-		$selectedFiltersActiveFilters = $session['activeFilters'];
-		$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
-		$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
+		$selectedFilters = $this->_getFromSession('selectedFilters');
+		$selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
+		$selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
+		$selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
 
 		if (($pos = array_search($fieldName, $selectedFilters)) !== false)
 		{
@@ -379,11 +379,11 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($filterUniqueId);
 
-		$allSelectedFields = $session['allSelectedFields'];
-		$allColumnsAliases = $session['allColumnsAliases'];
+		$allSelectedFields = $this->_getFromSession('allSelectedFields');
+		$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
 
-		$selectedFields = $session['selectedFields'];
-		$columnsAliases = $session['columnsAliases'];
+		$selectedFields = $this->_getFromSession('selectedFields');
+		$columnsAliases = $this->_getFromSession('columnsAliases');
 
 		if (($pos = array_search($fieldName, $allSelectedFields)) !== false
 			&& array_search($fieldName, $selectedFields) === false)
@@ -419,10 +419,10 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($filterUniqueId);
 
-		$selectedFilters = $session['selectedFilters'];
-		$selectedFiltersActiveFilters = $session['activeFilters'];
-		$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
-		$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
+		$selectedFilters = $this->_getFromSession('selectedFilters');
+		$selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
+		$selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
+		$selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
 
 		if (!in_array($fieldName, $selectedFilters))
 		{
@@ -487,7 +487,7 @@ class Filters extends VileSci_Controller
 
 		$session = $this->_readSession($this->_getFilterUniqueId());
 
-		$dataset = $session['dataset'];
+		$dataset = $this->_getFromSession('dataset');
 
 		if (is_array($dataset))
 		{
@@ -540,4 +540,16 @@ class Filters extends VileSci_Controller
 
 		return $_getFilterUniqueId;
 	}
+
+	/**
+	 *
+	 */
+	private function _getFromSession($el)
+	{
+		$_getFromSession = null;
+
+		if (isset($_SESSION[$el])) return $_SESSION[$el];
+
+		return $_getFromSession;
+	}
 }

application/controllers/system/infocenter/InfoCenter.php

@@ -95,7 +95,9 @@ class InfoCenter extends FHC_Controller
 		if(!$this->permissionlib->isBerechtigt('basis/person'))
 			show_error('You have no Permission! You need Infocenter Role');
 
-		$this->_setControllerId(); // sets the controller id
+		$this->setControllerId(); // sets the controller id
+
+		$this->fhc_controller_id = $this->getControllerId();
 
 		$this->setNavigationMenuArray(); // sets property navigationMenuArray
     }
@@ -153,7 +155,7 @@ class InfoCenter extends FHC_Controller
 	}
 
 	/**
-	 * unlocks page from edit by a person, redirects to overview filter page
+	 * Unlocks page from edit by a person, redirects to overview filter page
 	 * @param $person_id
 	 */
 	public function unlockPerson($person_id)
@@ -167,7 +169,7 @@ class InfoCenter extends FHC_Controller
 	}
 
 	/**
-	 * Saves if a document has been formal geprueft. saves current timestamp if checked as geprueft, or null if not.
+	 * Saves if a document has been formal geprueft. Saves current timestamp if checked as geprueft, or null if not.
 	 * @param $person_id
 	 */
 	public function saveFormalGeprueft($person_id)
@@ -175,37 +177,36 @@ class InfoCenter extends FHC_Controller
 		$akte_id = $this->input->post('akte_id');
 		$formalgeprueft = $this->input->post('formal_geprueft');
 
-		if (!isset($akte_id) || !isset($formalgeprueft) || !isset($person_id))
-			show_error('Parameters not set!');
+		$json = false;
 
-		$akte = $this->AkteModel->load($akte_id);
-
-		if (isError($akte))
+		if (isset($akte_id) && isset($formalgeprueft) && isset($person_id))
 		{
-			show_error($akte->retval);
+			$akte = $this->AkteModel->load($akte_id);
+
+			if (hasData($akte))
+			{
+				$timestamp = ($formalgeprueft === 'true') ? date('Y-m-d H:i:s') : null;
+				$result = $this->AkteModel->update($akte_id, array('formal_geprueft_amum' => $timestamp));
+
+				if (isSuccess($result))
+				{
+					$json = $timestamp;
+
+					$this->_log(
+						$person_id,
+						'saveformalgep',
+						array(
+							empty($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel,
+							is_null($timestamp) ? 'NULL' : $timestamp
+						)
+					);
+				}
+			}
 		}
 
-		$timestamp = ($formalgeprueft === 'true') ? date('Y-m-d H:i:s') : null;
-		$result = $this->AkteModel->update($akte_id, array('formal_geprueft_amum' => $timestamp));
-
-		if (isError($result))
-		{
-			show_error($result->retval);
-		}
-
-		//write person log
-		$this->_log(
-			$person_id,
-			'saveformalgep',
-			array(
-				empty($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel,
-				is_null($timestamp) ? 'NULL' : $timestamp
-			)
-		);
-
 		$this->output
 			->set_content_type('application/json')
-			->set_output(json_encode($timestamp));
+			->set_output(json_encode($json));
 	}
 
 	/**
@@ -216,20 +217,13 @@ class InfoCenter extends FHC_Controller
 	{
 		$prestudent = $this->PrestudentModel->getLastPrestudent($person_id, true);
 
-		if (isError($prestudent))
-		{
-			show_error($prestudent->retval);
-		}
-
-		$jsonoutput = count($prestudent->retval) > 0 ? $prestudent->retval[0] : null;
-
 		$this->output
 			->set_content_type('application/json')
-			->set_output(json_encode($jsonoutput));
+			->set_output(json_encode($prestudent));
 	}
 
 	/**
-	 * Gets Zugangsvoraussetzungen for a prestudents as a description text
+	 * Gets Zugangsvoraussetzungen for a prestudent as a description text and shows them in a view
 	 * @param $prestudent_id
 	 */
 	public function getZgvInfoForPrestudent($prestudent_id)
@@ -240,7 +234,11 @@ class InfoCenter extends FHC_Controller
 		$studiengangkurzbz = $prestudentdata['studiengang_kurzbz'];
 		$studiengangbezeichnung = $prestudentdata['studiengang_bezeichnung'];
 
-		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'studiengang_kurzbz' => $studiengangkurzbz, 'data' => null);
+		$data = array(
+					'studiengang_bezeichnung' => $studiengangbezeichnung,
+					'studiengang_kurzbz' => $studiengangkurzbz,
+					'data' => null
+				);
 
 		if (hasData($studienordnung))
 		{
@@ -253,54 +251,58 @@ class InfoCenter extends FHC_Controller
 	}
 
 	/**
-	 * Saves a zgv for a prestudent. includes Ort, Datum, Nation for bachelor and master.
+	 * Saves a ZGV for a prestudent, includes Ort, Datum, Nation for bachelor and master
 	 * @param $prestudent_id
 	 */
-	public function saveZgvPruefung($prestudent_id)
+	public function saveZgvPruefung()
 	{
-		// zgvdata
-		// Check for string null, in case dropdown changed to default value
-		$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');
-		$zgvnation_code = $this->input->post('zgvnation') === 'null' ? null : $this->input->post('zgvnation');
+		$prestudent_id = $this->input->post('prestudentid');
 
-		//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');
-		$zgvmanation_code = $this->input->post('zgvmanation') === 'null' ? null : $this->input->post('zgvmanation');
-
-		$result = $this->PrestudentModel->update(
-			$prestudent_id,
-			array(
-				'zgv_code' => $zgv_code,
-				'zgvort' => $zgvort,
-				'zgvdatum' => $zgvdatum,
-				'zgvnation' => $zgvnation_code,
-				'zgvmas_code' => $zgvmas_code,
-				'zgvmaort' => $zgvmaort,
-				'zgvmadatum' => $zgvmadatum,
-				'zgvmanation' => $zgvmanation_code,
-				'updateamum' => date('Y-m-d H:i:s')
-			)
-		);
-
-		if (isError($result))
+		if (empty($prestudent_id))
+			$result = error('Prestudentid missing');
+		else
 		{
-			show_error($result->retval);
+			// zgvdata
+			// Check for string null, in case dropdown changed to default value
+			$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');
+			$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');
+			$zgvmanation_code = $this->input->post('zgvmanation') === 'null' ? null : $this->input->post('zgvmanation');
+
+			$result = $this->PrestudentModel->update(
+				$prestudent_id,
+				array(
+					'zgv_code' => $zgv_code,
+					'zgvort' => $zgvort,
+					'zgvdatum' => $zgvdatum,
+					'zgvnation' => $zgvnation_code,
+					'zgvmas_code' => $zgvmas_code,
+					'zgvmaort' => $zgvmaort,
+					'zgvmadatum' => $zgvmadatum,
+					'zgvmanation' => $zgvmanation_code,
+					'updateamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			if (isSuccess($result))
+			{
+				//get extended Prestudent data for logging
+				$logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+
+				$this->_log($logdata['person_id'], 'savezgv', array($logdata['studiengang_kurzbz'], $prestudent_id));
+			}
 		}
-
-		//get extended Prestudent data for logging
-		$logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
-
-		$this->_log($logdata['person_id'], 'savezgv', array($logdata['studiengang_kurzbz'], $prestudent_id));
-
 		$this->output
 			->set_content_type('application/json')
-			->set_output(json_encode($result->retval));
+			->set_output(json_encode($result));
 	}
 
 	/**
@@ -311,6 +313,7 @@ class InfoCenter extends FHC_Controller
 	public function saveAbsage($prestudent_id)
 	{
 		$statusgrund = $this->input->post('statusgrund');
+		$this->fhc_controller_id = $this->input->post('fhc_controller_id');
 
 		$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -448,16 +451,14 @@ class InfoCenter extends FHC_Controller
 
 		$result = $this->NotizModel->addNotizForPerson($person_id, $titel, $text, $erledigt, $this->uid);
 
-		if (isError($result))
+		if (isSuccess($result))
 		{
-			show_error($result->retval);
+			$this->_log($person_id, 'savenotiz', array($titel));
 		}
 
-		$this->_log($person_id, 'savenotiz', array($titel));
-
 		$this->output
 			->set_content_type('application/json')
-			->set_output(json_encode($result->retval));
+			->set_output(json_encode($result));
 	}
 
 	/**
@@ -482,19 +483,15 @@ class InfoCenter extends FHC_Controller
 			)
 		);
 
-		$json = false;
-
 		if (isSuccess($result))
 		{
-			$json = true;
-
 			//set log "Notiz updated"
 			$this->_log($person_id, 'updatenotiz', array($titel));
 		}
 
 		$this->output
 			->set_content_type('application/json')
-			->set_output(json_encode($json));
+			->set_output(json_encode($result));
 	}
 
 	/**
@@ -565,14 +562,18 @@ class InfoCenter extends FHC_Controller
 	}
 
 	/**
-	 * Initializes parking of a person, i.e. a person is not expected to do any actions while it is parked
+	 * Initializes parking of a person, i.e. a person is not expected to do any actions while parked
 	 */
 	public function park()
 	{
 		$person_id = $this->input->post('person_id');
 		$date = $this->input->post('parkdate');
 
-		$this->personloglib->park($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->uid);
+		$result = $this->personloglib->park($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->uid);
+
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($result));
 	}
 
 	/**
@@ -582,7 +583,11 @@ class InfoCenter extends FHC_Controller
 	{
 		$person_id = $this->input->post('person_id');
 
-		$this->personloglib->unPark($person_id);
+		$result = $this->personloglib->unPark($person_id);
+
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($result));
 	}
 
 	/**
@@ -1090,21 +1095,4 @@ class InfoCenter extends FHC_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
-
-	/**
-	 * Sets the unique id for the called controller
-	 */
-	private function _setControllerId()
-	{
-		$fhc_controller_id = $this->input->get('fhc_controller_id');
-
-		if (!isset($fhc_controller_id) || empty($fhc_controller_id))
-		{
-			$fhc_controller_id = uniqid();
-			header('Location: '.$_SERVER['REQUEST_URI'].'?fhc_controller_id='.$fhc_controller_id);
-			exit;
-		}
-
-		$this->fhc_controller_id = $fhc_controller_id;
-	}
 }

application/core/FHC_Controller.php

@@ -46,7 +46,15 @@ class FHC_Controller extends CI_Controller
 			{
 				$this->_controllerId = uniqid(); // generate a unique id
 				// Redirect to the same URL, but giving FHC_CONTROLLER_ID as HTTP GET parameter
-				header(sprintf('Location: %s?%s=%s', $_SERVER['REQUEST_URI'], self::FHC_CONTROLLER_ID, $this->_controllerId));
+				header(
+					sprintf(
+						'Location: %s%s%s=%s',
+						$_SERVER['REQUEST_URI'],
+						strpos($_SERVER['REQUEST_URI'], '?') === false ? '?' : '&', // place the corret character to divide parameters
+						self::FHC_CONTROLLER_ID,
+						$this->_controllerId
+					)
+				);
 				exit; // terminate immediately the execution of this controller
 			}
 		}

application/libraries/PersonLogLib.php

@@ -91,7 +91,7 @@ class PersonLogLib
 	 * @param string $app
 	 * @param null $oe_kurzbz
 	 * @param null $user
-	 * @return bool wether parking was successfull
+	 * @return insert object
 	 */
 	public function park($person_id, $date, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
 	{
@@ -110,16 +110,13 @@ class PersonLogLib
 			'insertvon' => $user
 		);
 
-		$result = $this->ci->PersonLogModel->insert($data);
-		if (isSuccess($result))
-			return true;
-		else
-			show_error($result->retval);
+		return $this->ci->PersonLogModel->insert($data);
 	}
 
 	/**
 	 * Unparks a person, i.e. removes all log entries in the future
 	 * @param $person_id
+	 * @return array with deleted logids
 	 */
 	public function unPark($person_id)
 	{
@@ -127,24 +124,21 @@ class PersonLogLib
 
 		$deleted = array();
 
-		if (isSuccess($result))
+		if (hasData($result))
 		{
-			if (count($result->retval) > 0)
+			foreach ($result->retval as $log)
 			{
-				foreach ($result->retval as $log)
+				$logdata = json_decode($log->logdata);
+				if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
 				{
-					$logdata = json_decode($log->logdata);
-					if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
-					{
-						$delresult = $this->ci->PersonLogModel->deleteLog($log->log_id);
-						if (isSuccess($delresult))
-							$deleted[] = $log->log_id;
-					}
+					$delresult = $this->ci->PersonLogModel->deleteLog($log->log_id);
+					if (isSuccess($delresult))
+						$deleted[] = $log->log_id;
 				}
 			}
 		}
-		else
-			show_error($result->retval);
+
+		return $deleted;
 	}
 
 	/**
@@ -158,23 +152,18 @@ class PersonLogLib
 
 		$parkeddate = null;
 
-		if (isSuccess($result))
+		if (hasData($result))
 		{
-			if (count($result->retval) > 0)
+			foreach ($result->retval as $log)
 			{
-				foreach ($result->retval as $log)
+				$logdata = json_decode($log->logdata);
+				if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
 				{
-					$logdata = json_decode($log->logdata);
-					if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
-					{
-						$parkeddate = $log->zeitpunkt;
-						break;
-					}
+					$parkeddate = $log->zeitpunkt;
+					break;
 				}
 			}
 		}
-		else
-			show_error($result->retval);
 
 		return $parkeddate;
 	}

application/models/system/Filters_model.php

@@ -44,7 +44,6 @@ class Filters_model extends DB_Model
 		$filterParametersArray = array(
 			'app' => $app,
 			'dataset_name' => $dataset_name,
-			'default_filter' => false,
 			'array_length(description, 1) >' => 0,
 			'uid' => $uid
 		);

application/views/system/infocenter/addNotiz.php

@@ -2,11 +2,11 @@
 	<input type="hidden" name="hiddenNotizId" value="">
 	<div class="form-group">
 		<div class="text-center">
-			<label><?= $this->p->t('infocenter', 'notizHinzufuegen') ?></label>
+			<label><?php echo  $this->p->t('infocenter', 'notizHinzufuegen') ?></label>
 		</div>
 		<div>
 			<div class="form-group">
-				<label><?= ucfirst($this->p->t('global', 'titel')) . ': ' ?></label>
+				<label><?php echo  ucfirst($this->p->t('global', 'titel')) . ': ' ?></label>
 				<div class="input-group">
 					<input id="inputNotizTitel" type="text" class="form-control" name="notiztitel"/>
 					<div class="input-group-addon" onclick="document.getElementById('inputNotizTitel').value='Anmerkung zur Bewerbung'">
@@ -21,8 +21,9 @@
 		</div>
 		<div class="text-right">
 			<!--abbrechen-button only shown when notice is clicked to be changed-->
-			<button type="reset" class="btn btn-default" style="display: none"><?= $this->p->t('ui', 'abbrechen') ?></button>
-			<button type="submit" class="btn btn-default"><?= $this->p->t('ui', 'speichern') ?></button>
+			<span class="text-danger" id="notizmsg"></span>
+			<button type="reset" class="btn btn-default" style="display: none"><?php echo  $this->p->t('ui', 'abbrechen') ?></button>
+			<button type="submit" class="btn btn-default"><?php echo  $this->p->t('ui', 'speichern') ?></button>
 		</div>
 	</div>
-</form>
+</form>

application/views/system/infocenter/anmerkungenZurBewerbung.php

@@ -5,7 +5,7 @@
 			<table class="table-bordered" align="center" width="100%">
 				<thead>
 				<tr>
-					<th colspan="2" class="text-center"><?= ucfirst($this->p->t('infocenter','anmerkungenZurBewerbung')) ?></th>
+					<th colspan="2" class="text-center"><?php echo  ucfirst($this->p->t('infocenter','anmerkungenZurBewerbung')) ?></th>
 				</tr>
 				</thead>
 				<tbody>

application/views/system/infocenter/dokpruefung.php

@@ -2,11 +2,11 @@
 	<table id="doctable" class="table table-bordered">
 		<thead>
 		<tr>
-			<th><?= ucfirst($this->p->t('global','name')) ?></th>
-			<th><?= ucfirst($this->p->t('global','typ')) ?></th>
-			<th><?= ucfirst($this->p->t('global','uploaddatum')) ?></th>
-			<th><?= ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
-			<th><?= ucfirst($this->p->t('infocenter','formalGeprueft')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','name')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','uploaddatum')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','formalGeprueft')) ?></th>
 		</tr>
 		</thead>
 		<tbody>
@@ -35,14 +35,14 @@
 </div>
 <?php if (count($dokumente_nachgereicht) > 0): ?>
 	<br/>
-	<p><?= ucfirst($this->p->t('infocenter','nachzureichendeDokumente')) ?></p>
+	<p><?php echo  ucfirst($this->p->t('infocenter','nachzureichendeDokumente')) ?></p>
 	<table id="nachgdoctable" class="table table-bordered">
 		<thead>
 		<tr>
-			<th><?= ucfirst($this->p->t('global','typ')) ?></th>
-			<th><?= ucfirst($this->p->t('infocenter','nachzureichenAm')) ?></th>
-			<th><?= ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
-			<th><?= ucfirst($this->p->t('global','anmerkung')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','nachzureichenAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','anmerkung')) ?></th>
 		</tr>
 		</thead>
 		<tbody>

application/views/system/infocenter/infocenter.php

@@ -27,7 +27,7 @@
 			<div class="container-fluid">
 				<div class="row">
 					<div class="col-lg-12">
-						<h3 class="page-header">Infocenter <?= ucfirst($this->p->t('global', 'uebersicht')); ?></h3>
+						<h3 class="page-header">Infocenter <?php echo  ucfirst($this->p->t('global', 'uebersicht')); ?></h3>
 					</div>
 				</div>
 				<div>

application/views/system/infocenter/infocenterData.php

@@ -2,7 +2,6 @@
 
 	$APP = 'infocenter';
 	$NOTBEFORE = '2018-03-01 18:00:00';
-
 	$filterWidgetArray = array(
 		'query' => '
 		SELECT
@@ -83,7 +82,7 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
-						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\' and psss.studiensemester_kurzbz = \'WS2018\')
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
 				array_to_string(
@@ -104,7 +103,7 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
-						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\' and psss.studiensemester_kurzbz = \'WS2018\')
 					LIMIT 1
 					),\', \'
 				) AS "StgAbgeschickt",
@@ -126,7 +125,7 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
-					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\' and psss.studiensemester_kurzbz = \'WS2018\')
 					LIMIT 1
 					),\', \'
 				) AS "StgNichtAbgeschickt",
@@ -147,7 +146,7 @@
 							FROM public.tbl_studiensemester
 							WHERE start >= NOW()
 						)
-					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\' and psss.studiensemester_kurzbz = \'WS2018\')
 					LIMIT 1
 					),\', \'
 				) AS "StgAktiv",
@@ -221,7 +220,7 @@
 				'<a href="%s/%s?fhc_controller_id=%s">Details</a>',
 				site_url('system/infocenter/InfoCenter/showDetails'),
 				$datasetRaw->{'PersonId'},
-				$this->input->get('fhc_controller_id')
+				(isset($_GET['fhc_controller_id'])?$_GET['fhc_controller_id']:'')
 			);
 
 			if ($datasetRaw->{'SendDate'} == null)

application/views/system/infocenter/infocenterDetails.php

@@ -42,14 +42,14 @@
 				</div>
 				<div class="col-lg-4">
 					<div class="headerright text-right">
-						<?= $this->p->t('global', 'wirdBearbeitetVon') . ':' ?>
+						<?php echo  $this->p->t('global', 'wirdBearbeitetVon') . ':' ?>
 						<?php
 						if (isset($lockedby)):
 							echo $lockedby;
 							?>
 							&nbsp;&nbsp;
 							<a href="../unlockPerson/<?php echo $stammdaten->person_id; ?>?fhc_controller_id=<?php echo $fhc_controller_id; ?>"><i
-										class="fa fa-sign-out"></i>&nbsp;<?= ucfirst($this->p->t('ui', 'freigeben')) ?></a>
+										class="fa fa-sign-out"></i>&nbsp;<?php echo  ucfirst($this->p->t('ui', 'freigeben')) ?></a>
 						<?php endif; ?>
 					</div>
 				</div>
@@ -59,7 +59,7 @@
 				<div class="row">
 					<div class="col-lg-12">
 						<div class="panel panel-primary">
-							<div class="panel-heading text-center"><h4><?= ucfirst($this->p->t('global','stammdaten')) ?></h4></div>
+							<div class="panel-heading text-center"><h4><?php echo  ucfirst($this->p->t('global','stammdaten')) ?></h4></div>
 							<div class="panel-body">
 								<?php $this->load->view('system/infocenter/stammdaten.php'); ?>
 								<?php $this->load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?>
@@ -73,7 +73,7 @@
 					<div class="col-lg-12">
 						<div class="panel panel-primary">
 							<a name="DokPruef"></a><!-- anchor for jumping to the section -->
-							<div class="panel-heading text-center"><h4><?= ucfirst($this->p->t('infocenter','dokumentenpruefung')) ?></h4></div>
+							<div class="panel-heading text-center"><h4><?php echo  ucfirst($this->p->t('infocenter','dokumentenpruefung')) ?></h4></div>
 							<div class="panel-body">
 								<?php $this->load->view('system/infocenter/dokpruefung.php'); ?>
 							</div> <!-- ./panel-body -->
@@ -87,7 +87,7 @@
 						<div class="panel panel-primary">
 							<div class="panel-heading text-center">
 								<a name="ZgvPruef"></a>
-								<h4><?= $this->p->t('infocenter', 'zgv') . ' - ' . ucfirst($this->p->t('lehre','pruefung'))?></h4>
+								<h4><?php echo  $this->p->t('infocenter', 'zgv') . ' - ' . ucfirst($this->p->t('lehre','pruefung'))?></h4>
 							</div>
 							<div class="panel-body">
 								<?php $this->load->view('system/infocenter/zgvpruefungen.php'); ?><!-- /.panel-group -->
@@ -102,7 +102,7 @@
 						<div class="panel panel-primary">
 							<div class="panel-heading text-center">
 								<a name="Nachrichten"></a>
-								<h4 class="text-center"><?= ucfirst($this->p->t('global','nachrichten')) ?></h4>
+								<h4 class="text-center"><?php echo  ucfirst($this->p->t('global','nachrichten')) ?></h4>
 							</div>
 							<div class="panel-body">
 								<div class="row">
@@ -121,7 +121,7 @@
 						<div class="panel panel-primary">
 							<div class="panel-heading text-center">
 								<a name="NotizAkt"></a>
-								<h4 class="text-center"><?= ucfirst($this->p->t('global','notizen')) . ' & ' . ucfirst($this->p->t('global','aktivitaeten')) ?></h4>
+								<h4 class="text-center"><?php echo  ucfirst($this->p->t('global','notizen')) . ' & ' . ucfirst($this->p->t('global','aktivitaeten')) ?></h4>
 							</div>
 							<div class="panel-body">
 								<div class="row">

application/views/system/infocenter/infocenterFreigegeben.php

@@ -69,7 +69,6 @@
 											INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 											JOIN public.tbl_studiengang USING(studiengang_kz)
 										WHERE pss.status_kurzbz = \'Interessent\'
-										AND pss.bestaetigtam IS NULL
 										AND ps.person_id = p.person_id
 										AND tbl_studiengang.typ in(\'b\')
 										AND studiensemester_kurzbz IN (
@@ -88,7 +87,6 @@
 											JOIN public.tbl_studiengang USING(studiengang_kz)
 										WHERE pss.status_kurzbz = \'Interessent\'
 											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
-											AND pss.bestaetigtam IS NULL
 											AND ps.person_id = p.person_id
 											AND tbl_studiengang.typ in(\'b\')
 											AND studiensemester_kurzbz IN (
@@ -107,7 +105,6 @@
 											JOIN public.tbl_studiengang USING(studiengang_kz)
 										WHERE pss.status_kurzbz = \'Interessent\'
 											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
-											AND pss.bestaetigtam IS NULL
 											AND ps.person_id = p.person_id
 											AND tbl_studiengang.typ in(\'b\')
 											AND studiensemester_kurzbz IN (
@@ -126,7 +123,6 @@
 											JOIN public.tbl_studiengang USING(studiengang_kz)
 										WHERE pss.status_kurzbz = \'Interessent\'
 											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
-											AND pss.bestaetigtam IS NULL
 											AND ps.person_id = p.person_id
 											AND tbl_studiengang.typ in(\'b\')
 											AND studiensemester_kurzbz IN (
@@ -150,11 +146,7 @@
 										WHERE
 											person_id=p.person_id
 											AND tbl_studiengang.typ in(\'b\')
-											AND \'Interessent\' = (SELECT status_kurzbz FROM public.tbl_prestudentstatus
-																	WHERE prestudent_id=tbl_prestudent.prestudent_id
-																	ORDER BY datum DESC, insertamum DESC, ext_id DESC
-																	LIMIT 1
-																	)
+
 											AND EXISTS (
 												SELECT
 													1
@@ -163,7 +155,7 @@
 												WHERE
 													prestudent_id = tbl_prestudent.prestudent_id
 													AND status_kurzbz = \'Interessent\'
-													AND (bestaetigtam IS NOT NULL AND (bewerbung_abgeschicktamum is null OR bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\'))
+													AND (bestaetigtam IS NOT NULL AND bewerbung_abgeschicktamum >= \''.$NOTBEFORE.'\')
 													AND studiensemester_kurzbz IN (
 														SELECT studiensemester_kurzbz
 														FROM public.tbl_studiensemester
@@ -171,7 +163,7 @@
 												)
 										)
 									)
-								ORDER BY "LastAction" ASC
+								ORDER BY "LastAction" DESC
 							',
 							'checkboxes' => 'PersonId',
 							'additionalColumns' => array('Details'),
@@ -183,7 +175,7 @@
 									'<a href="%s/%s?fhc_controller_id=%s">Details</a>',
 									site_url('system/infocenter/InfoCenter/showDetails'),
 									$datasetRaw->{'PersonId'},
-									$this->input->get('fhc_controller_id')
+									(isset($_GET['fhc_controller_id'])?$_GET['fhc_controller_id']:'')
 								);
 
 								if ($datasetRaw->{'SendDate'} == null)

application/views/system/infocenter/logs.php

@@ -1,8 +1,8 @@
 <table id="logtable" class="table table-bordered table-hover">
 	<thead>
 	<tr>
-		<th><?= ucfirst($this->p->t('global', 'datum')) ?></th>
-		<th><?= ucfirst($this->p->t('global', 'aktivitaet')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'aktivitaet')) ?></th>
 		<th>User</th>
 	</tr>
 	</thead>

application/views/system/infocenter/notizen.php

@@ -1,8 +1,8 @@
 <table id="notiztable" class="table table-bordered table-hover">
 	<thead>
 	<tr>
-		<th><?= ucfirst($this->p->t('global', 'datum')) ?></th>
-		<th><?= ucfirst($this->p->t('global', 'notiz')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'notiz')) ?></th>
 		<th>User</th>
 	</tr>
 	</thead>

application/views/system/infocenter/stammdaten.php

@@ -2,41 +2,41 @@
 	<div class="col-lg-6 table-responsive">
 		<table class="table">
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','vorname')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','vorname')) ?></strong></td>
 				<td><?php echo $stammdaten->vorname ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','nachname')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','nachname')) ?></strong></td>
 				<td>
 					<?php echo $stammdaten->nachname ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','geburtsdatum')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsdatum')) ?></strong></td>
 				<td>
 					<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','svnr')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','svnr')) ?></strong></td>
 				<td>
 					<?php echo $stammdaten->svnr ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
 				<td>
 					<?php echo $stammdaten->staatsbuergerschaft ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','geschlecht')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','geschlecht')) ?></strong></td>
 				<td>
 					<?php echo $stammdaten->geschlecht ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','geburtsnation')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsnation')) ?></strong></td>
 				<td>
 					<?php echo $stammdaten->geburtsnation ?></td>
 			</tr>
 			<tr>
-				<td><strong><?= ucfirst($this->p->t('person','geburtsort')) ?></strong></td>
+				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsort')) ?></strong></td>
 				<td><?php echo $stammdaten->gebort ?></td>
 			</tr>
 		</table>
@@ -45,21 +45,21 @@
 		<table class="table table-bordered">
 			<thead>
 			<tr>
-				<th colspan="4" class="text-center"><?= ucfirst($this->p->t('global','kontakt')) ?></th>
+				<th colspan="4" class="text-center"><?php echo  ucfirst($this->p->t('global','kontakt')) ?></th>
 			</tr>
 			<tr>
-				<th class="text-center"><?= ucfirst($this->p->t('global','typ')) ?></th>
-				<th class="text-center"><?= ucfirst($this->p->t('global','kontakt')) ?></th>
-				<th class="text-center"><?= ucfirst($this->p->t('global','anmerkung')) ?></th>
+				<th class="text-center"><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
+				<th class="text-center"><?php echo  ucfirst($this->p->t('global','kontakt')) ?></th>
+				<th class="text-center"><?php echo  ucfirst($this->p->t('global','anmerkung')) ?></th>
 			</tr>
 			</thead>
 			<tbody>
 			<?php foreach ($stammdaten->kontakte as $kontakt): ?>
 				<tr>
 				<?php if ($kontakt->kontakttyp === 'email'): ?>
-					<td><?= ucfirst($this->p->t('person','email')) ?></td>
+					<td><?php echo  ucfirst($this->p->t('person','email')) ?></td>
 				<?php elseif ($kontakt->kontakttyp === 'telefon'): ?>
-					<td><?= ucfirst($this->p->t('person','telefon')) ?></td>
+					<td><?php echo  ucfirst($this->p->t('person','telefon')) ?></td>
 				<?php endif; ?>
 					<td>
 						<?php echo '<span class="'.$kontakt->kontakttyp.'">';?>
@@ -80,7 +80,7 @@
 			<?php foreach ($stammdaten->adressen as $adresse): ?>
 				<tr>
 					<td>
-						<?= ucfirst($this->p->t('person','adresse')) ?>
+						<?php echo  ucfirst($this->p->t('person','adresse')) ?>
 					</td>
 					<td>
 						<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
@@ -101,13 +101,13 @@
 					<input type="hidden" name="person_id"
 						   value="<?php echo $stammdaten->person_id ?>">
 					<a id="sendmsglink" href="javascript:void(0);"><i
-								class="fa fa-envelope"></i>&nbsp;<?= $this->p->t('ui','nachrichtSenden') ?></a>
+								class="fa fa-envelope"></i>&nbsp;<?php echo  $this->p->t('ui','nachrichtSenden') ?></a>
 				</form>
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
 					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode) ?>"
-					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?= $this->p->t('infocenter','zugangBewerbung') ?></a>
+					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>
 		</div>

application/views/system/infocenter/zgvpruefungen.php

@@ -27,7 +27,7 @@
 							<?php if (isset($zgvpruefung->prestudentstatus->bestaetigtam)): ?>
 							<div class="col-xs-<?php echo $headercolumns[1]; ?> text-right">
 								<i class="fa fa-check" style="color: green"></i>
-								<?= $this->p->t('global', 'anStudiengangFreigegeben') ?>
+								<?php echo  $this->p->t('global', 'anStudiengangFreigegeben') ?>
 							</div>
 							<?php endif; ?>
 						<?php else: ?>
@@ -49,7 +49,7 @@
 						<div class="row">
 							<div class="col-lg-<?php echo $columns[0] ?>">
 								<div class="form-group">
-									<label><?= ucfirst($this->p->t('global','letzterStatus')) . ':' ?></label>
+									<label><?php echo  ucfirst($this->p->t('global','letzterStatus')) . ':' ?></label>
 									<?php
 									if (isset($zgvpruefung->prestudentstatus->status_kurzbz))
 									{
@@ -60,7 +60,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[1] ?>">
 								<div class="form-group">
-									<label><?= ucfirst($this->p->t('lehre','studiensemester')) . ':' ?></label>
+									<label><?php echo  ucfirst($this->p->t('lehre','studiensemester')) . ':' ?></label>
 									<?php echo isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz) ? $zgvpruefung->prestudentstatus->studiensemester_kurzbz : '' ?>
 								</div>
 							</div>
@@ -73,7 +73,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[3] ?>">
 								<div class="form-group">
-									<label><?= ucfirst($this->p->t('lehre','organisationsform')) . ':' ?></label>
+									<label><?php echo  ucfirst($this->p->t('lehre','organisationsform')) . ':' ?></label>
 									<span style="display: inline-block">
 									<?php
 									$separator = (isset($zgvpruefung->prestudentstatus->orgform)) ? ', ' : '';
@@ -90,18 +90,18 @@
 									<div class="row">
 										<?php if ($infoonly): ?>
 										<div class="col-xs-8">
-										<label><?= $this->p->t('infocenter', 'zgv') . ':' ?></label>
+										<label><?php echo  $this->p->t('infocenter', 'zgv') . ':' ?></label>
 											<?php echo $zgvpruefung->zgv_bez; ?>
 										</div>
 										<?php else: ?>
 										<div class="col-xs-3">
-											<label><?= $this->p->t('infocenter', 'zgv') . ':' ?></label>
+											<label><?php echo  $this->p->t('infocenter', 'zgv') . ':' ?></label>
 										</div>
 										<?php endif;
 											$zgvinfocolumns = $infoonly ? 4 : 9;
 										?>
 										<div class="col-xs-<?php echo $zgvinfocolumns; ?> text-right zgvinfo" id="zgvinfo_<?php echo $zgvpruefung->prestudent_id ?>">
-											<a href="javascript:void(0)"><i class="fa fa-info-circle"></i> <?= $this->p->t('infocenter', 'zgv') ?> <?php echo $zgvpruefung->studiengang; ?></a>
+											<a href="javascript:void(0)"><i class="fa fa-info-circle"></i> <?php echo  $this->p->t('infocenter', 'zgv') ?> <?php echo $zgvpruefung->studiengang; ?></a>
 										</div>
 									</div>
 									<?php if (!$infoonly)
@@ -114,7 +114,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[1] ?>">
 								<div class="form-group">
-									<label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person','ort') . ':'?></label>
+									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person','ort') . ':'?></label>
 									<?php if ($infoonly):
 										echo html_escape($zgvpruefung->zgvort);
 									else:
@@ -127,7 +127,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[2] ?>">
 								<div class="form-group">
-									<label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('global','datum') . ':'?></label>
+									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('global','datum') . ':'?></label>
 									<?php
 									$zgvdatum = empty($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y');
 									if ($infoonly):
@@ -143,7 +143,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[3] ?>">
 								<div class="form-group">
-									<label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person','nation') . ':'?></label>
+									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person','nation') . ':'?></label>
 									<?php if ($infoonly)
 										echo $zgvpruefung->zgvnation_bez;
 									else
@@ -159,7 +159,7 @@
 						<?php if ($zgvpruefung->studiengangtyp === 'm') : ?>
 							<div class="row">
 								<div class="col-lg-<?php echo $columns[0] ?>">
-									<div class="form-group"><label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ':'?></label>
+									<div class="form-group"><label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ':'?></label>
 										<?php
 										if ($infoonly)
 											echo $zgvpruefung->zgvmas_bez;
@@ -173,7 +173,7 @@
 								</div>
 								<div class="col-lg-<?php echo $columns[1] ?>">
 									<div class="form-group">
-										<label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('person','ort') . ':'?></label>
+										<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('person','ort') . ':'?></label>
 										<?php if ($infoonly):
 											echo $zgvpruefung->zgvmaort;
 										else:
@@ -186,7 +186,7 @@
 								</div>
 								<div class="col-lg-<?php echo $columns[2] ?>">
 									<div class="form-group">
-										<label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('global','datum') . ':'?></label>
+										<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('global','datum') . ':'?></label>
 										<?php
 										$zgvmadatum = empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y');
 										if ($infoonly):
@@ -201,7 +201,7 @@
 									</div>
 								</div>
 								<div class="col-lg-<?php echo $columns[3] ?>">
-									<div class="form-group"><label><?= $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('person','nation') . ':'?></label>
+									<div class="form-group"><label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ' ' . $this->p->t('person','nation') . ':'?></label>
 										<?php
 										if ($infoonly)
 											echo $zgvpruefung->zgvmanation_bez;
@@ -220,12 +220,12 @@
 							<div class="row">
 								<div class="col-xs-6 text-left">
 									<button type="button" class="btn btn-default zgvUebernehmen" id="zgvUebernehmen_<?php echo $zgvpruefung->prestudent_id ?>">
-										<?= $this->p->t('infocenter', 'letzteZgvUebernehmen') ?>
+										<?php echo  $this->p->t('infocenter', 'letzteZgvUebernehmen') ?>
 									</button>
 								</div>
 								<div class="col-xs-6 text-right">
 									<button type="submit" class="btn btn-default saveZgv" id="zgvSpeichern_<?php echo $zgvpruefung->prestudent_id ?>">
-										<?= $this->p->t('ui', 'speichern') ?>
+										<?php echo  $this->p->t('ui', 'speichern') ?>
 									</button>
 								</div>
 							</div>
@@ -243,12 +243,13 @@
 								<div class="form-inline">
 									<form method="post"
 										  action="../saveAbsage/<?php echo $zgvpruefung->prestudent_id ?>">
+										<input type="hidden" name="fhc_controller_id" value="<?php echo $fhc_controller_id; ?>">
 										<div class="input-group" id="statusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 											<select name="statusgrund"
 													class="d-inline float-right"
 													required>
 												<option value="null"
-														selected="selected"><?= $this->p->t('infocenter', 'absagegrund', array($this->p->t('global', 'waehlen'))) . '...' ?>
+														selected="selected"><?php echo  $this->p->t('infocenter', 'absagegrund', array($this->p->t('global', 'waehlen'))) . '...' ?>
 												</option>
 												<?php foreach ($statusgruende as $statusgrund): ?>
 													<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
@@ -259,7 +260,7 @@
 														class="btn btn-default"
 														data-toggle="modal"
 														data-target="#absageModal_<?php echo $zgvpruefung->prestudent_id ?>">
-													<?= $this->p->t('ui', 'absagen') ?>
+													<?php echo  $this->p->t('ui', 'absagen') ?>
 												</button>
 											</span>
 										</div>
@@ -278,20 +279,20 @@
 															&times;
 														</button>
 														<h4 class="modal-title"
-															id="absageModalLabel"><?= $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
+															id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
 													</div>
 													<div class="modal-body">
-														<?= $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
+														<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
 													</div>
 													<div class="modal-footer">
 														<button type="button"
 																class="btn btn-default"
 																data-dismiss="modal">
-															<?= $this->p->t('ui', 'abbrechen') ?>
+															<?php echo  $this->p->t('ui', 'abbrechen') ?>
 														</button>
 														<button type="submit"
 																class="btn btn-primary">
-															<?= $this->p->t('infocenter', 'interessentAbweisen') ?>
+															<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
 														</button>
 													</div>
 												</div>
@@ -322,7 +323,7 @@
 											data-toggle="modal"
 											data-target="#freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>"
 											data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
-										<?= $this->p->t('ui', 'freigabeAnStudiengang') ?>
+										<?php echo  $this->p->t('ui', 'freigabeAnStudiengang') ?>
 									</button>
 								</div>
 							</div>
@@ -339,20 +340,20 @@
 											</button>
 											<h4 class="modal-title"
 												id="freigabeModalLabel">
-												<?= $this->p->t('global', 'freigabeBestaetigen') ?></h4>
+												<?php echo  $this->p->t('global', 'freigabeBestaetigen') ?></h4>
 										</div>
 										<div class="modal-body">
-											<?= $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
+											<?php echo  $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
 										</div>
 										<div class="modal-footer">
 											<button type="button"
 													class="btn btn-default"
-													data-dismiss="modal"><?= $this->p->t('ui', 'abbrechen') ?>
+													data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
 											</button>
-											<a href="../saveFreigabe/<?php echo $zgvpruefung->prestudent_id ?>">
+											<a href="../saveFreigabe/<?php echo $zgvpruefung->prestudent_id ?>?fhc_controller_id=<?php echo $fhc_controller_id; ?>">
 												<button type="button"
 														class="btn btn-primary">
-													<?= $this->p->t('infocenter', 'interessentFreigeben') ?>
+													<?php echo  $this->p->t('infocenter', 'interessentFreigeben') ?>
 												</button>
 											</a>
 										</div>
@@ -366,7 +367,7 @@
 						<div class="row">
 							<div class="col-lg-12 text-left">
 								<?php echo isset($zgvpruefung->prestudentstatus->bestaetigtam) ? '<i class="fa fa-check" style="color: green"></i>' : '<i class="fa fa-check" style="color: red"></i>' ?>
-								<label><?= $this->p->t('global', 'anStudiengangFreigegeben') ?></label>
+								<label><?php echo  $this->p->t('global', 'anStudiengangFreigegeben') ?></label>
 							</div>
 						</div><!-- /.row -->
 					</div><!-- /.panel-footer -->

application/views/system/messageList.php

@@ -6,11 +6,11 @@ $widthColumn = $msgExists === true ? 8 : 12;
 	<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
 		<thead>
 		<tr>
-			<th><?= ucfirst($this->p->t('global','gesendetAm')) ?></th>
-			<th><?= ucfirst($this->p->t('global','sender')) ?></th>
-			<th><?= ucfirst($this->p->t('global','empfaenger')) ?></th>
-			<th><?= ucfirst($this->p->t('global','betreff')) ?></th>
-			<th><?= ucfirst($this->p->t('global','gelesenAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','gesendetAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','sender')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','empfaenger')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','betreff')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','gelesenAm')) ?></th>
 		</tr>
 		</thead>
 		<tbody>

application/views/system/messageWrite.php

@@ -32,14 +32,14 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
 		<div class="container-fluid">
 			<div class="row">
 				<div class="col-lg-12">
-					<h3 class="page-header"><?= ucfirst($this->p->t('ui', 'nachrichtSenden')) ?></h3>
+					<h3 class="page-header"><?php echo  ucfirst($this->p->t('ui', 'nachrichtSenden')) ?></h3>
 				</div>
 			</div>
 			<form id="sendForm" method="post" action="<?php echo $href; ?>">
 				<div class="row">
 					<div class="form-group">
 						<div class="col-lg-1">
-							<label><?= ucfirst($this->p->t('global', 'empfaenger')) . ':'?></label>
+							<label><?php echo  ucfirst($this->p->t('global', 'empfaenger')) . ':'?></label>
 						</div>
 						<div class="col-lg-11">
 							<?php
@@ -60,7 +60,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
 				<div class="row">
 					<div class="form-group form-inline">
 						<div class="col-lg-1 msgfield">
-							<label><?= ucfirst($this->p->t('global', 'betreff')) . ':'?></label>
+							<label><?php echo  ucfirst($this->p->t('global', 'betreff')) . ':'?></label>
 						</div>&nbsp;
 						<?php
 						$subject = '';
@@ -78,7 +78,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
 				<br>
 				<div class="row">
 					<div class="col-lg-10">
-						<label><?= ucfirst($this->p->t('global', 'nachricht')) . ':'?></label>
+						<label><?php echo  ucfirst($this->p->t('global', 'nachricht')) . ':'?></label>
 						<?php
 						$body = '';
 						if (isset($message))
@@ -93,7 +93,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
 						?>
 						<div class="col-lg-2">
 							<div class="form-group">
-								<label><?= ucfirst($this->p->t('ui', 'felder')) . ':'?></label>
+								<label><?php echo  ucfirst($this->p->t('ui', 'felder')) . ':'?></label>
 								<select id="variables" class="form-control" size="14" multiple="multiple">
 									<?php
 									foreach ($variables as $key => $val)
@@ -120,21 +120,21 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
 						?>
 					</div>
 					<div class="col-lg-offset-6 col-lg-1 text-right">
-						<button id="sendButton" class="btn btn-default" type="button"><?= $this->p->t('ui', 'senden')?></button>
+						<button id="sendButton" class="btn btn-default" type="button"><?php echo  $this->p->t('ui', 'senden')?></button>
 					</div>
 				</div>
 				<?php if (isset($receivers) && count($receivers) > 0): ?>
 					<hr>
 					<div class="row">
 						<div class="col-lg-12">
-							<label><?= ucfirst($this->p->t('global', 'vorschau')) . ':'?></label>
+							<label><?php echo  ucfirst($this->p->t('global', 'vorschau')) . ':'?></label>
 						</div>
 					</div>
 					<div class="well">
 						<div class="row">
 							<div class="col-lg-5">
 								<div class="form-grop form-inline">
-									<label><?= ucfirst($this->p->t('global', 'empfaenger')) . ': ' ?></label>
+									<label><?php echo  ucfirst($this->p->t('global', 'empfaenger')) . ': ' ?></label>
 									<select id="recipients">
 										<?php 
 										if (count($receivers) > 1)

application/views/widgets/filter/filter.php

@@ -1,13 +1,17 @@
 <div class="row">
 	<div class="col-lg-12">
 
-		<?php FilterWidget::displayFilterName(); ?>
+		<div class="filter-name-title">
+			<?php FilterWidget::displayFilterName(); ?>
+		</div>
+
+		<br>
 
 		<div class="panel-group">
 			<div class="panel panel-default">
 				<div class="panel-heading">
 					<h4 class="panel-title">
-						<a data-toggle="collapse" href="#collapseFilterHeader"><?= ucfirst($this->p->t('filter', 'filterEinstellungen')) ?></a>
+						<a data-toggle="collapse" href="#collapseFilterHeader"><?php echo  ucfirst($this->p->t('filter', 'filterEinstellungen')) ?></a>
 					</h4>
 				</div>
 				<div id="collapseFilterHeader" class="panel-collapse collapse">

application/widgets/FilterWidget.php

@@ -40,6 +40,7 @@ class FilterWidget extends Widget
 	const ACTIVE_FILTERS_OPTION = 'activeFiltersOption';
 	const ACTIVE_FILTERS_OPERATION = 'activeFiltersOperation';
 	const FILTER_NAME = 'filterName';
+	const FILTER_NAME_PHRASE = 'filterNamePhrase';
 
 	const ACTIVE_FILTER_OPTION_POSTFIX = '-option';
 	const ACTIVE_FILTER_OPERATION_POSTFIX = '-operation';
@@ -78,6 +79,7 @@ class FilterWidget extends Widget
 	private $checkboxes;
 	private $columnsAliases;
 	private $filterName;
+	private $filterNamePhrase;
 
 	private $dataset;
 	private $metaData;
@@ -123,8 +125,13 @@ class FilterWidget extends Widget
 			$this->filterName = $filterSessionArray[self::FILTER_NAME];
 		}
 
+		if ($this->filterNamePhrase == null && isset($filterSessionArray[self::FILTER_NAME_PHRASE]))
+		{
+			$this->filterNamePhrase = $filterSessionArray[self::FILTER_NAME_PHRASE];
+		}
+
 		//
-		if ($filterSessionArray[self::FILTER_ID] != $this->filterId)
+		if ($this->filterId <= 0 || $filterSessionArray[self::FILTER_ID] != $this->filterId)
 		{
 			//
 			$this->_loadFilter();
@@ -136,75 +143,79 @@ class FilterWidget extends Widget
 		//
 		$this->FiltersModel->resetQuery();
 
-		//
-		$this->dataset = @$this->FiltersModel->execReadOnlyQuery($this->_generateQuery());
-
-		//
-		$this->listFields = $this->FiltersModel->getExecutedQueryListFields();
-
-		//
-		$selectedFields = array();
-		$filterSessionArray = $this->_readSession();
-		if (isset($filterSessionArray[self::SELECTED_FIELDS]))
+		$query = $this->_generateQuery();
+		if ($query != null)
 		{
-			$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
-		}
+			//
+			$this->dataset = @$this->FiltersModel->execReadOnlyQuery($query);
 
-		//
-		if (count($selectedFields) == 0)
-		{
-			$filterSessionArray[self::SELECTED_FIELDS] = $this->listFields;
-		}
+			//
+			$this->listFields = $this->FiltersModel->getExecutedQueryListFields();
 
-		//
-		if ($this->columnsAliases != null && count($this->listFields) != count($this->columnsAliases))
-		{
-			show_error('Parameter columnsAliases does not have a number of items equal to those returned by the query');
-		}
-
-		$filterSessionArray[self::COLUMNS_ALIASES] = $this->_getColumnAliasesFromPost();
-		$filterSessionArray[self::CHECKBOXES] = $this->checkboxes;
-
-		if ($this->app != null)
-		{
-			$filterSessionArray[self::APP_PARAMETER] = $this->app;
-		}
-
-		if ($this->datasetName != null)
-		{
-			$filterSessionArray[self::DATASET_NAME_PARAMETER] = $this->datasetName;
-		}
-
-		$filterSessionArray[self::ALL_SELECTED_FIELDS] = $this->listFields;
-		$filterSessionArray[self::ALL_COLUMNS_ALIASES] = $this->columnsAliases;
-
-		/* ------------------------------------------------------------ */
-
-		$tmpDataset = null;
-		if (hasData($this->dataset))
-		{
-			$tmpDataset = array();
-
-			for ($resultsCounter = 0; $resultsCounter < count($this->dataset->retval); $resultsCounter++)
+			//
+			$selectedFields = array();
+			$filterSessionArray = $this->_readSession();
+			if (isset($filterSessionArray[self::SELECTED_FIELDS]))
 			{
-				$result = $this->dataset->retval[$resultsCounter];
-
-				$class = $this->_markRow($result);
-				$formattedResult = $this->_formatRaw($result);
-				$formattedResult->FILTER_CLASS_MARK_ROW = $class;
-				$tmpDataset[] = $formattedResult;
+				$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
 			}
+
+			//
+			if (count($selectedFields) == 0)
+			{
+				$filterSessionArray[self::SELECTED_FIELDS] = $this->listFields;
+			}
+
+			//
+			if ($this->columnsAliases != null && count($this->listFields) != count($this->columnsAliases))
+			{
+				show_error('Parameter columnsAliases does not have a number of items equal to those returned by the query');
+			}
+
+			$filterSessionArray[self::COLUMNS_ALIASES] = $this->_getColumnAliasesFromPost();
+			$filterSessionArray[self::CHECKBOXES] = $this->checkboxes;
+
+			if ($this->app != null)
+			{
+				$filterSessionArray[self::APP_PARAMETER] = $this->app;
+			}
+
+			if ($this->datasetName != null)
+			{
+				$filterSessionArray[self::DATASET_NAME_PARAMETER] = $this->datasetName;
+			}
+
+			$filterSessionArray[self::ALL_SELECTED_FIELDS] = $this->listFields;
+			$filterSessionArray[self::ALL_COLUMNS_ALIASES] = $this->columnsAliases;
+
+			/* ------------------------------------------------------------ */
+
+			$tmpDataset = null;
+			if (hasData($this->dataset))
+			{
+				$tmpDataset = array();
+
+				for ($resultsCounter = 0; $resultsCounter < count($this->dataset->retval); $resultsCounter++)
+				{
+					$result = $this->dataset->retval[$resultsCounter];
+
+					$class = $this->_markRow($result);
+					$formattedResult = $this->_formatRaw($result);
+					$formattedResult->FILTER_CLASS_MARK_ROW = $class;
+					$tmpDataset[] = $formattedResult;
+				}
+			}
+
+			$filterSessionArray[self::DATASET_PARAMETER] = $tmpDataset;
+
+			/* ------------------------------------------------------------ */
+
+			//
+			$this->metaData = $this->FiltersModel->getExecutedQueryMetaData();
+
+			$filterSessionArray[self::METADATA_PARAMETER] = $this->metaData;
 		}
 
-		$filterSessionArray[self::DATASET_PARAMETER] = $tmpDataset;
-
-		/* ------------------------------------------------------------ */
-
-		//
-		$this->metaData = $this->FiltersModel->getExecutedQueryMetaData();
-
-		$filterSessionArray[self::METADATA_PARAMETER] = $this->metaData;
-
 		$this->_writeSession($filterSessionArray);
 
 		//
@@ -318,9 +329,13 @@ class FilterWidget extends Widget
 	 */
 	public static function displayFilterName()
 	{
-		if (self::$FilterWidgetInstance->filterName != null && self::$FilterWidgetInstance->filterName != '')
+		if (self::$FilterWidgetInstance->filterNamePhrase != null && self::$FilterWidgetInstance->filterNamePhrase != '')
 		{
-			echo '<div class="filter-name-title">'.self::$FilterWidgetInstance->filterName.'</div><br>';
+			echo self::$FilterWidgetInstance->filterNamePhrase;
+		}
+		elseif (self::$FilterWidgetInstance->filterName != null && self::$FilterWidgetInstance->filterName != '')
+		{
+			echo self::$FilterWidgetInstance->filterName;
 		}
 	}
 
@@ -506,6 +521,7 @@ class FilterWidget extends Widget
 		$this->hideSave = false;
 		$this->columnsAliases = null;
 		$this->filterName = null;
+		$this->filterNamePhrase = null;
 
 		$this->filterUniqueId = $this->_getFilterUniqueId();
 
@@ -619,12 +635,13 @@ class FilterWidget extends Widget
 
 		$whereParameters = null;
 
-		if ($this->filterId == null)
+		if ($this->filterId <= 0)
 		{
+			// Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name"
+			// that is set as default filter (default_filter = true)
 			$whereParameters = array(
 				'app' => $this->app,
 				'dataset_name' => $this->datasetName,
-				'filter_kurzbz' => $this->filterKurzbz,
 				'uid' => getAuthUID(),
 				'default_filter' => true
 			);
@@ -648,6 +665,24 @@ class FilterWidget extends Widget
 				$jsonEncodedFilter = json_decode($filter->retval[0]->filter);
 			}
 		}
+		else // Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as
+			// default filter (default_filter = true)
+		{
+			$whereParameters = array(
+				'app' => $this->app,
+				'dataset_name' => $this->datasetName,
+				'default_filter' => true
+			);
+
+			$filter = $this->FiltersModel->loadWhere($whereParameters);
+			if (hasData($filter))
+			{
+				if (isset($filter->retval[0]->filter) && trim($filter->retval[0]->filter) != '')
+				{
+					$jsonEncodedFilter = json_decode($filter->retval[0]->filter);
+				}
+			}
+		}
 
 		if ($jsonEncodedFilter != null)
 		{
@@ -657,6 +692,7 @@ class FilterWidget extends Widget
 			$activeFiltersOperation = array();
 			$activeFiltersOption = array();
 			$filterName = null;
+			$filterNamePhrase = null;
 
 			if (isset($jsonEncodedFilter->columns))
 			{
@@ -695,7 +731,15 @@ class FilterWidget extends Widget
 				$filterName = $jsonEncodedFilter->name;
 			}
 
+			// Filter name from phrases system
+			if (isset($jsonEncodedFilter->namePhrase))
+			{
+				$this->load->library('PhrasesLib', array('FilterWidget'));
+				$filterNamePhrase = $this->phraseslib->t('FilterWidget', $jsonEncodedFilter->namePhrase);
+			}
+
 			$this->filterName = $filterName;
+			$this->filterNamePhrase = $filterNamePhrase;
 			$this->app = $filter->retval[0]->app;
 
 			$filterSessionArray = array(
@@ -1022,6 +1066,7 @@ class FilterWidget extends Widget
 
 		$filterSessionArray[self::FILTER_ID] = $this->filterId;
 		$filterSessionArray[self::FILTER_NAME] = $this->filterName;
+		$filterSessionArray[self::FILTER_NAME_PHRASE] = $this->filterNamePhrase;
 
 		$this->_writeSession(array_merge($session, $filterSessionArray));
 	}
@@ -1031,7 +1076,7 @@ class FilterWidget extends Widget
 	 */
 	private function _generateQuery()
 	{
-		$query = $this->query;
+		$query = null;//$this->query;
 
 		$activeFilters = array();
 		$activeFiltersOperation = array();

cis/private/profile/index.php

@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
- *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
- *          Gerald Simane-Sequens <	gerald.simane-sequens@technikum-wien.at>.
+ *		  Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ *		  Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *		  Gerald Simane-Sequens <	gerald.simane-sequens@technikum-wien.at>.
  */
 require_once('../../../config/cis.config.inc.php');
 require_once('../../../config/global.config.inc.php');
@@ -42,7 +42,7 @@ require_once('../../../include/gruppe.class.php');
 require_once('../../../include/adresse.class.php');
 
 $sprache = getSprache();
-$p=new phrasen($sprache);
+$p = new phrasen($sprache);
 
 if (!$db = new basis_db())
 	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
@@ -51,39 +51,39 @@ $uid = get_uid();
 
 $datum_obj = new datum();
 
-$ansicht=false; //Wenn ein anderer User sich das Profil ansieht (Bei Personensuche)
-if(isset($_GET['uid']))
+$ansicht = false; //Wenn ein anderer User sich das Profil ansieht (Bei Personensuche)
+if (isset($_GET['uid']))
 {
-	$uid=stripslashes($_GET['uid']);
-	$ansicht=true;
+	$uid = stripslashes($_GET['uid']);
+	$ansicht = true;
 }
 
-if(!$ansicht && isset($_GET['action']))
+if (!$ansicht && isset($_GET['action']))
 {
 	switch($_GET['action'])
 	{
 		case 'foto_freigabe':
 			$benutzer = new benutzer();
-			if($benutzer->load($uid))
+			if ($benutzer->load($uid))
 			{
 				$person = new person();
-				if($person->load($benutzer->person_id))
+				if ($person->load($benutzer->person_id))
 				{
-					$person->foto_sperre=false;
-					$person->new=false;
+					$person->foto_sperre = false;
+					$person->new = false;
 					$person->save();
 				}
 			}
 			break;
 		case 'foto_sperre':
 			$benutzer = new benutzer();
-			if($benutzer->load($uid))
+			if ($benutzer->load($uid))
 			{
 				$person = new person();
-				if($person->load($benutzer->person_id))
+				if ($person->load($benutzer->person_id))
 				{
-					$person->foto_sperre=true;
-					$person->new=false;
+					$person->foto_sperre = true;
+					$person->new = false;
 					$person->save();
 				}
 			}
@@ -98,9 +98,9 @@ $stg_obj->getAll('typ, kurzbz', false);
 
 $stg_arr = array();
 foreach ($stg_obj->result as $row)
-	$stg_arr[$row->studiengang_kz]=$row->kurzbzlang;
+	$stg_arr[$row->studiengang_kz] = $row->kurzbzlang;
 
-if(check_lektor($uid))
+if (check_lektor($uid))
 {
 	$user = new mitarbeiter();
 	$type = 'mitarbeiter';
@@ -108,13 +108,13 @@ if(check_lektor($uid))
 else
 {
 	$user = new student();
-	$type='student';
+	$type = 'student';
 }
 
-if(!$user->load($uid))
+if (!$user->load($uid))
 	die($p->t('profil/esWurdenKeineProfileGefunden'));
 
-if ($type=='mitarbeiter')
+if ($type == 'mitarbeiter')
 {
 	$vorwahl = '';
 	$kontakt = new kontakt();
@@ -130,11 +130,11 @@ echo '<!DOCTYPE HTML>
 	<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
 	<link href="../../../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
-<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
+	<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
+	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<script language="JavaScript" type="text/javascript">
 	<!--
@@ -165,14 +165,13 @@ echo '<!DOCTYPE HTML>
 	<h1>'.$p->t('profil/profil').'</h1>
 ';
 
-if(!$user->bnaktiv)
+if (!$user->bnaktiv)
 {
-	if(!$ansicht)
+	if (!$ansicht)
 	{
-
-		if ($type=='student')
+		if ($type == 'student')
 			$message = $p->t('profil/inaktivStudent');
-		elseif($type=='mitarbeiter')
+		elseif ($type == 'mitarbeiter')
 			$message = $p->t('profil/inaktivMitarbeiter');
 		else
 			$message = $p->t('profil/inaktivSonstige');
@@ -180,7 +179,7 @@ if(!$user->bnaktiv)
 	else
 		$message = $p->t('profil/AccountInaktiv');
 
-	echo "<span style='color: red;'>$message</span>";
+	echo '<span style="color: red;">'.$message.'</span>';
 }
 
 echo '
@@ -190,16 +189,16 @@ echo '
 <td class="cmscontent" rowspan="3" valign="top">
 	<table width="100%">
 	<tr>
-  		<td valign="top" width="10%" nowrap style="padding-right:10px;">';
+		<td valign="top" width="10%" nowrap style="padding-right:10px;">';
 
 //Foto anzeigen
 $benutzer = new benutzer();
 $benutzer->load($uid);
 $person = new person();
 $person->load($benutzer->person_id);
-if($person->foto!='')
+if ($person->foto != '')
 {
-	if(!($ansicht && $user->foto_sperre))
+	if (!($ansicht && $user->foto_sperre))
 		echo '<img id="personimage" src="../../public/bild.php?src=person&person_id='.$user->person_id.'" alt="'.$user->person_id.'" height="100px" width="75px">';
 	else
 		echo '<img id="personimage" src="../../../skin/images/profilbild_dummy.jpg" alt="Dummy Picture" height="100px" width="75px">';
@@ -207,19 +206,19 @@ if($person->foto!='')
 else
 	echo '<img id="personimage" src="../../../skin/images/profilbild_dummy.jpg" alt="Dummy Picture" height="100px" width="75px">';
 
-if(!$ansicht)
+if (!$ansicht)
 {
 	//Foto Upload nur möglich wenn das Bild noch nicht akzeptiert wurde
 	$fs = new fotostatus();
-	if(!$fs->akzeptiert($user->person_id))
+	if (!$fs->akzeptiert($user->person_id))
 		echo "<br><a href='#BildUpload' onclick='window.open(\"../bildupload.php?person_id=$user->person_id\",\"BildUpload\", \"height=800,width=800,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes\"); return false;'>".$p->t('profil/bildHochladen')."</a>";
 }
-if($user->foto_sperre)
+if ($user->foto_sperre)
 	echo '<br><b>'.$p->t('profil/profilfotoGesperrt').'</b>';
 
-if(!$ansicht)
+if (!$ansicht)
 {
-	if($user->foto_sperre)
+	if ($user->foto_sperre)
 		echo '<br><a href="'.$_SERVER['PHP_SELF'].'?action=foto_freigabe" title="'.$p->t('profil/infotextSperre').'">'.$p->t('profil/fotofreigeben').'</a>';
 	else
 		echo '<br><a href="'.$_SERVER['PHP_SELF'].'?action=foto_sperre" title="'.$p->t('profil/infotextSperre').'">'.$p->t('profil/fotosperren').'</a>';
@@ -228,67 +227,67 @@ if(!$ansicht)
 echo '</td><td width="30%" valign="top">';
 
 echo '
-		<b>'.($type=="student"?$p->t("profil/student"):$p->t('profil/mitarbeiter')).'</b><br><br>
+		<b>'.($type == "student"?$p->t("profil/student"):$p->t('profil/mitarbeiter')).'</b><br><br>
 		'.$p->t('global/username').': '.$user->uid.'<br>
 		'.$p->t('global/anrede').': '.$user->anrede.'<br>
 		'.$p->t('global/titel').': '.$user->titelpre.' <br>';
 
-if(!$ansicht)
+if (!$ansicht)
 	echo $p->t('global/vorname').': '.$user->vorname.'  '.$user->vornamen.'<br>';
 else
 	echo $p->t('global/vorname').': '.$user->vorname.'  <br>';
 
 echo '
-   		'.$p->t('global/nachname').': '.$user->nachname.'<br>
-  		'.$p->t('global/postnomen').': '.$user->titelpost.'<br><br>';
+		'.$p->t('global/nachname').': '.$user->nachname.'<br>
+		'.$p->t('global/postnomen').': '.$user->titelpost.'<br><br>';
 
-if(!$ansicht)
+if (!$ansicht)
 {
 	echo '	'.$p->t('global/geburtsdatum').': '.$datum_obj->formatDatum($user->gebdatum,'d.m.Y')."<br>
 	".$p->t('global/geburtsort').": $user->gebort<br><br>";
 
 }
 
-if(!$ansicht)
+if (!$ansicht)
 {
-    $adresse = new adresse();
-    $adresse->load_pers($user->person_id);
+	$adresse = new adresse();
+	$adresse->load_pers($user->person_id);
 
-    function sortAdresse($a , $b)
-    {
-		if($a->typ === $b->typ)
-	    	return 0;
+	function sortAdresse($a , $b)
+	{
+		if ($a->typ === $b->typ)
+			return 0;
 
 		return ($a->typ < $b->typ) ? -1 : 1;
-    }
-    usort($adresse->result, "sortAdresse");
-    foreach($adresse->result as $a)
-    {
-		if($a->zustelladresse)
+	}
+	usort($adresse->result, "sortAdresse");
+	foreach($adresse->result as $a)
+	{
+		if ($a->zustelladresse)
 		{
 			switch ($a->typ)
 			{
 				case "h":
-				$typ = $p->t("global/hauptwohnsitz");
-				break;
+					$typ = $p->t("global/hauptwohnsitz");
+					break;
 				case "n":
-				$typ = $p->t("global/nebenwohnsitz");
-				break;
+					$typ = $p->t("global/nebenwohnsitz");
+					break;
 				default:
-				$typ = NULL;
-				break;
+					$typ = NULL;
+					break;
 			}
-			if($typ !== NULL)
+			if ($typ !== NULL)
 			{
 				echo "<b>".$typ.": </b><br>";
 				echo $a->strasse."<br>".$a->plz." ".$a->ort."<br><br>";
 			}
 		}
-    }
+	}
 }
 
 $studiengang = new studiengang();
-if ($type=='student' && (!defined('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN') || CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN))
+if ($type == 'student' && (!defined('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN') || CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN))
 {
 	$studiengang->load($user->studiengang_kz);
 
@@ -298,30 +297,30 @@ if ($type=='student' && (!defined('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN') || C
 	".$p->t('global/verband').": $user->verband ".($user->verband!=' '?"<a href='#' onClick='javascript:window.open(\"../stud_in_grp.php?kz=$user->studiengang_kz&sem=$user->semester&verband=$user->verband\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\");return false;'>".$p->t('benotungstool/liste')."</a>":"")."<br>
 	".$p->t('global/gruppe').": $user->gruppe ".($user->gruppe!=' '?"<a href='#' onClick='javascript:window.open(\"../stud_in_grp.php?kz=$user->studiengang_kz&sem=$user->semester&verband=$user->verband&grp=$user->gruppe\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\");return false;'>".$p->t('benotungstool/liste')."</a>":"")."<br>";
 
-	if($user->studiengang_kz<10000)
+	if ($user->studiengang_kz<10000)
 		echo $p->t('profil/martrikelnummer').": $user->matrikelnr<br />";
 }
 
-if ($type=='mitarbeiter')
+if ($type == 'mitarbeiter')
 {
 	echo "<br>
 	".$p->t('profil/kurzzeichen').": $user->kurzbz<BR>";
 
-	if($user->telefonklappe!='')
+	if ($user->telefonklappe != '')
 	{
 		echo $p->t('profil/telefonTw').": $vorwahl - $user->telefonklappe<BR>";
 		//echo $p->t('profil/faxTw').": $vorwahl - 99 $user->telefonklappe<BR>";
 	}
-	if ($user->ort_kurzbz!='')
+	if ($user->ort_kurzbz != '')
 		echo $p->t('profil/buero').': '.$user->ort_kurzbz.'<br>';
 }
 echo '</td>';
 echo '<td valign="top">';
-if(!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWEIS_ANZEIGEN))
+if (!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWEIS_ANZEIGEN))
 {
 	echo '<b>'.$p->t('profil/fhausweisStatus').'</b><br>';
 	$bm = new betriebsmittel();
-	if($bm->zutrittskarteAusgegeben($user->uid))
+	if ($bm->zutrittskarteAusgegeben($user->uid))
 	{
 		//wenn es mehr Zutrittskarten gab, wird das letzte Ausgabedatum erhalten
 		$ausgegeben_am = $bm->result;
@@ -331,7 +330,7 @@ if(!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWE
 	else
 	{
 		$fs = new fotostatus();
-		if($fs->getLastFotoStatus($user->person_id))
+		if ($fs->getLastFotoStatus($user->person_id))
 		{
 			echo '<br>'.$p->t('profil/Bild').' '.$fs->fotostatus_kurzbz.' am '.$datum_obj->formatDatum($fs->datum, 'd.m.Y');
 			switch($fs->fotostatus_kurzbz)
@@ -343,7 +342,7 @@ if(!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWE
 					echo '<br>'.$p->t('profil/fotoWurdeNochNichtAkzeptiert');
 					break;
 				case 'akzeptiert':
-					if($bm->zutrittskartePrinted($user->uid))
+					if ($bm->zutrittskartePrinted($user->uid))
 					{
 						echo '<br>'.$p->t('profil/fhausweisGedrucktAm').' '.$datum_obj->formatDatum($bm->insertamum,'d.m.Y');
 						$geliefertts = $datum_obj->mktime_fromtimestamp($bm->insertamum);
@@ -367,166 +366,191 @@ if(!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWE
 	echo '<br><br>';
 }
 echo '<b>'.$p->t('profil/email').'</b><br>
-    '.$p->t('profil/intern').': <a href="mailto:'.$user->uid.'@'.DOMAIN.'">'.$user->uid.'@'.DOMAIN.'</a><br>';
+	'.$p->t('profil/intern').': <a href="mailto:'.$user->uid.'@'.DOMAIN.'">'.$user->uid.'@'.DOMAIN.'</a><br>';
 
-if($user->alias!='' && (!isset($user->studiengang_kz) || !in_array($user->studiengang_kz,$noalias)))
+if ($user->alias!='' && (!isset($user->studiengang_kz) || !in_array($user->studiengang_kz,$noalias)))
 {
 	echo $p->t('profil/alias').": <a class='Item' href='mailto:$user->alias@".DOMAIN."'>$user->alias@".DOMAIN."</a>";
 }
-if(!$ansicht)
+if (!$ansicht)
 {
-    function sortKontakt($a , $b)
-    {
-	if($a->kontakttyp === $b->kontakttyp)
-	    return 0;
+	function sortKontakt($a , $b)
+	{
+	if ($a->kontakttyp === $b->kontakttyp)
+		return 0;
 
 	return ($a->kontakttyp < $b->kontakttyp) ? -1 : 1;
-    }
-    echo '<br><br><b>'.$p->t('profil/kontaktPrivat').'</b>';
-    $kontakt = new kontakt();
-    $kontakt->load_pers($user->person_id);
-    usort($kontakt->result, "sortKontakt");
-
-    foreach($kontakt->result as $k)
-    {
-	if($k->zustellung === TRUE)
-	{
-	    switch($k->kontakttyp)
-	    {
-		case "email":
-		    echo '<br>'.$p->t('profil/email').': '.$k->kontakt;
-		    break;
-		case "mobil":
-		    echo '<br>'.$p->t('profil/mobil').': '.$k->kontakt;
-		    break;
-		case "telefon":
-		    echo '<br>'.$p->t('profil/telefon').': '.$k->kontakt;
-		    break;
-		default:
-		    break;
-	    }
 	}
-    }
+	echo '<br><br><b>'.$p->t('profil/kontaktPrivat').'</b>';
+	$kontakt = new kontakt();
+	$kontakt->load_pers($user->person_id);
+	usort($kontakt->result, "sortKontakt");
+
+	foreach($kontakt->result as $k)
+	{
+		if ($k->zustellung === TRUE)
+		{
+			switch($k->kontakttyp)
+			{
+			case "email":
+				echo '<br>'.$p->t('profil/email').': '.$k->kontakt;
+				break;
+			case "mobil":
+				echo '<br>'.$p->t('profil/mobil').': '.$k->kontakt;
+				break;
+			case "telefon":
+				echo '<br>'.$p->t('profil/telefon').': '.$k->kontakt;
+				break;
+			default:
+				break;
+			}
+		}
+	}
 }
 
-if($user->homepage!='')
-	echo "<br><br><b>".$p->t('profil/homepage')."</b><br><br><a href='$user->homepage' target='_blank'>$user->homepage</a>";
+if ($user->homepage != '')
+{
+	echo "<br><br><b>".$p->t('profil/homepage')."</b>
+	<br><br><a href='$user->homepage' target='_blank'>$user->homepage</a>";
+}
 echo '</tr></table><br>';
 
 $mail = MAIL_ADMIN;
-		if(!isset($user->studiengang_kz) || $user->studiengang_kz=='')
-		{
-			$user->studiengang_kz = 0;
-		}
+if (!isset($user->studiengang_kz) || $user->studiengang_kz == '')
+{
+	$user->studiengang_kz = 0;
+}
 
-		//Wenn eine Assistentin fuer diesen Studiengang eingetragen ist,
-		//dann werden die aenderungswuesche an diese Adresse gesendet
-		if($studiengang->email!='')
-			$mail = $studiengang->email;
-		else
-			$mail = MAIL_ADMIN;
+//Wenn eine Assistentin fuer diesen Studiengang eingetragen ist,
+//dann werden die aenderungswuesche an diese Adresse gesendet
+if ($studiengang->email != '')
+	$mail = $studiengang->email;
+else
+	$mail = MAIL_ADMIN;
 
-		if($user->studiengang_kz=='0')
-			$mail = MAIL_GST;
+if ($user->studiengang_kz == '0')
+	$mail = MAIL_GST;
 
-if(!$ansicht)
-		{
-			echo "
-			".$p->t('profil/solltenDatenNichtStimmen')." <a class='Item' href=\"mailto:$mail?subject=Datenkorrektur&body=Die%20Profildaten%20fuer%20User%20'$user->uid'%20sind%20nicht%20korrekt.%0D
-			Hier die richtigen Daten:%0A%0ANachname:%20$user->nachname%0AVorname:%20$user->vorname%0AGeburtsdatum:%20$user->gebdatum
-			%0AGeburtsort:%20$user->gebort%0ATitelPre:%20$user->titelpre%0ATitelPost:%20$user->titelpost
-			%0A%0A***%0DPlatz fuer weitere (nicht angefuehrte Daten)%0D***\">".$p->t('profil/zustaendigeAssistenz')."</a><br><br>";
-		}
+if (!$ansicht)
+{
+	echo "
+	".$p->t('profil/solltenDatenNichtStimmen')." <a class='Item' href=\"mailto:$mail?subject=Datenkorrektur&body=Die%20Profildaten%20fuer%20User%20'$user->uid'%20sind%20nicht%20korrekt.%0D
+	Hier die richtigen Daten:%0A%0ANachname:%20$user->nachname%0AVorname:%20$user->vorname%0AGeburtsdatum:%20$user->gebdatum
+	%0AGeburtsort:%20$user->gebort%0ATitelPre:%20$user->titelpre%0ATitelPost:%20$user->titelpost
+	%0A%0A***%0DPlatz fuer weitere (nicht angefuehrte Daten)%0D***\">".$p->t('profil/zustaendigeAssistenz')."</a><br><br>";
+}
 
 echo '<table width="100%">';
 
 echo '<tr>
 		<td valign="top">';
 
-if(!defined('CIS_PROFIL_FUNKTIONEN_ANZEIGEN') || CIS_PROFIL_FUNKTIONEN_ANZEIGEN)
+if (!defined('CIS_PROFIL_FUNKTIONEN_ANZEIGEN') || CIS_PROFIL_FUNKTIONEN_ANZEIGEN)
 {
-
-
 	//Funktionen
 	$qry = "SELECT
 				*, tbl_benutzerfunktion.oe_kurzbz as oe_kurzbz, tbl_organisationseinheit.bezeichnung as oe_bezeichnung,
-				 tbl_benutzerfunktion.semester, tbl_benutzerfunktion.bezeichnung as bf_bezeichnung
+				 tbl_benutzerfunktion.semester, tbl_benutzerfunktion.bezeichnung as bf_bezeichnung,
+				 tbl_benutzerfunktion.datum_von, tbl_benutzerfunktion.datum_bis
 			FROM
 				public.tbl_benutzerfunktion
 				JOIN public.tbl_funktion USING(funktion_kurzbz)
 				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
 			WHERE
 				uid=".$db->db_add_param($uid)." AND
-				(tbl_benutzerfunktion.datum_von is null OR tbl_benutzerfunktion.datum_von<=now()) AND
 				(tbl_benutzerfunktion.datum_bis is null OR tbl_benutzerfunktion.datum_bis>=now())";
 
-	if($result_funktion = $db->db_query($qry))
+	if ($result_funktion = $db->db_query($qry))
 	{
-		if($db->db_num_rows($result_funktion)>0)
+		if ($db->db_num_rows($result_funktion) > 0)
 		{
-			echo '<b>'.$p->t('profil/funktionen').'</b><table class="tablesorter" id="t1"><thead><tr><th>'.$p->t('global/bezeichnung').'</th><th>'.$p->t('global/organisationseinheit').'</th><th>'.$p->t('global/semester').'</th><th>'.$p->t('global/institut').'</th></tr></thead><tbody>';
+			echo '<b>'.$p->t('profil/funktionen').'</b>
+			<table class="tablesorter" id="t1">
+				<thead>
+					<tr>
+						<th>'.$p->t('global/bezeichnung').'</th>
+						<th>'.$p->t('global/organisationseinheit').'</th>
+						<th>'.$p->t('global/semester').'</th>
+						<th>'.$p->t('global/institut').'</th>
+						<th>'.$p->t('profil/gueltigvon').'</th>
+						<th>'.$p->t('profil/gueltigbis').'</th>
+					</tr>
+				</thead>
+			<tbody>';
 
 			while($row_funktion = $db->db_fetch_object($result_funktion))
 			{
-				echo "<tr><td>".$row_funktion->beschreibung.($row_funktion->bf_bezeichnung!=$row_funktion->beschreibung && $row_funktion->bf_bezeichnung!=''?' - '.$row_funktion->bf_bezeichnung:'')."</td><td nowrap>".$row_funktion->organisationseinheittyp_kurzbz.' '.$row_funktion->oe_bezeichnung."</td><td>$row_funktion->semester</td><td>$row_funktion->fachbereich_kurzbz</td></tr>";
+				echo "
+				<tr>
+					<td>".$row_funktion->beschreibung;
+				if($row_funktion->bf_bezeichnung != $row_funktion->beschreibung
+					&& $row_funktion->bf_bezeichnung != '')
+					echo ' - '.$row_funktion->bf_bezeichnung;
+				echo "</td>
+					<td nowrap>".$row_funktion->organisationseinheittyp_kurzbz.' '.$row_funktion->oe_bezeichnung."</td>
+					<td>$row_funktion->semester</td>
+					<td>$row_funktion->fachbereich_kurzbz</td>
+					<td>".$datum_obj->formatDatum($row_funktion->datum_von,'d.m.Y')."</td>
+					<td>".$datum_obj->formatDatum($row_funktion->datum_bis,'d.m.Y')."</td>
+				</tr>";
 			}
 			echo '</tbody></table><br>';
 		}
 	}
 }
 
-if(!$ansicht && (!defined('CIS_PROFIL_BETRIEBSMITTEL_ANZEIGEN') || CIS_PROFIL_BETRIEBSMITTEL_ANZEIGEN))
+if (!$ansicht && (!defined('CIS_PROFIL_BETRIEBSMITTEL_ANZEIGEN') || CIS_PROFIL_BETRIEBSMITTEL_ANZEIGEN))
 {
-    // Betriebsmittel Personen
-    $oBetriebsmittelperson = new betriebsmittelperson();
-    $oBetriebsmittelperson->result=array();
-    $oBetriebsmittelperson->errormsg='';
+	// Betriebsmittel Personen
+	$oBetriebsmittelperson = new betriebsmittelperson();
+	$oBetriebsmittelperson->result = array();
+	$oBetriebsmittelperson->errormsg = '';
 
-    if ($oBetriebsmittelperson->getBetriebsmittelPerson($user->person_id))
+	if ($oBetriebsmittelperson->getBetriebsmittelPerson($user->person_id))
 	{
-		if (is_array($oBetriebsmittelperson->result) && count($oBetriebsmittelperson->result)>0)
-	    {
-	    	echo '<b>'.$p->t('profil/entlehnteBetriebsmittel').'</b>
-	    			<table class="tablesorter" id="t2">
-	    			<thead>
-	    				<tr>
-	    					<th>'.$p->t('profil/betriebsmittel').'</th>
-	    					<th>'.$p->t('profil/nummer').'</th>
-	    					<th>'.$p->t('profil/ausgegebenAm').'</th>
-	    				</tr>
-	    			</thead><tbody>';
+		if (is_array($oBetriebsmittelperson->result) && count($oBetriebsmittelperson->result) > 0)
+		{
+			echo '<b>'.$p->t('profil/entlehnteBetriebsmittel').'</b>
+					<table class="tablesorter" id="t2">
+					<thead>
+						<tr>
+							<th>'.$p->t('profil/betriebsmittel').'</th>
+							<th>'.$p->t('profil/nummer').'</th>
+							<th>'.$p->t('profil/ausgegebenAm').'</th>
+						</tr>
+					</thead><tbody>';
 
-			for ($i=0;$i<count($oBetriebsmittelperson->result);$i++)
+			for ($i = 0;$i < count($oBetriebsmittelperson->result);$i++)
 			{
 				if (empty($oBetriebsmittelperson->result[$i]->retouram) )
-		        {
-		          	$bm = new betriebsmittel_betriebsmittelstatus();
-		           	if($bm->load_last_betriebsmittel_id($oBetriebsmittelperson->result[$i]->betriebsmittel_id)
-		             	&& $bm->betriebsmittelstatus_kurzbz<>'vorhanden')
-		           	{
-		          		continue;
-		           	}
-		           	$mailtext_inventar = "	".$p->t('mail/profilBetriebsmittelKorrektur')."?subject=Korrektur%20des%20Inventars%20".$oBetriebsmittelperson->result[$i]->inventarnummer."
-		           							&body=Folgende%20Aenderung%20hat%20sich%20ergeben:%0A%0A
-		          							Inventar:%20".$oBetriebsmittelperson->result[$i]->inventarnummer."%20(".$oBetriebsmittelperson->result[$i]->beschreibung.")%0A%0A
-		          							Status:%20ausgeschieden%20%2F%20falsche%20Zuordnung%20%2F%20falsche%20Angaben%0A
-		          							Details:%20%0A\"";
+				{
+					$bm = new betriebsmittel_betriebsmittelstatus();
+					if ($bm->load_last_betriebsmittel_id($oBetriebsmittelperson->result[$i]->betriebsmittel_id)
+						&& $bm->betriebsmittelstatus_kurzbz<>'vorhanden')
+					{
+						continue;
+					}
+					$mailtext_inventar = "	".$p->t('mail/profilBetriebsmittelKorrektur')."?subject=Korrektur%20des%20Inventars%20".$oBetriebsmittelperson->result[$i]->inventarnummer."
+											&amp;body=Folgende%20Aenderung%20hat%20sich%20ergeben:%0A%0A
+											Inventar:%20".$oBetriebsmittelperson->result[$i]->inventarnummer."%20(".$db->convert_html_chars($oBetriebsmittelperson->result[$i]->beschreibung).")%0A%0A
+											Status:%20ausgeschieden%20%2F%20falsche%20Zuordnung%20%2F%20falsche%20Angaben%0A
+											Details:%20%0A\"";
 					echo "<tr>
-		      				<td>".$oBetriebsmittelperson->result[$i]->betriebsmitteltyp.' '.$oBetriebsmittelperson->result[$i]->beschreibung.(isset($oBetriebsmittelperson->result[$i]->verwendung)?' ('.$oBetriebsmittelperson->result[$i]->verwendung.')':'')."</td>
-		      				<td>".$oBetriebsmittelperson->result[$i]->nummer.' <a href="mailto:'.$mailtext_inventar.'>'.$oBetriebsmittelperson->result[$i]->inventarnummer."</a></td>
-		      				<td>".$datum_obj->formatDatum($oBetriebsmittelperson->result[$i]->ausgegebenam,'d.m.Y')."</td>
-		      			</tr>";
+							<td>".$oBetriebsmittelperson->result[$i]->betriebsmitteltyp.' '.$oBetriebsmittelperson->result[$i]->beschreibung.(isset($oBetriebsmittelperson->result[$i]->verwendung)?' ('.$oBetriebsmittelperson->result[$i]->verwendung.')':'')."</td>
+							<td>".$oBetriebsmittelperson->result[$i]->nummer.' <a href="mailto:'.$mailtext_inventar.'>'.$oBetriebsmittelperson->result[$i]->inventarnummer."</a></td>
+							<td>".$datum_obj->formatDatum($oBetriebsmittelperson->result[$i]->ausgegebenam,'d.m.Y')."</td>
+						</tr>";
 
-	            }
-	        }
-	    	echo '</tbody></table>';
+				}
+			}
+			echo '</tbody></table>';
 		}
-    }
+	}
 
 	// Zutrittsgruppen
 	$gruppe = new gruppe();
 	$gruppe->loadZutrittsgruppen($uid);
-	if(count($gruppe->result)>0)
+	if (count($gruppe->result) > 0)
 	{
 		echo '<b>Zutrittsgruppen</b>
 		<table id="tableZutritt" class="tablesorter">
@@ -547,103 +571,127 @@ if(!$ansicht && (!defined('CIS_PROFIL_BETRIEBSMITTEL_ANZEIGEN') || CIS_PROFIL_BE
 			echo '</tr>';
 		}
 		echo '</tbody>
-		</thead>
 		</table>';
 	}
 }
 
 
-	echo '
-    	</td>
-  	</tr>
-  	</table>
-  	</td>';
-	$menubox='';
+echo '
+	</td>
+</tr>
+</table>
+</td>';
+$menubox = '';
 
-        //Überprüfung ob Addon vorhanden ist
-        $addon = new addon();
+//Überprüfung ob Addon vorhanden ist
+$addon = new addon();
 
-        foreach($addon->aktive_addons as $ad)
-        {
-            // checken ob es file profil_array.php gibt
-            if(file_exists(DOC_ROOT.'/addons/'.$ad.'/cis/profil_array.php'))
-            {
-				$menu=array();
-                include(DOC_ROOT.'/addons/'.$ad.'/cis/profil_array.php');
-                // Wenn Mitarbeiter count == 0
-                if(count($menu >0))
-                {
-                    foreach($menu as $entry)
-                    {
-                        $menubox.= "<p><a href=".$entry['link']." target=".$entry['target'].">".$entry['name']."</a></p>";
-                    }
-                }
-             }
-        }
-
-    //Überprüfung ob Hilfe-Link vorhanden
-    if ($p->t("dms_link/profilhilfe")!='')
-        $menubox.= '<p><a href="../../../cms/content.php?content_id='.$p->t("dms_link/profilhilfe").'" target="_blank">'.$p->t('global/hilfe').'</a></p>';
-    if($menubox!='')
-		echo '<td class="menubox">'.$menubox;
-	else
-		echo '<td>';
-	echo'</td></tr>
-		<tr>
-		<td class="teambox" style="width: 20%;">';
-	if(!defined('CIS_PROFIL_MAILVERTEILER_ANZEIGEN') || CIS_PROFIL_MAILVERTEILER_ANZEIGEN)
+foreach($addon->aktive_addons as $ad)
+{
+	// checken ob es file profil_array.php gibt
+	if (file_exists(DOC_ROOT.'/addons/'.$ad.'/cis/profil_array.php'))
 	{
-		echo '<B>'.$p->t('mailverteiler/mailverteiler').'</B><BR><BR>';
-		//Mailverteiler
-		if(!$ansicht)
-			echo "<SMALL>".$p->t('profil/sieSindMitgliedInFolgendenVerteilern').":</SMALL>";
-		else
-			echo "<SMALL>".$p->t('profil/derUserIstInFolgendenVerteilern',array($user->uid)).":</SMALL>";
+		$menu=array();
+		include(DOC_ROOT.'/addons/'.$ad.'/cis/profil_array.php');
 
-		echo '<table>';
-
-		// Mail-Groups
-		$qry_gruppen = "
-			SELECT
-				gruppe_kurzbz, beschreibung
-			FROM
-				campus.vw_persongruppe
-			WHERE
-				mailgrp
-				AND uid=".$db->db_add_param($uid);
-
-		if(!($erg_mg=$db->db_query($qry_gruppen)))
-			die($db->db_last_error());
-		$nr_mg=$db->db_num_rows($erg_mg);
-
-	  	for($i=0;$i<$nr_mg;$i++)
+		if (count($menu) > 0)
 		{
-			$row=$db->db_fetch_object($erg_mg,$i);
-			echo '<TR><TD><A href="mailto:'.strtolower(trim($row->gruppe_kurzbz)).'@'.DOMAIN.'">'.strtolower($row->gruppe_kurzbz).'&nbsp;</TD>';
-			echo "<TD>&nbsp;$row->beschreibung</TD></TR>";
+			foreach($menu as $entry)
+			{
+				$menubox.= '<p><a href="'.$entry['link'].'" target="'.$entry['target'].'">'.$entry['name'].'</a></p>';
+			}
 		}
+	 }
+}
 
-		if (isset($user->matrikelnr))
+//Überprüfung ob Hilfe-Link vorhanden
+if ($p->t("dms_link/profilhilfe") != '')
+	$menubox .= '<p><a href="../../../cms/content.php?content_id='.$p->t("dms_link/profilhilfe").'" target="_blank">'.$p->t('global/hilfe').'</a></p>';
+if ($menubox != '')
+	echo '<td class="menubox">'.$menubox;
+else
+	echo '<td>';
+echo'</td></tr>
+	<tr>
+	<td class="teambox" style="width: 20%;">';
+if (!defined('CIS_PROFIL_MAILVERTEILER_ANZEIGEN') || CIS_PROFIL_MAILVERTEILER_ANZEIGEN)
+{
+	echo '<b>'.$p->t('mailverteiler/mailverteiler').'</b><br /><br />';
+	//Mailverteiler
+	if (!$ansicht)
+		echo "<small>".$p->t('profil/sieSindMitgliedInFolgendenVerteilern').":</small>";
+	else
+		echo "<small>".$p->t('profil/derUserIstInFolgendenVerteilern',array($user->uid)).":</small>";
+
+	echo '<table>';
+
+	// Mail-Groups
+	$qry_gruppen = "
+		SELECT
+			gruppe_kurzbz, beschreibung
+		FROM
+			campus.vw_persongruppe
+		WHERE
+			mailgrp
+			AND uid=".$db->db_add_param($uid);
+
+	if (!($erg_mg = $db->db_query($qry_gruppen)))
+		die($db->db_last_error());
+	$nr_mg = $db->db_num_rows($erg_mg);
+
+	for ($i = 0;$i < $nr_mg;$i++)
+	{
+		$row = $db->db_fetch_object($erg_mg,$i);
+		$mailverteiler = strtolower(trim($row->gruppe_kurzbz)).'@'.DOMAIN;
+		echo '
+		<tr>
+			<td><a href="mailto:'.$mailverteiler.'">'.strtolower($row->gruppe_kurzbz).'</a></td>
+			<td>'.$row->beschreibung.'</td>
+		</tr>';
+	}
+
+	if (isset($user->matrikelnr))
+	{
+		$stdverteiler = strtolower(trim($studiengang->kuerzel)).'_std';
+		$semesterverteiler = strtolower(trim($studiengang->kuerzel)).trim($user->semester);
+		$verbandverteiler = strtolower(trim($studiengang->kuerzel)).trim($user->semester).strtolower(trim($user->verband));
+		echo '
+		<tr>
+			<td><a href="mailto:'.$stdverteiler.'@'.DOMAIN.'">'.$stdverteiler.'</a></td>
+			<td>'.$p->t('profil/alleStudentenVon').' '.$studiengang->kuerzel.'</td>
+		</tr>
+		<tr>
+			<td><a href="mailto:'.$semesterverteiler.'@'.DOMAIN.'">'.$semesterverteiler.'</a></td>
+			<td>'.$p->t('profil/alleStudentenVon').' '.$studiengang->kuerzel.' '.$user->semester.'</td>
+		</tr>';
+		if(trim($user->verband) != '')
 		{
-			echo '<TR><TD><A href="mailto:'.strtolower(trim($studiengang->kuerzel)).'_std@'.DOMAIN.'">'.strtolower($studiengang->kuerzel).'_std&nbsp;</TD>';
-			echo "<TD>&nbsp;".$p->t('profil/alleStudentenVon')." $studiengang->kuerzel</TD></TR>";
-			echo '<TR><TD><A href="mailto:'.strtolower(trim($studiengang->kuerzel)).trim($user->semester).'@'.DOMAIN.'">'.strtolower($studiengang->kuerzel).$user->semester.'&nbsp;</TD>';
-	   		echo "<TD>&nbsp;".$p->t('profil/alleStudentenVon')." $studiengang->kuerzel $user->semester</TD></TR>";
-			echo '<TR><TD><A href="mailto:'.strtolower(trim($studiengang->kuerzel)).trim($user->semester).strtolower(trim($user->verband)).'@'.DOMAIN.'">'.strtolower($studiengang->kuerzel).$user->semester.strtolower($user->verband).'&nbsp;</TD>';
-	   		echo "<TD>&nbsp;".$p->t('profil/alleStudentenVon')." $studiengang->kuerzel $user->semester$user->verband</TD></TR>";
-	   		if(trim($user->gruppe)!='')
-	   		{
-				echo '<TR><TD><A href="mailto:'.strtolower(trim($studiengang->kuerzel)).trim($user->semester).strtolower(trim($user->verband)).trim($user->gruppe).'@'.DOMAIN.'">'.strtolower($studiengang->kuerzel).$user->semester.strtolower($user->verband).$user->gruppe.'&nbsp;</TD>';
-	   			echo "<TD>&nbsp;".$p->t('profil/alleStudentenVon')." $studiengang->kuerzel $user->semester$user->verband$user->gruppe</TD><TD></TD></TR>";
-	   		}
+			echo '
+			<tr>
+				<td><a href="mailto:'.$verbandverteiler.'@'.DOMAIN.'">'.$verbandverteiler.'</a></td>
+				<td>'.$p->t('profil/alleStudentenVon').' '.$studiengang->kuerzel.' '.$user->semester.$user->verband.'</td>
+			</tr>';
+			if (trim($user->gruppe) != '')
+			{
+				$grpverteiler = strtolower(trim($studiengang->kuerzel)).trim($user->semester);
+				$grpverteiler .= strtolower(trim($user->verband)).trim($user->gruppe);
+
+				echo '
+				<tr>
+					<td><a href="mailto:'.$grpverteiler.'@'.DOMAIN.'">'.$grpverteiler.'</a></td>
+					<td>'.$p->t('profil/alleStudentenVon').' '.$studiengang->kuerzel.' '.
+					$user->semester.$user->verband.$user->gruppe.'</td>
+				</tr>';
+			}
 		}
 	}
-	echo '	</table>
-			</td>
-			</tr>
-			</tbody>
-			</table>';
-?>
-</div>
+}
+echo '	</table>
+		</td>
+		</tr>
+		</tbody>
+		</table>
+	</div>
 </body>
 </html>
+';

config/vilesci.config-default.inc.php

@@ -5,61 +5,60 @@
  */
 
 // Error Reporting
-ini_set('display_errors','1');
+ini_set('display_errors', '1');
 error_reporting(E_ALL);
 
 // Encoding
-mb_internal_encoding("UTF-8");
-mb_regex_encoding("UTF-8");
-setlocale (LC_ALL, 'de_DE.UTF8','de_DE@euro', 'de_DE', 'de','DE', 'ge','German');
+mb_internal_encoding('UTF-8');
+mb_regex_encoding('UTF-8');
+setlocale (LC_ALL, 'de_DE.UTF8', 'de_DE@euro', 'de_DE', 'de', 'DE', 'ge', 'German');
 
 // Zeitzone
 date_default_timezone_set('Europe/Vienna');
 
 // Connection Strings zur Datenbank
-define("DB_SYSTEM","pgsql");
-define("DB_HOST","localhost");
-define("DB_PORT","5432");
-define("DB_NAME","fhcomplete");
-define("DB_USER","vilesci");
-define("DB_PASSWORD","vilesci");
-define("DB_CONNECT_PERSISTENT",TRUE);
-define('CONN_CLIENT_ENCODING','UTF-8' );
+define('DB_SYSTEM', 'pgsql');
+define('DB_HOST', 'localhost');
+define('DB_PORT', '5432');
+define('DB_NAME', 'fhcomplete');
+define('DB_USER', 'vilesci');
+define('DB_PASSWORD', 'vilesci');
+define('DB_CONNECT_PERSISTENT', TRUE);
+define('CONN_CLIENT_ENCODING', 'UTF-8' );
 
 //Connection String Infoscreen
-define("INFOSCREEN_USER","");
-define("INFOSCREEN_PASSWORD","");
+define('INFOSCREEN_USER', '');
+define('INFOSCREEN_PASSWORD', '');
 
 // Name des Servers (benoetigt fuer Cronjobs
-define('SERVER_NAME','localhost');
+define('SERVER_NAME', 'localhost');
 
 // URL zu FHComplete Root
-define('APP_ROOT','http://www.fhcomlete.org/build/');
+define('APP_ROOT', 'http://www.fhcomlete.org/build/');
 // URL zu RDF Verzeichnis
-define('XML_ROOT','http://www.fhcomlete.org/build/rdf/');
+define('XML_ROOT', 'http://www.fhcomlete.org/build/rdf/');
 // Pfad zu Document Root
-define('DOC_ROOT','/var/www/html/build/');
+define('DOC_ROOT', '/var/www/html/build/');
 // URL zu CIS
-define('CIS_ROOT','http://www.fhcomlete.org/build/cis/');
+define('CIS_ROOT', 'http://www.fhcomlete.org/build/cis/');
 
 // Externe Funktionen - Unterordner im Include-Verzeichnis
-define('EXT_FKT_PATH','tw');
+define('EXT_FKT_PATH', 'tw');
 
 // Fuer Mails etc
-define('DOMAIN','technikum-wien.at');
+define('DOMAIN', 'example.com');
 
 // Ordner für DMS Dokumente
-define('DMS_PATH','/var/fhcomplete/documents/dms/');
+define('DMS_PATH', '/var/fhcomplete/documents/dms/');
 
 // Authentifizierungsmethode
 // Moegliche Werte:
 // auth_mixed    - htaccess mit LDAP (Default)
 // auth_demo     - Demo Modus (.htaccess)
 // auth_session  - Sessions mit LDAP (Testbetrieb)
-define("AUTH_SYSTEM", "auth_demo");
+define('AUTH_SYSTEM', 'auth_demo');
 // Gibt den Namen fuer die htaccess Authentifizierung an (muss mit dem Attribut AuthName im htaccess uebereinstimmen)
-define("AUTH_NAME","Technikum-Wien");
-
+define('AUTH_NAME', 'FH Complete');
 
 /*
  * LDAP Einstellungen
@@ -72,53 +71,52 @@ define("AUTH_NAME","Technikum-Wien");
  * LDAP_BIND_PASSWORD: Passwort des Users falls eine Authentifizierung am LDAP noetig ist oder null
  * LDAP_USER_SEARCH_FILTER: LDAP Attribut in dem der Username steht nach dem gesucht wird (uid | sAMAccountName)
  */
-define('LDAP_SERVER','ldap://ldap.example.com');
-define('LDAP_PORT',389);
-define('LDAP_STARTTLS',true);
-define('LDAP_BASE_DN','ou=People,dc=example,dc=com');
-define('LDAP_BIND_USER',null);
-define('LDAP_BIND_PASSWORD',null);
-define('LDAP_USER_SEARCH_FILTER','uid');
+define('LDAP_SERVER', 'ldap://ldap.example.com');
+define('LDAP_PORT', 389);
+define('LDAP_STARTTLS', true);
+define('LDAP_BASE_DN', 'ou=People,dc=example,dc=com');
+define('LDAP_BIND_USER', null);
+define('LDAP_BIND_PASSWORD', null);
+define('LDAP_USER_SEARCH_FILTER', 'uid');
 
 // 2. LDAP Server (zB wenn Mitarbeiter und Studierende auf 2 getrennten Servern liegen)
 /*
-define('LDAP2_SERVER','ldaps://dc1.example.com');
-define('LDAP2_PORT',636);
-define('LDAP2_STARTTLS',false);
-define('LDAP2_BASE_DN','ou=Mitarbeiter,dc=example,dc=com');
-define('LDAP2_BIND_USER','cn=fhcomplete,dc=example,dc=com');
-define('LDAP2_BIND_PASSWORD','Pa55w0rd');
-define('LDAP2_USER_SEARCH_FILTER','sAMAccountName');
+define('LDAP2_SERVER', 'ldaps://dc1.example.com');
+define('LDAP2_PORT', 636);
+define('LDAP2_STARTTLS', false);
+define('LDAP2_BASE_DN', 'ou=Mitarbeiter,dc=example,dc=com');
+define('LDAP2_BIND_USER', 'cn=fhcomplete,dc=example,dc=com');
+define('LDAP2_BIND_PASSWORD', 'Pa55w0rd');
+define('LDAP2_USER_SEARCH_FILTER', 'sAMAccountName');
 */
 
 // LDAP MASTER SERVER fuer Passwort Aenderungen
-define('LDAP_SERVER_MASTER',LDAP_SERVER);
+define('LDAP_SERVER_MASTER', LDAP_SERVER);
 
 // Default Password fuer neue Accounts
 // Hier sollte ein langes geheimes Passwort gesetzt werden!
-define('ACCOUNT_ACTIVATION_PASSWORD','');
-
+define('ACCOUNT_ACTIVATION_PASSWORD', '');
 
 // Attribut fuer Zutrittskartennummer im LDAP
-define("LDAP_CARD_NUMBER","twHitagCardNumber");
+define('LDAP_CARD_NUMBER', 'twHitagCardNumber');
 // Attribut fuer Zutrittskartennummer2 im LDAP
-define("LDAP_CARD_NUMBER2","twCardNumber");
+define('LDAP_CARD_NUMBER2', 'twCardNumber');
 
 // Ablauffristen fuer die Accounts in Wochen (mind. 2)
-define('DEL_MITARBEITER_WEEKS','52');
-define('DEL_STUDENT_WEEKS','26');
-define('DEL_ABBRECHER_WEEKS','3');
+define('DEL_MITARBEITER_WEEKS', '52');
+define('DEL_STUDENT_WEEKS', '26');
+define('DEL_ABBRECHER_WEEKS', '3');
 
-define('DEFAULT_LANGUAGE','German');
+define('DEFAULT_LANGUAGE', 'German');
 
 // Wie viele Tage sollen im LVPlan angezeigt werden
-define('TAGE_PRO_WOCHE','7');
+define('TAGE_PRO_WOCHE', '7');
 
 // Obergrenze fuer Semesterstunden die pro Semester pro Lektor unterrichtet werden duerfen
 // Externe Lektoren
-define('WARN_SEMESTERSTD_FREI','120');
+define('WARN_SEMESTERSTD_FREI', '120');
 // Fixangestellte Lektoren
-define('WARN_SEMESTERSTD_FIX','320');
+define('WARN_SEMESTERSTD_FIX', '320');
 
 //Wochen als Grundlage zur Berechnung der Lektorenmeldung
 define('BIS_SWS_WOCHEN', 40);
@@ -127,56 +125,64 @@ define('BIS_SWS_WOCHEN', 40);
 // Mail-Adressen (Angabe von mehreren Addressen mit ',' getrennt moeglich)
 
 // Wenn MAIL_FROM gesetzt ist, werden alle Mails mit diesem Absender versandt
-define('MAIL_FROM','');
+define('MAIL_FROM', '');
 
 // Wenn MAIL_DEBUG gesetzt ist, werden alle Mails an diese Adresse gesendet
-define('MAIL_DEBUG','invalid@technikum-wien.at');
+define('MAIL_DEBUG', 'invalid@example.com');
 // Geschaeftsstelle / Personalabteilung
-define('MAIL_GST','invalid@technikum-wien.at');
+define('MAIL_GST', 'invalid@example.com');
 // Administrator
-define('MAIL_ADMIN','invalid@technikum-wien.at');
+define('MAIL_ADMIN', 'invalid@example.com');
 // LVPlan-Stelle
-define('MAIL_LVPLAN','invalid@technikum-wien.at');
+define('MAIL_LVPLAN', 'invalid@example.com');
 // ServerAdministratoren
-define('MAIL_IT','invalid@technikum-wien.at');
+define('MAIL_IT', 'invalid@example.com');
 // Support
-define('MAIL_SUPPORT','invalid@technikum-wien.at');
+define('MAIL_SUPPORT', 'invalid@example.com');
 // Lehrgaenge
-define('MAIL_LG','invalid@technikum-wien.at');
+define('MAIL_LG', 'invalid@example.com');
 
 // Default Anmerkung fuer neue Lehreinheiten
 // Beispiel: 'Abhaengigkeiten von anderen LV\'s\n\nSpez. Software/Equipment:\n\n'
 define ('LEHREINHEIT_ANMERKUNG_DEFAULT', '');
 
-//Gibt an welche Funktion zur generierung des PDF Files herangezogen wird
-//moegliche Werte: FOP | XSLFO2PDF
-define ('PDF_CREATE_FUNCTION','XSLFO2PDF');
-
 //Pfad zu den Projektarbeitsabgaben
-define('PAABGABE_PATH','/var/fhcomplete/documents/paabgabe/');
+define('PAABGABE_PATH', '/var/fhcomplete/documents/paabgabe/');
 
 // ***** Mantis Bugtracker *****
-define('MANTIS_PFAD','http://www.example.com/mantis/api/soap/mantisconnect.php?wsdl');
-define('MANTIS_USERNAME',(isset($_SERVER['PHP_AUTH_USER'])?$_SERVER['PHP_AUTH_USER']:''));
-define('MANTIS_PASSWORT',(isset($_SERVER['PHP_AUTH_PW'])?$_SERVER['PHP_AUTH_PW']:''));
+define('MANTIS_PFAD', 'http://www.example.com/mantis/api/soap/mantisconnect.php?wsdl');
+define('MANTIS_USERNAME', (isset($_SERVER['PHP_AUTH_USER'])?$_SERVER['PHP_AUTH_USER']:''));
+define('MANTIS_PASSWORT', (isset($_SERVER['PHP_AUTH_PW'])?$_SERVER['PHP_AUTH_PW']:''));
 
 //Name der aktiven Addons getrennt mit ;
-define('ACTIVE_ADDONS','');
+define('ACTIVE_ADDONS', '');
 
 //Wenn auf 'true' gesetzt, dann wird im FAS ein 3. Feld für die Eingabe von Reihungstest
 //Punkten angezeigt
-define('RT_PUNKTE3','false');
+define('RT_PUNKTE3', 'false');
 
 // **** nicht aendern ****
-define('TABLE_ID','_id');
-define('TABLE_BEGIN','tbl_');
-define('VIEW_BEGIN','vw_');
+define('TABLE_ID', '_id');
+define('TABLE_BEGIN', 'tbl_');
+define('VIEW_BEGIN', 'vw_');
 
 //Legt fest ob die Personalnummer beim Anlegen NULL sein soll
 define('FAS_PERSONALNUMMER_GENERATE_NULL', false);
 
 // API Informationen
-define('FHC_REST_API_KEY','testapikey@fhcomplete.org');
-define('FHC_REST_USER','username');
-define('FHC_REST_PASSWORD','password');
+define('FHC_REST_API_KEY', 'testapikey@fhcomplete.org');
+define('FHC_REST_USER', 'username');
+define('FHC_REST_PASSWORD', 'password');
+
+/**
+ * Signatur
+ * DEFAULT: https://signatur.example.com/api/sign
+ */
+define('SIGNATUR_URL', 'https://signatur.example.com/api/sign');
+// User für Zugriff auf Signaturserver
+define('SIGNATUR_USER', 'username');
+// Passwort für Zugriff auf Signaturserver
+define('SIGNATUR_PASSWORD', 'password');
+// Signaturprofil das verwendet werden soll
+define('SIGNATUR_DEFAULT_PROFILE', 'FHC_AMT_GROSS_DE');
 ?>

locale/de-AT/profil.php

@@ -38,25 +38,25 @@ $this->phrasen['profil/zeitsperrenVon']='Zeitsperren von';
 $this->phrasen['profil/lvplanVon']='LV-Plan von';
 
 $this->phrasen['profil/AccountInaktiv']='Achtung: Dieser Account ist nicht mehr aktiv';
-$this->phrasen['profil/inaktivStudent']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz 
+$this->phrasen['profil/inaktivStudent']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz
 deaktiviert wurde.Durch diese Deaktivierung wurden Sie auch aus allen Email-Verteilern gelöscht. <br><br>
-Sollte innerhalb von 6 Monaten (für Studierende) bzw. 3 Wochen (für AbbrecherInnen) nach der Deaktivierung keine 
+Sollte innerhalb von 6 Monaten (für Studierende) bzw. 3 Wochen (für AbbrecherInnen) nach der Deaktivierung keine
 neuerliche Aktivierung Ihres Benutzerdatensatzes erfolgen, dann werden automatisch auch<br>- Ihr Account, <br>- Ihre Mailbox (inkl. aller E-Mails) und<br>
-- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten, 
+- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten,
 sich umgehend mit Ihrer Studiengangsassistenz in Verbindung zu setzen.<br>';
 
-$this->phrasen['profil/inaktivMitarbeiter']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz 
+$this->phrasen['profil/inaktivMitarbeiter']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz
 deaktiviert wurde.Durch diese Deaktivierung wurden Sie auch aus allen Email-Verteilern gelöscht. <br><br>
 Sollte innerhalb von 12 Monaten nach der Deaktivierung keine neuerliche Aktivierung Ihres Benutzerdatensatzes erfolgen, dann werden automatisch auch<br>
 - Ihr Account, <br>- Ihre Mailbox (inkl. aller E-Mails) und<br>
-- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten, 
+- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten,
 sich umgehend mit Ihrer Studiengangsassistenz in Verbindung zu setzen.<br>';
 
-$this->phrasen['profil/inaktivSonstige']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz 
+$this->phrasen['profil/inaktivSonstige']='Achtung!<br> Wir möchten Sie darauf aufmerksam machen, dass Ihr Benutzerdatensatz
 deaktiviert wurde.Durch diese Deaktivierung wurden Sie auch aus allen Email-Verteilern gelöscht. <br><br>
 Sollte innerhalb der nächsten Tagen keine neuerliche Aktivierung Ihres Benutzerdatensatzes erfolgen, dann werden automatisch auch<br>
 - Ihr Account, <br>- Ihre Mailbox (inkl. aller E-Mails) und<br>
-- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten, 
+- Ihr Home-Verzeichnis (inkl. aller Dateien) gelöscht.<br><br>Falls es sich bei der Deaktivierung um einen Irrtum handelt, würden wir Sie bitten,
 sich umgehend mit Ihrer Studiengangsassistenz in Verbindung zu setzen.<br>';
 
 $this->phrasen['profil/nurJPGBilder']='Derzeit können nur Bilder im JPG Format hochgeladen werden';
@@ -78,4 +78,6 @@ $this->phrasen['profil/fhausweisWurdeNochNichtGedruckt']='FH-Ausweis wurde noch
 $this->phrasen['profil/ihrFotoWurdeNochNichtGeprueft']='Ihr Foto wurde noch nicht geprüft';
 $this->phrasen['profil/fotoAuswählen']='Klicken Sie auf das Bild um ein Foto hochzuladen';
 $this->phrasen['profil/bildSpeichern']='Bild speichern';
+$this->phrasen['profil/gueltigvon']='Gültig von';
+$this->phrasen['profil/gueltigbis']='Gültig bis';
 ?>

locale/en-US/profil.php

@@ -35,19 +35,19 @@ $this->phrasen['profil/zeitsperrenVon']='Unavailabilities of';
 $this->phrasen['profil/lvplanVon']='Schedule from';
 
 $this->phrasen['profil/AccountInaktiv']='NOTICE: This account is no longer active';
-$this->phrasen['profil/inaktivStudent']='NOTICE!<br> We would like to remind you that your user record has been deactivated. 
+$this->phrasen['profil/inaktivStudent']='NOTICE!<br> We would like to remind you that your user record has been deactivated.
 You were also removed from all e-mail distribution lists when your account was deactivated.<br><br>
 If your user account is not reactivated within 6 months (for students) or 3 weeks (for dropouts) of being deactivated, the following data will be automatically deleted:<br>
 - Your account<br>- Your mailbox (including all e-mails) and<br>- Your home directory (including all files).<br><br>
 If your account has been deactivated by mistake, please contact the administrative assistant for your degree program immediately.<br>';
 
-$this->phrasen['profil/inaktivMitarbeiter']='NOTICE!<br> We would like to remind you that your user record has been deactivated. 
+$this->phrasen['profil/inaktivMitarbeiter']='NOTICE!<br> We would like to remind you that your user record has been deactivated.
 You were also removed from all e-mail distribution lists when your account was deactivated.<br><br>
 If your user account is not reactivated within 12 months of being deactivated, the following data will be automatically deleted:<br>
 - Your account<br>- Your mailbox (including all e-mails) and<br>- Your home directory (including all files).<br><br>
 If your account has been deactivated by mistake, please contact the administrative assistant for your degree program immediately.<br>';
 
-$this->phrasen['profil/inaktivSonstige']='NOTICE!<br> We would like to remind you that your user record has been deactivated. 
+$this->phrasen['profil/inaktivSonstige']='NOTICE!<br> We would like to remind you that your user record has been deactivated.
 You were also removed from all e-mail distribution lists when your account was deactivated.<br><br>
 If your user account is not reactivated within the next days of being deactivated, the following data will be automatically deleted:<br>
 - Your account<br>- Your mailbox (including all e-mails) and<br>- Your home directory (including all files).<br><br>
@@ -75,4 +75,6 @@ $this->phrasen['profil/fhausweisWurdeNochNichtGedruckt']='UAS ID card has not ye
 $this->phrasen['profil/ihrFotoWurdeNochNichtGeprueft']='Your photo has not yet been approved';
 $this->phrasen['profil/fotoAuswählen']='Click on the image below to upload a photo';
 $this->phrasen['profil/bildSpeichern']='Save image';
+$this->phrasen['profil/gueltigvon']='Valid from';
+$this->phrasen['profil/gueltigbis']='Valid to';
 ?>

public/js/FilterWidget.js

@@ -81,20 +81,23 @@ var FHC_FilterWidget = {
 						var strDropDown = '<option value="">Select a field to add...</option>';
 						$("#addField").append(strDropDown);
 
-						for (var i = 0; i < data.allSelectedFields.length; i++)
+						if (data.allSelectedFields != null)
 						{
-							var fieldName = data.allSelectedFields[i];
-							var fieldToDisplay = data.allSelectedFields[i];
-
-							if (data.selectedFields.indexOf(fieldName) < 0)
+							for (var i = 0; i < data.allSelectedFields.length; i++)
 							{
-								if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
-								{
-									fieldToDisplay = data.allColumnsAliases[i];
-								}
+								var fieldName = data.allSelectedFields[i];
+								var fieldToDisplay = data.allSelectedFields[i];
 
-								strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-								$("#addField").append(strDropDown);
+								if (data.selectedFields.indexOf(fieldName) < 0)
+								{
+									if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+									{
+										fieldToDisplay = data.allColumnsAliases[i];
+									}
+
+									strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+									$("#addField").append(strDropDown);
+								}
 							}
 						}
 					}
@@ -126,44 +129,50 @@ var FHC_FilterWidget = {
 						var strDropDown = '<option value="">Select a filter to add...</option>';
 						$("#addFilter").append(strDropDown);
 
-						for (var i = 0; i < data.selectedFilters.length; i++)
+						if (data.selectedFilters != null)
 						{
-							var selectedFilters = '<div>';
+							for (var i = 0; i < data.selectedFilters.length; i++)
+							{
+								var selectedFilters = '<div>';
 
-							selectedFilters += '<span class="filter-options-span">';
-							selectedFilters += data.selectedFiltersAliases[i];
-							selectedFilters += '</span>';
+								selectedFilters += '<span class="filter-options-span">';
+								selectedFilters += data.selectedFiltersAliases[i];
+								selectedFilters += '</span>';
 
-							selectedFilters += FHC_FilterWidget._getSelectedFilterFields(
-								data.selectedFiltersMetaData[i],
-								data.selectedFiltersActiveFilters[i],
-								data.selectedFiltersActiveFiltersOperation[i],
-								data.selectedFiltersActiveFiltersOption[i]
-							);
+								selectedFilters += FHC_FilterWidget._getSelectedFilterFields(
+									data.selectedFiltersMetaData[i],
+									data.selectedFiltersActiveFilters[i],
+									data.selectedFiltersActiveFiltersOperation[i],
+									data.selectedFiltersActiveFiltersOption[i]
+								);
 
-							selectedFilters += '<span>';
-							selectedFilters += '<input type="button" value="X" class="remove-selected-filter btn btn-default" filterToRemove="' + data.selectedFilters[i] + '">';
-							selectedFilters += '</span>';
+								selectedFilters += '<span>';
+								selectedFilters += '<input type="button" value="X" class="remove-selected-filter btn btn-default" filterToRemove="' + data.selectedFilters[i] + '">';
+								selectedFilters += '</span>';
 
-							selectedFilters += '</div>';
+								selectedFilters += '</div>';
 
-							$("#selectedFilters").append(selectedFilters);
+								$("#selectedFilters").append(selectedFilters);
+							}
 						}
 
-						for (var i = 0; i < data.allSelectedFields.length; i++)
+						if (data.allSelectedFields != null)
 						{
-							var fieldName = data.allSelectedFields[i];
-							var fieldToDisplay = data.allSelectedFields[i];
-
-							if (data.selectedFilters.indexOf(fieldName) < 0)
+							for (var i = 0; i < data.allSelectedFields.length; i++)
 							{
-								if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
-								{
-									fieldToDisplay = data.allColumnsAliases[i];
-								}
+								var fieldName = data.allSelectedFields[i];
+								var fieldToDisplay = data.allSelectedFields[i];
 
-								strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-								$("#addFilter").append(strDropDown);
+								if (data.selectedFilters.indexOf(fieldName) < 0)
+								{
+									if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+									{
+										fieldToDisplay = data.allColumnsAliases[i];
+									}
+
+									strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+									$("#addFilter").append(strDropDown);
+								}
 							}
 						}
 					}
@@ -279,7 +288,7 @@ var FHC_FilterWidget = {
 						}
 						else
 						{
-							console.log("No fields to display!!!");
+							// console.log("No fields to display!!!");
 						}
 					}
 					else

public/js/infocenter/infocenterDetails.js

@@ -1,6 +1,7 @@
 
 var fhc_controller_id = FHC_AjaxClient.getUrlParameter('fhc_controller_id');
 const CONTROLLER_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"+FHC_JS_DATA_STORAGE_OBJECT.called_path;
+const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
 
 /**
  * javascript file for infocenterDetails page
@@ -9,13 +10,13 @@ $(document).ready(
 	function ()
 	{
 		//initialise table sorter
-		addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]);
-		addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]);
-		addTablesorter("msgtable", [[0, 1], [2, 0]], ["zebra", "filter"], 2);
-		tablesortAddPager("msgtable", "msgpager", 14);
+		Tablesort.addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]);
+		Tablesort.addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]);
+		Tablesort.addTablesorter("msgtable", [[0, 1], [2, 0]], ["zebra", "filter"], 2);
+		Tablesort.tablesortAddPager("msgtable", "msgpager", 14);
 
-		formatNotizTable();
-		formatLogTable();
+		InfocenterDetails._formatNotizTable();
+		InfocenterDetails._formatLogTable();
 
 		//initialise datepicker
 		$.datepicker.setDefaults($.datepicker.regional['de']);
@@ -39,7 +40,7 @@ $(document).ready(
 			var boxid = this.id;
 			var akteid = boxid.substr(boxid.indexOf("_") + 1);
 			var checked = this.checked;
-			saveFormalGeprueft(personid, akteid, checked)
+			InfocenterDetails.saveFormalGeprueft(personid, akteid, checked)
 		});
 
 		//zgv übernehmen
@@ -48,15 +49,23 @@ $(document).ready(
 			var btn = $(this);
 			var prestudentid = this.id.substr(this.id.indexOf("_") + 1);
 			$('#zgvUebernehmenNotice').remove();
-			zgvUebernehmen(personid, prestudentid, btn)
+			InfocenterDetails.zgvUebernehmen(personid, prestudentid, btn)
 		});
 
 		//zgv speichern
 		$(".zgvform").on('submit', function (e)
 			{
 				e.preventDefault();
-				var data = $(this).serializeArray();
-				saveZgv(data);
+				var formdata = $(this).serializeArray();
+
+				var data = {};
+
+				for (var i = 0; i < formdata.length; i++)
+				{
+					data[formdata[i].name] = formdata[i].value;
+				}
+
+				InfocenterDetails.saveZgv(data);
 			}
 		);
 
@@ -64,7 +73,7 @@ $(document).ready(
 		$(".zgvinfo").click(function ()
 			{
 				var prestudentid = this.id.substr(this.id.indexOf("_") + 1);
-				openZgvInfoForPrestudent(prestudentid);
+				InfocenterDetails.openZgvInfoForPrestudent(prestudentid);
 			}
 		);
 
@@ -93,17 +102,24 @@ $(document).ready(
 		$("#notizform").on("submit", function (e)
 			{
 				e.preventDefault();
-				var personId = $("#hiddenpersonid").val();
 				var notizId = $("#notizform :input[name='hiddenNotizId']").val();
-				var data = $(this).serializeArray();
+				var formdata = $(this).serializeArray();
+				var data = {};
+
+				for (var i = 0; i < formdata.length; i++)
+				{
+					data[formdata[i].name] = formdata[i].value;
+				}
+
+				$("#notizmsg").empty();
 
 				if (notizId !== '')
 				{
-					updateNotiz(notizId, personid, data);
+					InfocenterDetails.updateNotiz(notizId, personid, data);
 				}
 				else
 				{
-					saveNotiz(personid, data);
+					InfocenterDetails.saveNotiz(personid, data);
 				}
 			}
 		);
@@ -111,6 +127,8 @@ $(document).ready(
 		//update notiz - autofill notizform
 		$(document).on("click", "#notiztable tbody tr", function ()
 			{
+				$("#notizmsg").empty();
+
 				var notizId = $(this).find("td:eq(3)").html();
 				var notizTitle = $(this).find("td:eq(1)").text();
 				var notizContent = this.title;
@@ -127,330 +145,357 @@ $(document).ready(
 		//update notiz - abbrechen-button: reset styles
 		$("#notizform :input[type='reset']").click(function ()
 			{
-				resetNotizFields();
+				InfocenterDetails._resetNotizFields();
 			}
 		);
 
 		//check if person is parked and display it
-		getParkedDateAjax(personid);
+		InfocenterDetails.getParkedDate(personid);
 
 	});
 
-function openZgvInfoForPrestudent(prestudent_id)
-{
-	var screenwidth = screen.width;
-	var popupwidth = 760;
-	var marginleft = screenwidth - popupwidth;
-	window.open("../getZgvInfoForPrestudent/" + prestudent_id, "_blank","resizable=yes,scrollbars=yes,width="+popupwidth+",height="+screen.height+",left="+marginleft);
-}
+var InfocenterDetails = {
 
-// -----------------------------------------------------------------------------------------------------------------
-// ajax calls
+	genericSaveError: function() {
+		alert("error when saving");
+	},
+	openZgvInfoForPrestudent: function(prestudent_id)
+	{
+		var screenwidth = screen.width;
+		var popupwidth = 760;
+		var marginleft = screenwidth - popupwidth;
+		window.open(CONTROLLER_URL + "/getZgvInfoForPrestudent/" + encodeURIComponent(prestudent_id), "_blank","resizable=yes,scrollbars=yes,width="+popupwidth+",height="+screen.height+",left="+marginleft);
+	},
 
-function saveFormalGeprueft(personid, akteid, checked)
-{
-	$.ajax({
-		type: "POST",
-		dataType: "json",
-		url: CONTROLLER_URL+"/saveFormalGeprueft/" + personid + '?fhc_controller_id=' + fhc_controller_id,
-		data: {"akte_id": akteid, "formal_geprueft": checked},
-		success: function (data, textStatus, jqXHR)
-		{
-			if (data === null)
+	// -----------------------------------------------------------------------------------------------------------------
+	// ajax calls
+	saveFormalGeprueft: function(personid, akteid, checked)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/saveFormalGeprueft/' + encodeURIComponent(personid),
 			{
-				$("#formalgeprueftam_" + akteid).text("");
+				akte_id: akteid,
+				formal_geprueft: checked
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (data !== false)
+					{
+						if (data === null)
+						{
+							$("#formalgeprueftam_" + akteid).text("");
+						}
+						else
+						{
+							var fgdatum = $.datepicker.parseDate("yy-mm-dd", data);
+							var gerfgdatum = $.datepicker.formatDate("dd.mm.yy", fgdatum);
+							$("#formalgeprueftam_" + akteid).text(gerfgdatum);
+						}
+						//refresh doctable tablesorter, formal geprueft changed!
+						$("#doctable").trigger("update");
+						InfocenterDetails._refreshLog();
+					}
+					else
+					{
+						InfocenterDetails.genericSaveError();
+					}
+				},
+				errorCallback: InfocenterDetails.genericSaveError,
+				veilTimeout: 0
 			}
-			else
+		);
+	},
+	zgvUebernehmen: function(personid, prestudentid, btn)
+	{
+		FHC_AjaxClient.ajaxCallGet(
+			CALLED_PATH + "/getLastPrestudentWithZgvJson/" + encodeURIComponent(personid),
 			{
-				fgdatum = $.datepicker.parseDate("yy-mm-dd", data);
-				gerfgdatum = $.datepicker.formatDate("dd.mm.yy", fgdatum);
-				$("#formalgeprueftam_" + akteid).text(gerfgdatum);
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						var prestudent = data.retval[0];
+						var zgvcode = prestudent.zgv_code !== null ? prestudent.zgv_code : "null";
+						var zgvort = prestudent.zgvort !== null ? prestudent.zgvort : "";
+						var zgvdatum = prestudent.zgvdatum;
+						var gerzgvdatum = "";
+						if (zgvdatum !== null)
+						{
+							zgvdatum = $.datepicker.parseDate("yy-mm-dd", prestudent.zgvdatum);
+							gerzgvdatum = $.datepicker.formatDate("dd.mm.yy", zgvdatum);
+						}
+						var zgvnation = prestudent.zgvnation !== null ? prestudent.zgvnation : "null";
+						$("#zgv_" + prestudentid).val(zgvcode);
+						$("#zgvort_" + prestudentid).val(zgvort);
+						$("#zgvdatum_" + prestudentid).val(gerzgvdatum);
+						$("#zgvnation_" + prestudentid).val(zgvnation);
+					}
+					else
+					{
+						btn.after("&nbsp;&nbsp;<span id='zgvUebernehmenNotice' class='text-warning'>keine ZGV vorhanden</span>");
+					}
+				},
+				veilTimeout: 0
 			}
-			//refresh doctable tablesorter, formal geprueft changed!
-			$("#doctable").trigger("update");
-			refreshLog();
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
-		}
-	});
-}
+		);
+	},
+	saveZgv: function(data)
+	{
+		var zgvError = function(){
+			$("#zgvSpeichern_" + prestudentid).before("<span id='zgvSpeichernNotice' class='text-danger'>Fehler beim Speichern der ZGV!</span>&nbsp;&nbsp;");
+		};
 
-function zgvUebernehmen(personid, prestudentid, btn)
-{
-	$.ajax({
-		type: "GET",
-		dataType: "json",
-		url: CONTROLLER_URL+"/getLastPrestudentWithZgvJson/" + personid + '?fhc_controller_id=' + fhc_controller_id,
-		success: function (data, textStatus, jqXHR)
-		{
-			if (data !== null)
+		var prestudentid = data.prestudentid;
+		$("#zgvSpeichernNotice").remove();
+
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/saveZgvPruefung',
+			data,
 			{
-				var zgvcode = data.zgv_code !== null ? data.zgv_code : "null";
-				var zgvort = data.zgvort !== null ? data.zgvort : "";
-				var zgvdatum = data.zgvdatum;
-				var gerzgvdatum = "";
-				if (zgvdatum !== null)
+				successCallback: function(data, textStatus, jqXHR) {
+
+					if (FHC_AjaxClient.hasData(data))
+					{
+						InfocenterDetails._refreshLog();
+						$("#zgvSpeichern_" + prestudentid).before("<span id='zgvSpeichernNotice' class='text-success'>ZGV erfolgreich gespeichert!</span>&nbsp;&nbsp;");
+					}
+					else
+					{
+						zgvError();
+					}
+				},
+				errorCallback: zgvError,
+				veilTimeout: 0
+			}
+		);
+	},
+	saveNotiz: function(personid, data)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/saveNotiz/' + encodeURIComponent(personid),
+			data,
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						InfocenterDetails._refreshNotizen();
+						InfocenterDetails._refreshLog();
+					}
+					else
+					{
+						InfocenterDetails._errorSaveNotiz();
+					}
+				},
+				errorCallback: InfocenterDetails._errorSaveNotiz,
+				veilTimeout: 0
+			}
+		);
+	},
+	updateNotiz: function(notizId, personId, data)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/updateNotiz/' + encodeURIComponent(notizId) + "/" + encodeURIComponent(personId),
+			data,
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						InfocenterDetails._refreshNotizen();
+						InfocenterDetails._refreshLog();
+						InfocenterDetails._resetNotizFields();
+					}
+					else
+					{
+						InfocenterDetails._errorSaveNotiz();
+					}
+				},
+				errorCallback: InfocenterDetails._errorSaveNotiz,
+				veilTimeout: 0
+			}
+		);
+	},
+	getStudienjahrEnd: function()
+	{
+		FHC_AjaxClient.ajaxCallGet(
+			CALLED_PATH + "/getStudienjahrEnd",
+			{
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (data)
+					{
+						console.log("studienjahr end executed");
+						var engdate = $.datepicker.parseDate("yy-mm-dd", data);
+						var gerdate = $.datepicker.formatDate("dd.mm.yy", engdate);
+						$("#parkdate").val(gerdate);
+					}
+				},
+				veilTimeout: 0
+			}
+		);
+	},
+	getParkedDate: function(personid)
+	{
+		FHC_AjaxClient.ajaxCallGet(
+			CALLED_PATH + "/getParkedDate/"+encodeURIComponent(personid),
+			{
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					InfocenterDetails._refreshParking(data);
+					InfocenterDetails._refreshLog();
+					if (data === null)
+						InfocenterDetails.getStudienjahrEnd();
+				},
+				veilTimeout: 0
+			}
+		);
+	},
+	parkPerson: function(personid, date)
+	{
+		var parkError = function(){
+			$("#parkmsg").text("  Fehler beim Parken!");
+		};
+
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/park',
+			{
+				"person_id": personid,
+				"parkdate": date
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+						InfocenterDetails.getParkedDate(personid);
+					else
+					{
+						parkError();
+					}
+				},
+				errorCallback: parkError,
+				veilTimeout: 0
+			}
+		);
+	},
+	unparkPerson: function(personid)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/unpark',
+			{
+				"person_id": personid
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (Array.isArray(data))
+					{
+						if (data.length > 0)
+							InfocenterDetails.getParkedDate(personid);
+						else
+							$("#unparkmsg").removeClass().addClass("text-warning").text("  Nichts zum Ausparken.");
+					}
+				},
+				errorCallback: function(){
+					$("#unparkmsg").removeClass().addClass("text-danger").text("  Fehler beim Ausparken!");
+				},
+				veilTimeout: 0
+			}
+		);
+	},
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// (private) methods executed after ajax (refreshers)
+	_refreshLog: function()
+	{
+		var personid = $("#hiddenpersonid").val();
+		$("#logs").load(CONTROLLER_URL + '/reloadLogs/' + personid + '?fhc_controller_id=' + fhc_controller_id,
+			function ()
+			{
+				//readd tablesorter
+				InfocenterDetails._formatLogTable()
+			}
+		);
+	},
+	_formatLogTable: function()
+	{
+		Tablesort.addTablesorter("logtable", [[0, 1]], ["filter"], 2);
+		Tablesort.tablesortAddPager("logtable", "logpager", 22);
+		$("#logtable").addClass("table-condensed");
+	},
+	_refreshNotizen: function()
+	{
+		$("#notizform").find("input[type=text], textarea").val("");
+		var personid = $("#hiddenpersonid").val();
+		$("#notizen").load(CONTROLLER_URL + '/reloadNotizen/' + personid,
+			function ()
+			{
+				//readd tablesorter
+				InfocenterDetails._formatNotizTable()
+			}
+		);
+	},
+	_refreshParking: function(date)
+	{
+		if (date === null)
+		{
+			$("#parking").html(
+				'<div class="form-group form-inline">'+
+					'<button class="btn btn-default" id="parklink" type="button""><i class="fa fa-clock-o"></i>&nbsp;BewerberIn parken</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
+					'bis&nbsp;&nbsp;'+
+					'<input id="parkdate" type="text" class="form-control" placeholder="Parkdatum" style="height: 25px; width: 99px">&nbsp;'+
+					'<span class="text-danger" id="parkmsg"></span>'+
+				'</div>');
+
+			$("#parkdate").datepicker({
+				"dateFormat": "dd.mm.yy",
+				"minDate": 0
+			});
+
+			$("#parklink").click(
+
+				function ()
 				{
-					zgvdatum = $.datepicker.parseDate("yy-mm-dd", data.zgvdatum);
-					gerzgvdatum = $.datepicker.formatDate("dd.mm.yy", zgvdatum);
+					var personid = $("#hiddenpersonid").val();
+					var date = $("#parkdate").val();
+
+					InfocenterDetails.parkPerson(personid, date);
 				}
-				var zgvnation = data.zgvnation !== null ? data.zgvnation : "null";
-				$("#zgv_" + prestudentid).val(zgvcode);
-				$("#zgvort_" + prestudentid).val(zgvort);
-				$("#zgvdatum_" + prestudentid).val(gerzgvdatum);
-				$("#zgvnation_" + prestudentid).val(zgvnation);
-			}
-			else
-			{
-				btn.after("&nbsp;&nbsp;<span id='zgvUebernehmenNotice' class='text-warning'>keine ZGV vorhanden</span>");
-			}
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
+			);
 		}
-	});
-}
+		else
+		{
+			var parkdate = $.datepicker.parseDate("yy-mm-dd", date);
+			var gerparkdate = $.datepicker.formatDate("dd.mm.yy", parkdate);
+			$("#parking").html(
+				'BewerberIn geparkt bis '+gerparkdate+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
+				'<button class="btn btn-default" id="unparklink"><i class="fa fa-sign-out"></i>&nbsp;BewerberIn ausparken</button>&nbsp;'+
+				'<span id="unparkmsg"></span>'
+			);
 
-function saveZgv(data)
-{
-	var prestudentid = data[0].value;
-	$("#zgvSpeichernNotice").remove();
-	$.ajax({
-		type: "POST",
-		dataType: "json",
-		data: data,
-		url: CONTROLLER_URL+"/saveZgvPruefung/" + prestudentid + '?fhc_controller_id=' + fhc_controller_id,
-		success: function (data, textStatus, jqXHR)
-		{
-			if (data === prestudentid)
-			{
-				refreshLog();
-				$("#zgvSpeichern_" + prestudentid).before("<span id='zgvSpeichernNotice' class='text-success'>ZGV erfolgreich gespeichert!</span>&nbsp;&nbsp;");
-			}
-			else
-			{
-				$("#zgvSpeichern_" + prestudentid).before("<span id='zgvSpeichernNotice' class='text-danger'>Fehler beim Speichern der ZGV!</span>&nbsp;&nbsp;");
-			}
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
+			$("#unparklink").click(
+				function ()
+				{
+					var personid = $("#hiddenpersonid").val();
+					InfocenterDetails.unparkPerson(personid, date);
+				}
+			);
 		}
-	});
-}
-
-function saveNotiz(personid, data)
-{
-	$.ajax({
-		type: "POST",
-		dataType: "json",
-		data: data,
-		url: CONTROLLER_URL+"/saveNotiz/" + personid + '?fhc_controller_id=' + fhc_controller_id,
-		success: function (data, textStatus, jqXHR)
-		{
-			refreshNotizen();
-			refreshLog();
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
-		}
-	});
-}
-
-function updateNotiz(notizId, personId, data)
-{
-	$.ajax({
-		type: "POST",
-		dataType: "json",
-		data: data,
-		url: CONTROLLER_URL+"/updateNotiz/" + notizId + "/" + personId + '?fhc_controller_id=' + fhc_controller_id,
-		success: function (data, textStatus, jqXHR)
-		{
-			if (data)
-			{
-				refreshNotizen();
-				refreshLog();
-				resetNotizFields();
-			}
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
-		}
-	});
-}
-
-function getStudienjahrEndAjax()
-{
-	$.ajax({
-		url: CONTROLLER_URL+"/getStudienjahrEnd?fhc_controller_id="+fhc_controller_id,
-		method: "GET",
-		success: function(data, textStatus, jqXHR)
-		{
-			//var gerdate = data.substring(8, 10) + "."+data.substring(5, 7) + "." + data.substring(0, 4);
-			var engdate = $.datepicker.parseDate("yy-mm-dd", data);
-			var gerdate = $.datepicker.formatDate("dd.mm.yy", engdate);
-			$("#parkdate").val(gerdate);
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus);
-		}
-	});
-}
-
-function getParkedDateAjax(personid)
-{
-	$.ajax({
-		url: CONTROLLER_URL+"/getParkedDate/"+personid+"?fhc_controller_id="+fhc_controller_id,
-		method: "GET",
-		success: function(data, textStatus, jqXHR)
-		{
-			refreshParking(data);
-			refreshLog();
-			getStudienjahrEndAjax();
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus);
-		}
-	});
-}
-
-function parkPersonAjax(personid, date)
-{
-	$.ajax({
-		url: CONTROLLER_URL+"/park?fhc_controller_id="+fhc_controller_id,
-		method: "POST",
-		data:
-		{
-			"person_id": personid,
-			"parkdate": date
-		},
-		success: function(data, textStatus, jqXHR)
-		{
-			getParkedDateAjax(personid);
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus);
-		}
-	});
-}
-
-function unparkPersonAjax(personid)
-{
-	$.ajax({
-		url: CONTROLLER_URL+"/unpark?fhc_controller_id="+fhc_controller_id,
-		method: "POST",
-		data:
-		{
-			"person_id": personid
-		},
-		success: function(data, textStatus, jqXHR)
-		{
-			getParkedDateAjax(personid);
-		},
-		error: function (jqXHR, textStatus, errorThrown)
-		{
-			alert(textStatus);
-		}
-	});
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-// methods executed after ajax (refreshers)
-
-function refreshLog()
-{
-	var personid = $("#hiddenpersonid").val();
-	$("#logs").load('../reloadLogs/' + personid + '?fhc_controller_id=' + fhc_controller_id,
-		function ()
-		{
-			//readd tablesorter
-			formatLogTable()
-		}
-	);
-}
-
-function formatLogTable()
-{
-	addTablesorter("logtable", [[0, 1]], ["filter"], 2);
-	tablesortAddPager("logtable", "logpager", 22);
-	$("#logtable").addClass("table-condensed");
-}
-
-function refreshNotizen()
-{
-	$("#notizform").find("input[type=text], textarea").val("");
-	var personid = $("#hiddenpersonid").val();
-	$("#notizen").load('../reloadNotizen/' + personid,
-		function ()
-		{
-			//readd tablesorter
-			formatNotizTable()
-		}
-	);
-}
-
-function refreshParking(date)
-{
-	if (date === null)
+	},
+	_formatNotizTable: function()
 	{
-		$("#parking").html(
-			'<div class="form-group form-inline">'+
-				'<button class="btn btn-default" id="parklink" type="button""><i class="fa fa-clock-o"></i>&nbsp;BewerberIn parken</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
-				'bis&nbsp;&nbsp;'+
-				'<input id="parkdate" type="text" class="form-control" placeholder="Parkdatum" style="height: 25px; width: 99px">'+
-			'</div>');
-
-		$("#parkdate").datepicker({
-			"dateFormat": "dd.mm.yy",
-			"minDate": 0
-		});
-
-		$("#parklink").click(
-			function ()
-			{
-				var personid = $("#hiddenpersonid").val();
-				var date = $("#parkdate").val();
-
-				parkPersonAjax(personid, date);
-			}
-		);
-	}
-	else
+		Tablesort.addTablesorter("notiztable", [[0, 1]], ["filter"], 2);
+		Tablesort.tablesortAddPager("notiztable", "notizpager", 11);
+		$("#notiztable").addClass("table-condensed");
+	},
+	_resetNotizFields: function()
 	{
-		var parkdate = $.datepicker.parseDate("yy-mm-dd", date);
-		var gerparkdate = $.datepicker.formatDate("dd.mm.yy", parkdate);
-		$("#parking").html(
-			'BewerberIn geparkt bis '+gerparkdate+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
-			'<button class="btn btn-default" id="unparklink"><i class="fa fa-sign-out"></i>&nbsp;BewerberIn ausparken</button>&nbsp;');
-
-		$("#unparklink").click(
-			function ()
-			{
-				var personid = $("#hiddenpersonid").val();
-				unparkPersonAjax(personid, date);
-			}
-		);
+		$("#notizmsg").empty();
+		$("#notizform :input[name='hiddenNotizId']").val("");
+		$("#notizform label:first").text("Notiz hinzufügen").css("color", "black");
+		$("#notizform :input[type='reset']").css("display", "none");
+	},
+	_errorSaveNotiz: function()
+	{
+		$("#notizmsg").text("Fehler beim Speichern der Notiz!&nbsp;");
 	}
-}
-
-function formatNotizTable()
-{
-	addTablesorter("notiztable", [[0, 1]], ["filter"], 2);
-	tablesortAddPager("notiztable", "notizpager", 11);
-	$("#notiztable").addClass("table-condensed");
-}
-
-function resetNotizFields()
-{
-	$("#notizform :input[name='hiddenNotizId']").val("");
-	$("#notizform label:first").text("Notiz hinzufügen").css("color", "black");
-	$("#notizform :input[type='reset']").css("display", "none");
-}
+};

public/js/infocenter/infocenterPersonDataset.js

@@ -56,9 +56,9 @@ function appendTableActionsHtml()
 
 				$("#datasetActionsTop, #datasetActionsBottom").append(
 					"<div class='row'>"+
-						"<div class='col-xs-4'>" + selectAllHtml + "&nbsp;&nbsp;" + actionHtml + "</div>"+
-						"<div class='col-xs-4 text-center'>" + legendHtml + "</div>"+
-						"<div class='col-xs-4 text-right'>" + countHtml + "</div>"+
+						"<div class='col-xs-6'>" + selectAllHtml + "&nbsp;&nbsp;" + actionHtml + "</div>"+
+						"<div class='col-xs-4'>" + legendHtml + "</div>"+
+						"<div class='col-xs-2 text-right'>" + countHtml + "</div>"+
 						"<div class='clearfix'></div>"+
 					"</div>"
 				);

public/js/tablesort/tablesort.js

@@ -1,67 +1,69 @@
-/**
- * adds tablesorter to specified tableid, german date format, default theme
- * @param tableid
- * @param sortList columns to sort by, as array of arrays (each array contains column number and 1/0 for asc/desc order)
- * @param widgets optional widgets like zebra or filter
- * @param minrows optional minimal amount of rows for filter row to be shown (only relevant for filter widget)
- */
-function addTablesorter(tableid, sortList, widgets, minrows)
-{
-	$("#" + tableid).tablesorter(
-		{
-			theme: "default",
-			dateFormat: "ddmmyyyy",
-			sortList: sortList,
-			widgets: widgets
-		}
-	);
-
-	if($("#" + tableid + " tr.tablesorter-filter-row").length)
+var Tablesort = {
+	/**
+	 * adds tablesorter to specified tableid, german date format, default theme
+	 * @param tableid
+	 * @param sortList columns to sort by, as array of arrays (each array contains column number and 1/0 for asc/desc order)
+	 * @param widgets optional widgets like zebra or filter
+	 * @param minrows optional minimal amount of rows for filter row to be shown (only relevant for filter widget)
+	 */
+	addTablesorter: function (tableid, sortList, widgets, minrows)
 	{
-		//hide filters if less than n datarows (+ 2 for headings and filter row itself), default 0
-		var minrows = minrows || 0;
-		if ($("#" + tableid + " tr").length < minrows + 2)
-		{
-			$("#" + tableid + " tr.tablesorter-filter-row").hide();
-		}
-	}
-}
-
-/**
- * adds pager for specified tableid. Assumes bootstap icons are available!
- * @param tableid
- * @param pagerid
- * @param size number of rows for each page
- */
-function tablesortAddPager(tableid, pagerid, size)
-{
-	var html =
-		'<div id="' + pagerid + '" class="pager"> ' +
-		'<form class="form-inline">' +
-		'<i class="fa fa-step-backward first"></i>&nbsp;' +
-		'<i class="fa fa-backward prev"></i>' +
-		'<span class="pagedisplay"></span>' +
-		'<i class="fa fa-forward next"></i>&nbsp;' +
-		'<i class="fa fa-step-forward last"></i>' +
-		'</form>' +
-		'</div>';
-
-	var rowcount = $("#" + tableid + " tbody tr").length;
-
-	//not show pager if only one table page
-	if (rowcount > size)
-	{
-		var table = $("#" + tableid);
-		table.after(html);
-
-		table.tablesorterPager(
+		$("#" + tableid).tablesorter(
 			{
-				container: $("#" + pagerid),
-				size: size,
-				cssDisabled: 'disabled',
-				savePages: false,
-				output: '{startRow} – {endRow} / {totalRows} Zeilen'
+				theme: "default",
+				dateFormat: "ddmmyyyy",
+				sortList: sortList,
+				widgets: widgets
 			}
 		);
+
+		if ($("#" + tableid + " tr.tablesorter-filter-row").length)
+		{
+			//hide filters if less than n datarows (+ 2 for headings and filter row itself), default 0
+			var minrows = minrows || 0;
+			if ($("#" + tableid + " tr").length < minrows + 2)
+			{
+				$("#" + tableid + " tr.tablesorter-filter-row").hide();
+			}
+		}
+	},
+
+	/**
+	 * adds pager for specified tableid. Assumes bootstap icons are available!
+	 * @param tableid
+	 * @param pagerid
+	 * @param size number of rows for each page
+	 */
+	tablesortAddPager: function (tableid, pagerid, size)
+	{
+		var html =
+			'<div id="' + pagerid + '" class="pager"> ' +
+			'<form class="form-inline">' +
+			'<i class="fa fa-step-backward first"></i>&nbsp;' +
+			'<i class="fa fa-backward prev"></i>' +
+			'<span class="pagedisplay"></span>' +
+			'<i class="fa fa-forward next"></i>&nbsp;' +
+			'<i class="fa fa-step-forward last"></i>' +
+			'</form>' +
+			'</div>';
+
+		var rowcount = $("#" + tableid + " tbody tr").length;
+
+		//not show pager if only one table page
+		if (rowcount > size)
+		{
+			var table = $("#" + tableid);
+			table.after(html);
+
+			table.tablesorterPager(
+				{
+					container: $("#" + pagerid),
+					size: size,
+					cssDisabled: 'disabled',
+					savePages: false,
+					output: '{startRow} – {endRow} / {totalRows} Zeilen'
+				}
+			);
+		}
 	}
-}
+};

rdf/diplomasupplement.xml.php

@@ -344,7 +344,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			}
 		}
 
-		$qry = "SELECT von, bis FROM bis.tbl_bisio WHERE student_uid=".$db->db_add_param($uid_arr[$i]);
+		$qry = "SELECT von, bis, lehreinheit_id FROM bis.tbl_bisio WHERE student_uid=".$db->db_add_param($uid_arr[$i]);
 		if($db->db_query($qry))
 		{
 			if($db->db_num_rows()>0)
@@ -534,31 +534,6 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		echo "  <gradePrevLastYearNb>".sprintf("%01.1f",($noteArrayPrev[7]/$noten_anzahl*100))."</gradePrevLastYearNb>";
 		echo "  <gradePrevLastYearEa>".sprintf("%01.1f",($noteArrayPrev[12]/$noten_anzahl*100))."</gradePrevLastYearEa>";
 
-		//Projektarbeiten
-		$qry_projektarbeit = "
-		SELECT
-			lehrveranstaltung_id, titel, themenbereich, note, titel_english
-		FROM
-			lehre.tbl_projektarbeit
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			student_uid=".$db->db_add_param($uid_arr[$i])."
-			AND projekttyp_kurzbz in('Bachelor', 'Diplom')
-		ORDER BY beginn ASC, projektarbeit_id ASC;";
-
-		$projektarbeit = array();
-
-		if($result_projektarbeit = $db->db_query($qry_projektarbeit))
-		{
-			while($row_projektarbeit = $db->db_fetch_object($result_projektarbeit))
-			{
-				$projektarbeit[$row_projektarbeit->lehrveranstaltung_id]['titel']=$row_projektarbeit->titel;
-				$projektarbeit[$row_projektarbeit->lehrveranstaltung_id]['titel_en']=$row_projektarbeit->titel_english;
-				$projektarbeit[$row_projektarbeit->lehrveranstaltung_id]['themenbereich']=$row_projektarbeit->themenbereich;
-				$projektarbeit[$row_projektarbeit->lehrveranstaltung_id]['note']=$row_projektarbeit->note;
-			}
-		}
-
 		$ects_total = 0;
 
 		echo "<studiensemester>";
@@ -615,6 +590,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			echo "   <semesterKurzbz>Semester $start | $semester_kurzbz</semesterKurzbz>";
 
 			// alle lvs im semester holen
+			// Ohne LVs an denen ein Auslandssemester haengt. Diese werden spaeter separat geholt
 			$qry ="
 			SELECT
 				distinct(tbl_lehrveranstaltung.lehrveranstaltung_id),
@@ -631,6 +607,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				student_uid = ".$db->db_add_param($uid_arr[$i])."
 				AND zeugnis = true
 				AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")
+				AND NOT EXISTS(SELECT 1 FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+					WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+					AND student_uid=".$db->db_add_param($uid_arr[$i])."
+					AND tbl_lehreinheit.studiensemester_kurzbz in(".$sqlStudent->implode4SQL($aktuellesSemester)."))
 			ORDER BY sort, tbl_lehrveranstaltung.bezeichnung;";
 
 			$arrayLvAusbildungssemester= array();
@@ -774,6 +754,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					}
 
 					// Check ob an Lehrveranstaltung eine Thesis hängt
+					// Aber kein Auslandssemester war, sonst wirds spaeter hinzugefügt
 					$qry = "
 						SELECT
 							lehrveranstaltung_id, titel, themenbereich, note, titel_english
@@ -784,6 +765,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 							student_uid=".$db->db_add_param($uid_arr[$i])."
 							AND projekttyp_kurzbz in('Bachelor', 'Diplom')
 							AND lehrveranstaltung_id=".$db->db_add_param($row_stud->lehrveranstaltung_id)."
+							AND NOT EXISTS(SELECT 1
+								FROM bis.tbl_bisio
+								JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+								WHERE lehrveranstaltung_id=".$db->db_add_param($row_stud->lehrveranstaltung_id)."
+								AND student_uid=".$db->db_add_param($uid_arr[$i]).")
 						ORDER BY beginn DESC, projektarbeit_id DESC LIMIT 1;";
 
 					if($result_thesis = $db->db_query($qry))
@@ -836,7 +822,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				$qry_outgoing = "
 					SELECT
 						studiensemester_kurzbz, ort, ects, semesterstunden, von, bis,
-						universitaet, lehrveranstaltung_id, tbl_lehrveranstaltung.sws
+						universitaet, lehrveranstaltung_id, tbl_lehrveranstaltung.sws,
+						(SELECT titel_english FROM lehre.tbl_projektarbeit
+						WHERE lehreinheit_id=tbl_bisio.lehreinheit_id
+						AND student_uid = ".$db->db_add_param($uid_arr[$i])." limit 1) as projektarbeitstitel
 					FROM
 						bis.tbl_bisio
 						JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
@@ -905,6 +894,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 									break;
 							}
 
+							if($row_outgoing->projektarbeitstitel != '')
+							{
+								$projektarbeitszusatz = 'Thesis: "'.$row_outgoing->projektarbeitstitel.'"';
+							}
+							else
+								$projektarbeitszusatz = '';
+
 							echo '<lv>
 								<lehrform_kurzbz></lehrform_kurzbz>
 								<benotungsdatum>'.$benotungsdatum_outgoing.'</benotungsdatum>
@@ -914,7 +910,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 								<kurzbz>'.$lehrform_kurzbz_outgoing.'</kurzbz>
 								<stsem></stsem>
 								<bezeichnung><![CDATA[]]></bezeichnung>
-								<bezeichnung_englisch><![CDATA[International Semester Abroad: '.$datum_von.'-'.$datum_bis.', at '.$row_outgoing->ort.', '.$row_outgoing->universitaet.'. All credits earned during the International Semester Abroad (ISA) are fully credited for the '.$start.$auslandssemester_start.' semester at the UAS Technikum Wien.]]></bezeichnung_englisch>
+								<bezeichnung_englisch><![CDATA[International Semester Abroad: '.$datum_von.'-'.$datum_bis.', at '.$row_outgoing->ort.', '.$row_outgoing->universitaet.'. All credits earned during the International Semester Abroad (ISA) are fully credited for the '.$start.$auslandssemester_start.' semester at the UAS Technikum Wien.'.$projektarbeitszusatz.']]></bezeichnung_englisch>
 								<ects>'.$row_outgoing->ects.'</ects>
 								<semesterstunden>'.$row_outgoing->semesterstunden.'</semesterstunden>
 								<note>'.$note_outgoing.'</note>

system/services/systemd/phantomjs@.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart=/usr/bin/phantomjs /home/%i/highcharts/highcharts-convert.js -host 10.127.0.197 -port 3003
 KillMode=process
-Restart=on-failure on-abort
+Restart=always
 User=%i
 Group=%i
 

system/services/systemd/unoconv@.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart=/usr/bin/unoconv -l
 KillMode=mixed
-Restart=on-failure on-abort
+Restart=always
 User=%i
 Group=%i