From bdf03efa353fe37863207011dc00711ca36ddfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 11 May 2018 15:01:10 +0200
Subject: [PATCH 01/15] Added Config Subfolder Production and Testing to ignore
 List

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index de95987a8..c6bc2ccc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ documents/
 .project
 .buildpath
 application/config/development/
+application/config/testing/
+application/config/production
 application/extensions/
 application/controllers/extensions/
 application/config/extensions/

From 84ba892dc185fae400e0471843a9a25f4f12654c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 11 May 2018 15:01:40 +0200
Subject: [PATCH 02/15] Added missing Permission to infocenter role

---
 application/config/roles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/roles.php b/application/config/roles.php
index a95a94215..75a928db0 100644
--- a/application/config/roles.php
+++ b/application/config/roles.php
@@ -56,7 +56,7 @@ $config['roles'] = array
 			'basis/adresse','basis/akte','basis/kontakt','basis/log','basis/nation','basis/notiz','basis/notizzuordnung',
 			'basis/person','basis/prestudent','basis/prestudentstatus','basis/status','basis/zgv','basis/zgvmaster',
 			'lehre/studienplan','system/filters','fs/dms','basis/message','basis/benutzerrolle', 'basis/sprache',
-			'system/personlock','basis/benutzerfunktion','system/vorlagestudiengang'
+			'system/personlock','basis/benutzerfunktion','system/vorlagestudiengang', 'basis/bewerbungstermine'
 		)
 	)
 );

From 257c833d45c450a404087bb4549ce48678c9ba20 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Fri, 11 May 2018 15:43:39 +0200
Subject: [PATCH 03/15] 'Interessent rejected' ignored in list

---
 application/views/system/infocenter/infocenterData.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 2d9d30cf2..8abc163b7 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -14,7 +14,7 @@
 					SELECT zeitpunkt
 					FROM system.tbl_log
 					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
-					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
+					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\', \'Interessent rejected\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1
@@ -23,7 +23,7 @@
 					SELECT insertvon
 					FROM system.tbl_log
 					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
-					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
+					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\', \'Interessent rejected\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1

From 7e1ddbf6341332ccbdc730325d5a89fd08a956c3 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 11 May 2018 16:53:54 +0200
Subject: [PATCH 04/15] PrestudentID-Spalte nach Studienplan-Spalte sortiert

---
 content/student/studentenoverlay.xul.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 8f311784d..a9de22360 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -288,10 +288,6 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-	    				<treecol id="student-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="false" persist="hidden, width, ordinal"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" onclick="StudentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-person_id" label="PersonID" flex="1" hidden="false" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#person_id" onclick="StudentTreeSort()"/>
@@ -379,7 +375,11 @@ else
 						<treecol id="student-treecol-studienplan" label="Studienplan" flex="1" hidden="false" persist="hidden, width, ordinal"
 						class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" onclick="StudentTreeSort()"/>
-					<splitter class="tree-splitter"/>
+						<splitter class="tree-splitter"/>
+						<treecol id="student-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="false" persist="hidden, width, ordinal"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" onclick="StudentTreeSort()"/>
+	    				<splitter class="tree-splitter"/>
 						<treecol id="student-treecol-mentor" label="Mentor" flex="1" hidden="true" persist="hidden, width, ordinal"
 						class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#mentor" onclick="StudentTreeSort()"/>
@@ -414,7 +414,6 @@ else
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#studiengang" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
-	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#person_id" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#status" />
 										<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#status_datum" />
@@ -439,6 +438,7 @@ else
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
 									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
 									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />
+									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" />
 									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#mentor" />
 									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#aktiv" />
 									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum_iso" />

From 3a9882d0343a759ba00a4f37d1e57ffea9a03fe9 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 11 May 2018 16:54:49 +0200
Subject: [PATCH 05/15] BugFix in Funktion getStudiengaengeDokument

---
 include/dokument.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dokument.class.php b/include/dokument.class.php
index e7eb50b05..361599382 100644
--- a/include/dokument.class.php
+++ b/include/dokument.class.php
@@ -832,9 +832,9 @@ class dokument extends basis_db
 
 		if($result = $this->db_query($qry))
 		{
+			$stg_obj = new basis_db();
 			while($row = $this->db_fetch_object($result))
 			{
-				$stg_obj = new basis_db();
 				$stg_obj->kuerzel = $row->kuerzel;
 				$stg_obj->bezeichnung = $row->bezeichnung;
 				$stg_obj->studiengang_kz = $row->studiengang_kz;

From 7af995dbe51cd407ec8d6a955c408df22d9246c8 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 11 May 2018 16:55:23 +0200
Subject: [PATCH 06/15] Added Function "deleteParked" to personlog.class

---
 include/personlog.class.php | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/include/personlog.class.php b/include/personlog.class.php
index 1c008971c..55e69c90a 100644
--- a/include/personlog.class.php
+++ b/include/personlog.class.php
@@ -45,13 +45,13 @@ class personlog extends basis_db
 
 	/**
 	 * Erstellt einen Log Eintrag zu einer Person
-	 * @param $person_id ID der Person.
-	 * @param $logtype_kurzbz Typ des Logeintrages
-	 * @param $logdata Array mit den zusaetzlichen Logdaten zu diesem Typ.
-	 * @param $taetigkeit_kurzbz Kurzbz der Verarbeitungstaetigkeit.
-	 * @param $app Applikation von der dieser Logeintrag stammt.
-	 * @param $oe_kurzbz Kurzbz der Organisationseinheit. (optional)
-	 * @param $user User der die Aktion durchgefuehrt hat. (optional)
+	 * @param integer $person_id ID der Person.
+	 * @param string $logtype_kurzbz Typ des Logeintrages
+	 * @param array $logdata Array mit den zusaetzlichen Logdaten zu diesem Typ.
+	 * @param string $taetigkeit_kurzbz Kurzbz der Verarbeitungstaetigkeit.
+	 * @param string $app Applikation von der dieser Logeintrag stammt.
+	 * @param string $oe_kurzbz Kurzbz der Organisationseinheit. (optional)
+	 * @param string $user User der die Aktion durchgefuehrt hat. (optional)
 	 * @return boolean true wenn erfolgreich, false im Fehlerfall.
 	 */
 	public function log($person_id, $logtype_kurzbz, $logdata, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
@@ -77,5 +77,25 @@ class personlog extends basis_db
 			return false;
 		}
 	}
+	
+	/**
+	 * Löscht alle Logeinträge vom Typ "Parked" der übergebenen Person_id die in der Zukunft liegen.
+	 * @param integer $person_id ID der Person, deren geparkter Logeintrag gelöscht werden soll.
+	 * @return boolean true wenn erfolgreich, false im Fehlerfall.
+	 */
+	public function deleteParked($person_id)
+	{
+		$qry = "DELETE FROM system.tbl_log WHERE logtype_kurzbz='Parked' AND person_id=".$this->db_add_param($person_id)." AND zeitpunkt>=now();";
+			
+			if($this->db_query($qry))
+			{
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Löschen des geparkten Logeintrages';
+				return false;
+			}
+	}
 }
 ?>

From 6d4b2f5629b8f82e126777ae57e411419a7b50e1 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 11 May 2018 16:59:09 +0200
Subject: [PATCH 07/15] BugFix in system_check_sql.php

---
 .gitignore                  |  1 +
 system/system_check_sql.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index de95987a8..ad2a96efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/unit.suite.yml
 /sparks/*
 /webdav/google.php
+system/sql/
diff --git a/system/system_check_sql.php b/system/system_check_sql.php
index 423d81d97..e45d73d0b 100644
--- a/system/system_check_sql.php
+++ b/system/system_check_sql.php
@@ -94,6 +94,7 @@ if (($files = glob($slq_import_path.'/*.sql')) != false)
 		{
 			$mailcontent .= '<h3>Die Abfrage der Datei "'.$filename.'" hat folgenden Fehler geliefert:</h3>';
 			$mailcontent .= '<span class="error">'.$db->db_last_error () . '</span><br>';
+			$mailcontent .= '<pre>'.$sql.'</pre><br>';
 			continue;
 		}
 		
@@ -101,18 +102,22 @@ if (($files = glob($slq_import_path.'/*.sql')) != false)
 		if ($db->db_num_rows($result) > 0)
 		{
 			$mailcontent .= '<h3>Die Abfrage der Datei "'.$filename.'" hat folgendes Ergebnis geliefert:</h3>';
+
 			// Wenn zu viele Datensätze retourniert werden, abbrechen und Meldung ausgeben
 			if ($db->db_num_rows($result) > 1000)
 				$mailcontent .= '<span class="error">ACHTUNG! Es wurden mehr als 1000 Datensätze zurückgegeben</span><br>';
 			
 			$mailcontent .= '<table class="table"><thead><tr>';
-			foreach($db->db_fetch_object($result) AS $key => $value)
+			$array = array();
+			$object = $db->db_fetch_object($result);
+			$row_array = get_object_vars($object);
+			foreach($row_array AS $key => $value)
 			{
 				$mailcontent .= '<th>'.$key.'</th>';
-				continue;
 			}
 			$mailcontent .= '</tr></thead><tbody>';
 			$counter = 0; // Wenn mehr als 1000 Datensätze retourniert werden, abbrechen
+			$result = $db->db_query ($sql);
 			while($row = $db->db_fetch_object($result))
 			{
 				if ($counter == 1000)
@@ -126,7 +131,7 @@ if (($files = glob($slq_import_path.'/*.sql')) != false)
 				$mailcontent .= '</tr>';
 				$counter++;
 			}
-			$mailcontent .= '</tr></tbody></table>';
+			$mailcontent .= '</tbody></table>';
 		}
 	}
 }

From 4aa0f81278d35407be12e87715814b1cd5dfa8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 14 May 2018 14:05:11 +0200
Subject: [PATCH 08/15] Document Conversion Bugfix

---
 application/libraries/DocumentLib.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
index 204b1d30f..6def51ab5 100644
--- a/application/libraries/DocumentLib.php
+++ b/application/libraries/DocumentLib.php
@@ -57,8 +57,15 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				$this->convert($filename, $outFile, 'pdf');
-				return success($outFile);
+				$ret = $this->convert($filename, $outFile, 'pdf');
+				if(isSuccess($ret))
+				{
+					return success($outFile);
+				}
+				else
+				{
+					return $ret;
+				}
 			case 'application/pdf':
 				return success($filename);
 			default:

From f7196a7c6089a81ba21a00def219aa84c52dd975 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Tue, 15 May 2018 13:52:31 +0200
Subject: [PATCH 09/15] =?UTF-8?q?Funktion=20deleteParked=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Logtype ist nun "Processstate"
- json-name ist "parked"
---
 include/personlog.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/personlog.class.php b/include/personlog.class.php
index 55e69c90a..5eb75512b 100644
--- a/include/personlog.class.php
+++ b/include/personlog.class.php
@@ -79,13 +79,18 @@ class personlog extends basis_db
 	}
 	
 	/**
-	 * Löscht alle Logeinträge vom Typ "Parked" der übergebenen Person_id die in der Zukunft liegen.
+	 * Löscht alle Logeinträge vom Typ "Precessstate" mit Namen "Parked" der übergebenen Person_id, die in der Zukunft liegen.
 	 * @param integer $person_id ID der Person, deren geparkter Logeintrag gelöscht werden soll.
 	 * @return boolean true wenn erfolgreich, false im Fehlerfall.
 	 */
 	public function deleteParked($person_id)
 	{
-		$qry = "DELETE FROM system.tbl_log WHERE logtype_kurzbz='Parked' AND person_id=".$this->db_add_param($person_id)." AND zeitpunkt>=now();";
+		$qry = "DELETE
+				FROM system.tbl_log
+				WHERE logtype_kurzbz = 'Processstate'
+					AND person_id = ".$this->db_add_param($person_id)."
+					AND logdata ->> 'name' = 'Parked'
+					AND zeitpunkt >= now();";
 			
 			if($this->db_query($qry))
 			{

From 5a10eada1da56d4b7d8d56647ee960ef87de211b Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Tue, 15 May 2018 13:53:23 +0200
Subject: [PATCH 10/15] Studiengang_edit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nur berechtigte Studiengänge im DropDown
---
 vilesci/stammdaten/studiengang_edit.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/vilesci/stammdaten/studiengang_edit.php b/vilesci/stammdaten/studiengang_edit.php
index 658d9d300..308c65899 100644
--- a/vilesci/stammdaten/studiengang_edit.php
+++ b/vilesci/stammdaten/studiengang_edit.php
@@ -49,7 +49,7 @@ $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($user);
 
 if(!$rechte->isBerechtigt('assistenz'))
-	die('Sie haben keine Berechtigung fuer diese Seite');
+	die($rechte->errormsg);
 
 if(isset($_GET['studiengang_kz']))
 	$stg_kz = $_GET['studiengang_kz'];
@@ -62,7 +62,7 @@ if(isset($_GET['action']) && $_GET['action']=='save')
 	$studiengang = new studiengang();
 	$studiengang->load($studiengang_kz);
 	if(!$rechte->isBerechtigt('assistenz', $studiengang->oe_kurzbz, 'suid'))
-		die('Sie haben keine Berechtigung fuer diese Seite');
+		die($rechte->errormsg);
 
 	$bezeichnung = $_POST['bezeichnung'];
 	$english = $_POST['english'];
@@ -127,15 +127,18 @@ echo '<form method="GET">
 Studiengang: <SELECT name="studiengang_kz">';
 foreach($stg->result as $row)
 {
-	if($stg_kz=='')
-		$stg_kz=$row->studiengang_kz;
-
-	if($stg_kz==$row->studiengang_kz)
-		$selected='selected';
-	else
-		$selected='';
-
-	echo '<OPTION value="'.$row->studiengang_kz.'" '.$selected.'>'.$row->kuerzel.' - '.$row->kurzbzlang.'</OPTION>';
+	if (in_array($row->studiengang_kz, $stg_arr))
+	{
+		if($stg_kz=='')
+			$stg_kz=$row->studiengang_kz;
+	
+		if($stg_kz==$row->studiengang_kz)
+			$selected='selected';
+		else
+			$selected='';
+	
+		echo '<OPTION value="'.$row->studiengang_kz.'" '.$selected.'>'.$row->kuerzel.' - '.$row->bezeichnung.'</OPTION>';
+	}
 }
 echo '</SELECT><input type="submit" value="Anzeigen" /></form>';
 

From 37650f4d30e1651196648e054020d8eb8b01b701 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Tue, 15 May 2018 16:30:47 +0200
Subject: [PATCH 11/15] BugFix Function getStudiengaengeDokument

Added db_num_rows before while-loop
---
 include/dokument.class.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/dokument.class.php b/include/dokument.class.php
index 361599382..d4356be85 100644
--- a/include/dokument.class.php
+++ b/include/dokument.class.php
@@ -832,16 +832,21 @@ class dokument extends basis_db
 
 		if($result = $this->db_query($qry))
 		{
-			$stg_obj = new basis_db();
-			while($row = $this->db_fetch_object($result))
+			if ($this->db_num_rows($result) > 0)
 			{
-				$stg_obj->kuerzel = $row->kuerzel;
-				$stg_obj->bezeichnung = $row->bezeichnung;
-				$stg_obj->studiengang_kz = $row->studiengang_kz;
-
-				$this->result[] = $stg_obj;
+				while($row = $this->db_fetch_object($result))
+				{
+					$stg_obj = new basis_db();
+					$stg_obj->kuerzel = $row->kuerzel;
+					$stg_obj->bezeichnung = $row->bezeichnung;
+					$stg_obj->studiengang_kz = $row->studiengang_kz;
+	
+					$this->result[] = $stg_obj;
+				}
+				return $stg_obj;
 			}
-			return $stg_obj;
+			else 
+				return false;
 		}
 		else
 		{

From 6f57c46cc34b621d9c2639722cc563ba71b2a4af Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Tue, 15 May 2018 17:15:03 +0200
Subject: [PATCH 12/15] =?UTF-8?q?bei=20Anzeige=20der=20vergebenen=20Lehrau?=
 =?UTF-8?q?ftr=C3=A4ge=20werden=20Lehrg=C3=A4nge=20exkludiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/zeitaufzeichnung.class.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/zeitaufzeichnung.class.php b/include/zeitaufzeichnung.class.php
index 422cde18c..07c87cf50 100755
--- a/include/zeitaufzeichnung.class.php
+++ b/include/zeitaufzeichnung.class.php
@@ -634,24 +634,37 @@ or not exists
 			FROM
 				lehre.tbl_lehreinheitmitarbeiter m,
 				lehre.tbl_lehreinheit l
+			JOIN
+				lehre.tbl_lehrveranstaltung lv using (lehrveranstaltung_id)
+			JOIN
+				public.tbl_studiengang s using (studiengang_kz)
 			WHERE
 				$where AND
 				$where_sem AND
 				l.lehreinheit_id = m.lehreinheit_id AND
-				m.stundensatz * m.semesterstunden > 0
+				m.stundensatz * m.semesterstunden > 0 AND
+				s.typ not in ('l') AND
+				lv.studiengang_kz > 0
 			UNION
 			SELECT sum(pb.stunden) AS semstunden
 			FROM
 				lehre.tbl_projektarbeit pa,
 				lehre.tbl_projektbetreuer pb,
-				lehre.tbl_lehreinheit l,
-				public.tbl_benutzer b
+				public.tbl_benutzer b,
+				lehre.tbl_lehreinheit l
+			JOIN
+				lehre.tbl_lehrveranstaltung lv using (lehrveranstaltung_id)
+			JOIN
+				public.tbl_studiengang s using (studiengang_kz)
+
 			WHERE
 				pa.lehreinheit_id = l.lehreinheit_id AND
 				pb.projektarbeit_id = pa.projektarbeit_id AND
 				pb.person_id = b.person_id AND
 				b.uid = ".$this->db_add_param($user)." AND
 				pb.stunden * pb.stundensatz > 0 AND
+				s.typ not in ('l') AND
+				lv.studiengang_kz > 0 AND
 				$where_sem
 		) AS semstunden
 		";

From a075cc26b379e388e25f18e7c7eb0e40805711b4 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 15 May 2018 18:33:01 +0200
Subject: [PATCH 13/15] - Removed place holders where not needed - Added
 public/js/AjaxLib.js to perform Ajax calls via JS - Added
 public/css/AjaxLib.css to configure the veil used in AjaxLib via CSS - Added
 public/images/loader.gif to be used with the veil in AjaxLib - Added to
 FHC-Header the possibility to include the AjaxLib (ajaxlib = true)

---
 application/views/templates/FHC-Header.php |  27 +-
 public/css/.placeholder                    |   0
 public/css/AjaxLib.css                     |  14 +
 public/images/.placeholder                 |   0
 public/images/loader.gif                   | Bin 0 -> 17490 bytes
 public/js/AjaxLib.js                       | 449 +++++++++++++++++++++
 public/js/bootstrapper.js                  |  10 +-
 7 files changed, 484 insertions(+), 16 deletions(-)
 delete mode 100644 public/css/.placeholder
 create mode 100644 public/css/AjaxLib.css
 delete mode 100644 public/images/.placeholder
 create mode 100644 public/images/loader.gif
 create mode 100644 public/js/AjaxLib.js

diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 52ed50dbd..853eb8de7 100755
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -2,7 +2,7 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-// Retrives the URL path of the called controller + controller method
+// Retrives the URL path of the called controller + called controller method
 // NOTE: placed here because it doesn't work inside functions
 $calledPath = $this->router->directory.$this->router->class;
 $calledMethod = $this->router->method;
@@ -15,6 +15,7 @@ $customJSs = isset($customJSs) ? $customJSs : null;
 // By default set the parameters to false
 $jquery = isset($jquery) ? $jquery : false;
 $jqueryui = isset($jqueryui) ? $jqueryui : false;
+$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
 $bootstrap = isset($bootstrap) ? $bootstrap : false;
 $fontawesome = isset($fontawesome) ? $fontawesome : false;
 $tablesorter = isset($tablesorter) ? $tablesorter : false;
@@ -141,12 +142,15 @@ function _generateAddonsJSsInclude($calledFrom)
 			// jQuery UI CSS
 			if ($jqueryui === true) _generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
 
-			// bootstrap CSS
+			// Bootstrap CSS
 			if ($bootstrap === true) _generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 
-			// font awesome CSS
+			// Font Awesome CSS
 			if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
 
+			// AjaxLib CSS
+			if ($ajaxlib === true) _generateCSSsInclude('public/css/AjaxLib.css');
+
 			// Table sorter CSS
 			if ($tablesorter === true)
 			{
@@ -154,7 +158,7 @@ function _generateAddonsJSsInclude($calledFrom)
 				_generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
 			}
 
-			// sb admin template CSS
+			// SB Admin 2 template CSS
 			if ($sbadmintemplate === true)
 			{
 				_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
@@ -164,10 +168,11 @@ function _generateAddonsJSsInclude($calledFrom)
 			// Eventually required CSS
 			_generateCSSsInclude($customCSSs); // Eventually required CSS
 
+
 			// --------------------------------------------------------------------------------------------------------
 			// Javascripts
 
-			// Generates the global object to pass useful parms to the other javascripts
+			// Generates the global object to pass useful parameters to other javascripts
 			// NOTE: must be called before any other JS include
 			_generateJSDataStorageObject($calledPath, $calledMethod);
 
@@ -178,11 +183,13 @@ function _generateAddonsJSsInclude($calledFrom)
 			if ($jqueryui === true)
 			{
 				_generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
-				//datepicker german language file
-				_generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js');
+				_generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file
 			}
 
-			// bootstrap JS
+			// AjaxLib JS
+			if ($ajaxlib === true) _generateJSsInclude('public/js/AjaxLib.js');
+
+			// Bootstrap JS
 			if ($bootstrap === true) _generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
 
 			// Table sorter JS
@@ -193,10 +200,10 @@ function _generateAddonsJSsInclude($calledFrom)
 				_generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
 			}
 
-			//tinymce JS
+			// Tinymce JS
 			if($tinymce === true) _generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js') ;
 
-			// sb admin template JS
+			// SB Admin 2 template JS
 			if ($sbadmintemplate === true)
 			{
 				_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
diff --git a/public/css/.placeholder b/public/css/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/public/css/AjaxLib.css b/public/css/AjaxLib.css
new file mode 100644
index 000000000..d80ab95a6
--- /dev/null
+++ b/public/css/AjaxLib.css
@@ -0,0 +1,14 @@
+.veil {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 98%;
+	width: 99%;
+	background-color: white;
+	border-width: 1px;
+	border-style: solid;
+	border-color: black;
+	background-image: url("/public/imgages/loader.gif");
+	background-repeat: no-repeat;
+	background-position: center;
+}
diff --git a/public/images/.placeholder b/public/images/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/public/images/loader.gif b/public/images/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a718bd89be7fe9716a503b979ee99eb59c2e49cb
GIT binary patch
literal 17490
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

literal 0
HcmV?d00001

diff --git a/public/js/AjaxLib.js b/public/js/AjaxLib.js
new file mode 100644
index 000000000..2ee8d458e
--- /dev/null
+++ b/public/js/AjaxLib.js
@@ -0,0 +1,449 @@
+/**
+ * FH-Complete
+ *
+ * @package
+ * @author
+ * @copyright   Copyright (c) 2016 fhcomplete.org
+ * @license GPLv3
+ * @link    https://fhcomplete.org
+ * @since	Version 1.0.0
+ */
+
+//--------------------------------------------------------------------------------------------------------------------
+// Configs
+
+// To see debug messages into the browser console set this parameter as true
+const DEBUG = false;
+
+// Default veil timeout (milliseconds)
+const VEIL_TIMEOUT = 1000;
+
+//--------------------------------------------------------------------------------------------------------------------
+// Constants
+
+// Success
+const SUCCESS = 0;
+
+// Properties present in a response
+const CODE = "error";
+const RESPONSE = "retval";
+
+// HTTP method parameters
+const HTTP_GET_METHOD = "GET";
+const HTTP_POST_METHOD = "POST";
+
+const REMOTE_CONTROLLER = "remoteController";
+
+const FHC_CONTROLLER_ID = "fhc_controller_id";
+
+/**
+ * Definition and initialization of object FHC_Ajax_Client
+ */
+var FHC_Ajax_Client = {
+	//------------------------------------------------------------------------------------------------------------------
+	// Properties
+
+	_veilCallersCounter: 0, // count the number of callers that want to activate the veil
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Performs a call using the HTTP GET method
+	 * controllerParameters is an object
+	 * ajaxCallParameters is an object
+	 */
+	ajaxCallGet: function(remoteController, controllerParameters, ajaxCallParameters) {
+	    FHC_Ajax_Client._ajaxCall(remoteController, controllerParameters, HTTP_GET_METHOD, ajaxCallParameters);
+	},
+
+	/**
+	 * Performs a call using the HTTP POST method
+	 * controllerParameters is an object
+	 * ajaxCallParameters is an object
+	 */
+	ajaxCallPost: function(remoteController, controllerParameters, ajaxCallParameters) {
+	    FHC_Ajax_Client._ajaxCall(remoteController, controllerParameters, HTTP_POST_METHOD, ajaxCallParameters);
+	},
+
+	/**
+	 * Checks if the response is a success
+	 */
+	isSuccess: function(response) {
+		var isSuccess = false;
+
+	    if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE) && response.hasOwnProperty(RESPONSE))
+	    {
+	        if (response.error == SUCCESS)
+	        {
+	            isSuccess = true;
+	        }
+	    }
+
+		return isSuccess;
+	},
+
+	/**
+	 * Checks if the response is an error
+	 */
+	isError: function(response) {
+		return !FHC_Ajax_Client.isSuccess(response);
+	},
+
+	/**
+	 * Checks if the response has data
+	 */
+	hasData: function(response) {
+		var hasData = false;
+
+	    if (FHC_Ajax_Client.isSuccess(response))
+	    {
+			if ((jQuery.type(response.retval) == "object" && !jQuery.isEmptyObject(response.retval))
+				|| (jQuery.isArray(response.retval) && response.retval.length > 0)
+				|| (jQuery.type(response.retval) == "string" && response.retval.trim() != "")
+				|| jQuery.type(response.retval) == "number")
+			{
+				hasData = true;
+			}
+	    }
+
+		return hasData;
+	},
+
+	/**
+	 * Retrives data from response object
+	 */
+	getData: function(response) {
+		var data = null;
+
+	    if (FHC_Ajax_Client.hasData(response))
+	    {
+			data = response.retval;
+	    }
+
+		return data;
+	},
+
+	/**
+	 * Retrives code from response object
+	 */
+	getCode: function(response) {
+		var code = 1; // Generic error
+
+		if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE))
+	    {
+	        if (response.error == SUCCESS)
+	        {
+	            isSuccess = true;
+	        }
+	    }
+
+		return code;
+	},
+
+	/**
+	 * Show a veil
+	 */
+	showVeil: function(veilTimeout) {
+		if (typeof veilTimeout == "number")
+		{
+			FHC_Ajax_Client._veilTimeout = veilTimeout;
+		}
+		else
+		{
+			FHC_Ajax_Client._veilTimeout = VEIL_TIMEOUT;
+		}
+		FHC_Ajax_Client._showVeil();
+	},
+
+	/**
+	 * Hide a veil that was shown before
+	 */
+	hideVeil: function() {
+		FHC_Ajax_Client._hideVeil();
+	},
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Generate the router URI using the connection parameters
+	 */
+	_generateRouterURI: function(remoteController) {
+		var uri = null;
+
+		// Checks if global JS object FHC_JS_DATA_STORAGE_OBJECT exists
+		if (typeof FHC_JS_DATA_STORAGE_OBJECT !== "undefined")
+		{
+			uri = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/" + remoteController;
+		}
+
+		return uri;
+	},
+
+	/**
+	 * Method to print debug info after a controller has been called
+	 */
+	_printDebug: function(parameters, response, errorThrown) {
+
+		if (DEBUG === true) // If global const DEBUG is true, but really true!
+		{
+			// Print info about called controller
+			console.log("Called controller: " + parameters.remoteController);
+			console.log("Call parameters:"); // parameters given to this call
+			console.log(parameters);
+
+			if (response != null) // if there is a response...
+			{
+				console.log("Controller Response:");
+				console.log(response); // ...print it
+			}
+			if (errorThrown != null) // if there is a jQuery error...
+			{
+				console.log("jQuery error:");
+				console.log(errorThrown); // ...print it
+			}
+			console.log("--------------------------------------------------------------------------------------------");
+		}
+	},
+
+	/**
+	 * Method to call if the ajax call has succeeded
+	 */
+	_onSuccess: function(response, textStatus, jqXHR) {
+
+		FHC_Ajax_Client._printDebug(this._data, response); // debug time!
+
+		// Call the success callback saved in _successCallback property
+		// NOTE: this is not referred to FHC_Ajax_Client but to the ajax object
+		this._successCallback(response);
+	},
+
+	/**
+	 * Method to call if the ajax call has raised an error
+	 */
+	_onError: function(jqXHR, textStatus, errorThrown) {
+
+		FHC_Ajax_Client._printDebug(this._data, null, errorThrown); // debug time!
+
+		 // Call the error callback saved in _errorCallback property
+		 // NOTE: this is not referred to FHC_Ajax_Client but to the ajax object
+	    this._errorCallback(jqXHR, textStatus, errorThrown);
+	},
+
+	/**
+	 * Instantiate a new object and copy in it the properties from the parameter
+	 */
+	_cpObjProps: function(obj) {
+	    var returnObj = {};
+
+	    for (var prop in obj)
+	    {
+	        returnObj[prop] = obj[prop];
+	    }
+
+	    return returnObj;
+	},
+
+	/**
+	 * Method to show the veil
+	 */
+	_showVeil: function() {
+		if (FHC_Ajax_Client._veilCallersCounter == 0)
+		{
+			$("<div class=\"veil\"></div>").appendTo('body');
+		}
+
+		FHC_Ajax_Client._veilCallersCounter++;
+	},
+
+	/**
+	 * Method to hide the veil
+	 */
+	_hideVeil: function() {
+		window.setTimeout(function() {
+			if (FHC_Ajax_Client._veilCallersCounter >= 0)
+			{
+				if (FHC_Ajax_Client._veilCallersCounter > 0)
+				{
+					FHC_Ajax_Client._veilCallersCounter--;
+				}
+
+				if (FHC_Ajax_Client._veilCallersCounter == 0)
+				{
+					$(".veil").remove();
+				}
+			}
+		},
+		this._veilTimeout);
+	},
+
+	/**
+	 * Retrives parameters from URL query string (HTTP GET parameters)
+	 */
+	_getUrlParameter: function(sParam) {
+	    var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+	        sURLVariables = sPageURL.split('&'),
+	        sParameterName,
+	        i;
+
+	    for (i = 0; i < sURLVariables.length; i++)
+		{
+	        sParameterName = sURLVariables[i].split('=');
+
+	        if (sParameterName[0] === sParam)
+			{
+	            return sParameterName[1];
+	        }
+	    }
+	},
+
+	/**
+	 * Checks call parameters, if they are present and are valid
+	 * It generates and returns all the parameters needed to perform an ajax remote call
+	 * NOTE: console.error is used here because those are not messages for the final user,
+	 *		but for the web interface developer
+	 */
+	_checkAndGenerateAjaxParams: function(remoteController, controllerParameters, type, ajaxCallParameters) {
+
+	    var valid = true; // by default they are ok (we want to trust you, please do not betray it)
+
+		// Returned parameters
+		var ajaxParameters = {
+			cache: false, // data are never cached by the browser
+			dataType: "json", // always json!
+			type: type // set HTTP method, GET or POST
+		};
+
+		// remoteController must be a NON-empty string
+	    if (typeof remoteController == "string" && remoteController.trim() != "")
+	    {
+			// Is it possible to generate the URL
+			if ((url = FHC_Ajax_Client._generateRouterURI(remoteController)) != null)
+			{
+				ajaxParameters.url = url;
+			}
+			else // but it could fail
+			{
+				console.error("FHC_JS_DATA_STORAGE_OBJECT is not present");
+				valid = false;
+			}
+	    }
+		else // otherwise is NOT possible to generate the URL
+		{
+			console.error("Invalid remoteController parameter");
+	        valid = false;
+		}
+
+	    // controllerParameters must be an object
+	    if (typeof controllerParameters == "object")
+	    {
+			// Copy the properties of controllerParameters into a new object
+			var data = FHC_Ajax_Client._cpObjProps(controllerParameters);
+			// Remote controller
+			data[REMOTE_CONTROLLER] = remoteController;
+			// fhc_controller_id is given if present
+			data[FHC_CONTROLLER_ID] = FHC_Ajax_Client._getUrlParameter(FHC_CONTROLLER_ID);
+
+			// Stores them into ajaxParameters
+			// NOTE: property data is not possible to get later,
+			//		so the variable data is saved also in _data and it will be used later
+			ajaxParameters.data = data;
+			ajaxParameters._data = data;
+	    }
+		else
+		{
+			console.error("Invalid controller parameters, must be an object");
+			valid = false;
+		}
+
+
+		// Checks if ajaxCallParameters is an object
+	    if (typeof ajaxCallParameters == "object")
+	    {
+			// If present, errorCallback must be a function
+		    if (ajaxCallParameters.hasOwnProperty("errorCallback"))
+			{
+				if (typeof ajaxCallParameters.errorCallback == "function")
+				{
+					ajaxParameters._errorCallback = ajaxCallParameters.errorCallback; // save as property the callback error
+					ajaxParameters.error = FHC_Ajax_Client._onError; // function to call if an error occurred
+				}
+				else
+				{
+					console.error("Invalid errorCallback, it must be a function");
+					valid = false;
+				}
+		    }
+
+			// If present, successCallback must be a function
+		    if (ajaxCallParameters.hasOwnProperty("successCallback"))
+		    {
+				if (typeof ajaxCallParameters.successCallback == "function")
+				{
+					ajaxParameters._successCallback = ajaxCallParameters.successCallback; // save as property the callback success
+					ajaxParameters.success = FHC_Ajax_Client._onSuccess; // function to call if succeeded
+				}
+				else
+				{
+					console.error("Invalid successCallback, it must be a function");
+					valid = false;
+				}
+		    }
+
+			// If present, veilTimeout must be a number and cannot be less then 0 or greater then 60000
+		    if (ajaxCallParameters.hasOwnProperty("veilTimeout") && typeof ajaxCallParameters.veilTimeout == "number")
+		    {
+				if (ajaxCallParameters.veilTimeout > 0 && ajaxCallParameters.veilTimeout < 60000)
+				{
+					ajaxParameters._veilTimeout = ajaxCallParameters.veilTimeout;
+					ajaxParameters.beforeSend = FHC_Ajax_Client._showVeil;
+					ajaxParameters.complete = FHC_Ajax_Client._hideVeil;
+				}
+				else if(ajaxCallParameters.veilTimeout == 0)
+				{
+					// veil is disabled
+				}
+				else
+				{
+					console.error("Invalid veilTimeout parameter, must be a number >= 0 and <= 60000");
+					valid = false;
+				}
+		    }
+			else // is not present or the value is invalid
+			{
+				ajaxParameters._veilTimeout = VEIL_TIMEOUT;
+				ajaxParameters.beforeSend = FHC_Ajax_Client._showVeil;
+				ajaxParameters.complete = FHC_Ajax_Client._hideVeil;
+			}
+		}
+
+		if (valid === false)
+		{
+			ajaxParameters = null;
+		}
+
+	    return ajaxParameters;
+	},
+
+	/**
+	 * Performs a call to the server were the CI PHP layer is running
+	 * - remoteController: alias of the core controller to call
+	 * - controllerParameters: parameters to give to the called controller
+	 * - type: POST or GET HTTP method
+	 * - ajaxCallParameters is an object and could contains:
+	 *	- errorCallback: function to call after an error has been raised
+	 *	- successCallback: function to call after succeeded
+	 *	- veilTimeout: veil timeout
+	 */
+	_ajaxCall: function(remoteController, controllerParameters, type, ajaxCallParameters) {
+		// Retrives the parameters for the ajax call
+		var ajaxParameters = FHC_Ajax_Client._checkAndGenerateAjaxParams(remoteController, controllerParameters, type, ajaxCallParameters);
+
+		// Checks the given parameters if they are present and are valid
+	    if (ajaxParameters != null)
+	    {
+	        $.ajax(ajaxParameters); // ajax call
+	    }
+	}
+};
diff --git a/public/js/bootstrapper.js b/public/js/bootstrapper.js
index 8697e17ad..290749c11 100644
--- a/public/js/bootstrapper.js
+++ b/public/js/bootstrapper.js
@@ -1,10 +1,8 @@
-/*
-file for adding bootstrap classes, e.g. in case usage of non-bootstrap widgets in a bootstrap page
-AVOID USING THIS IF POSSIBLE
+/**
+ * To add bootstrap classes, e.g. in case usage of non-bootstrap widgets in a bootstrap page
+ * NOTE: avoid using this if possible
  */
-$(document).ready(
-	function()
-	{
+$(document).ready(function() {
 		$("input[type=text], select").addClass("form-control");
 		$("button, input[type=button]").addClass("btn btn-default");
 		$("table").addClass("table-condensed");

From 748ab6fac3205eebace69a0a433d6c13d9cd3bf2 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 15 May 2018 19:19:29 +0200
Subject: [PATCH 14/15] Unique ID for each call to a controller - Added
 constant FHC_CONTROLLER_ID to FHC_Controller - Added private property
 _controllerId to FHC_Controller - Added protected method setControllerId to
 FHC_Controller - Added protected method getControllerId to FHC_Controller

---
 application/core/FHC_Controller.php | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php
index f6f138441..815c03da2 100644
--- a/application/core/FHC_Controller.php
+++ b/application/core/FHC_Controller.php
@@ -4,6 +4,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class FHC_Controller extends CI_Controller
 {
+	const FHC_CONTROLLER_ID = 'fhc_controller_id'; // name of the parameter used to identify uniquely a call to a controller
+
+	private $_controllerId; // contains the unique identifier of a call to a controller
+
 	/**
 	 * Standard construct for all the controllers, loads the authentication system
 	 */
@@ -11,6 +15,8 @@ class FHC_Controller extends CI_Controller
 	{
         parent::__construct();
 
+		$this->_controllerId = null; // set _controllerId as null by default
+
 		$this->load->helper('fhcauth');
 	}
 
@@ -23,4 +29,34 @@ class FHC_Controller extends CI_Controller
 	{
 		$this->load->library('PhrasesLib', array($categories, $language), 'p');
 	}
+
+	/**
+	 * Sets the unique id for the called controller
+	 * NOTE: it is only working with HTTP GET request, not neeaded with POST
+	 *		because the first call to the controller is via HTTP GET,
+	 *		therefore a fhc_controller_id is already generated
+	 */
+	protected function setControllerId()
+	{
+		if ($_SERVER['REQUEST_METHOD'] === 'GET')
+		{
+			$this->_controllerId = $this->input->get(self::FHC_CONTROLLER_ID);
+
+			if (!isset($this->_controllerId) || empty($this->_controllerId))
+			{
+				$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));
+				exit; // terminate immediately the execution of this controller
+			}
+		}
+	}
+
+	/**
+	 * Return the value of the property _controllerId
+	 */
+	protected function getControllerId()
+	{
+		return $this->_controllerId;
+	}
 }

From 087299cf8473b07a6872e8019e3f0b465187b4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 16 May 2018 08:48:37 +0200
Subject: [PATCH 15/15] Added Unoconv 0.6 switch because converting text
 documents to pdf fails

---
 application/libraries/DocumentLib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
index 6def51ab5..ed87a9f38 100644
--- a/application/libraries/DocumentLib.php
+++ b/application/libraries/DocumentLib.php
@@ -57,6 +57,10 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
+				// Unoconv Version 0.6 seems to fail on converting TXT Files
+				if ($this->unoconv_version == '0.6')
+					return error();
+
 				$ret = $this->convert($filename, $outFile, 'pdf');
 				if(isSuccess($ret))
 				{
@@ -64,7 +68,7 @@ class DocumentLib
 				}
 				else
 				{
-					return $ret;
+					return error($ret->retval);
 				}
 			case 'application/pdf':
 				return success($filename);