From b7160b00fb8ebfc5abc14d8dd76a633ca5c22d38 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 23 Apr 2018 14:58:29 +0200
Subject: [PATCH 01/44] Adapted curser pointer for notices

cursor changes now to pointer-symbol when hovering a notice
---
 application/views/system/infocenter/notizen.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
index 04b938086..683a9b3d9 100644
--- a/application/views/system/infocenter/notizen.php
+++ b/application/views/system/infocenter/notizen.php
@@ -11,7 +11,7 @@
 		<tr data-toggle="tooltip"
 			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>">		
 			<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
-			<td><?php echo html_escape($notiz->titel) ?></td>
+			<td style="cursor: pointer"><?php echo html_escape($notiz->titel) ?></td>
 			<td><?php echo $notiz->verfasser_uid ?></td>
 			<td style="display: none"><?php echo $notiz->notiz_id ?></td>
 		</tr>

From 999b4040a401359dcf8e7bd93564e54bfba394eb Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 24 Apr 2018 18:34:07 +0200
Subject: [PATCH 02/44] Moved JS function refreshSideMenu from
 views/widgets/filter/filter.php to
 include/js/infocenter/infocenterPersonDataset.js and adapted the code

---
 application/views/widgets/filter/filter.php   | 16 ----------------
 .../js/infocenter/infocenterPersonDataset.js  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index c2a205dc1..d368cc6e1 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -111,22 +111,6 @@
 </style>
 <script language="Javascript" type="text/javascript">
 
-	function refreshSideMenu()
-	{
-		$.ajax({
-			url: "<?php echo site_url('system/infocenter/InfoCenter/setNavigationMenuArray'); ?>",
-			method: "GET",
-			data: {}
-		})
-		.done(function(data, textStatus, jqXHR) {
-
-			renderSideMenu();
-
-		}).fail(function(jqXHR, textStatus, errorThrown) {
-			alert(textStatus);
-		});
-	}
-
 	function sideMenuHook()
 	{
 		$(".remove-filter").click(function() {
diff --git a/include/js/infocenter/infocenterPersonDataset.js b/include/js/infocenter/infocenterPersonDataset.js
index a6b00dde5..8ee342d0a 100644
--- a/include/js/infocenter/infocenterPersonDataset.js
+++ b/include/js/infocenter/infocenterPersonDataset.js
@@ -111,3 +111,22 @@ function setTableActions()
 		}
 	);
 }
+
+/**
+ * Refreshes the side menu
+ */
+function refreshSideMenu()
+{
+	$.ajax({
+		url: window.location.pathname+"/setNavigationMenuArray",
+		method: "GET",
+		data: {}
+	})
+	.done(function(data, textStatus, jqXHR) {
+
+		renderSideMenu();
+
+	}).fail(function(jqXHR, textStatus, errorThrown) {
+		alert(textStatus);
+	});
+}

From 51f6d4545f7dafe1242101dd26c0b23a940f7123 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 25 Apr 2018 11:24:40 +0200
Subject: [PATCH 03/44] Added sancho ampel-erinnerungsmail

---
 composer.json                              |  551 +++++-----
 include/ampel.class.php                    | 1158 ++++++++++----------
 include/datum.class.php                    |  800 +++++++-------
 include/mail.class.php                     |   25 +-
 locale/de-AT/global.php                    |    1 +
 locale/en-US/global.php                    |    1 +
 locale/it-IT/global.php                    |  317 +++---
 skin/images/fh_logo.png                    |  Bin 0 -> 11120 bytes
 skin/images/sancho_round_right_blue.png    |  Bin 0 -> 82113 bytes
 vilesci/cronjobs/ampel_erinnerungsmail.php |  315 ++++++
 10 files changed, 1748 insertions(+), 1420 deletions(-)
 create mode 100644 skin/images/fh_logo.png
 create mode 100644 skin/images/sancho_round_right_blue.png
 create mode 100644 vilesci/cronjobs/ampel_erinnerungsmail.php

diff --git a/composer.json b/composer.json
index 2392b922f..8558cbdd5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,281 +1,270 @@
-{
-	"name": "fh-complete/fhc-core",
-	"type": "app",
-	"description": "FH-Complete Core",
-	"keywords": [
-		"fhc",
-		"fh-complete",
-		"campusmanagement"
-	],
-	"homepage": "https://github.com/FH-Complete/FHC-Core",
-	"license": "GPLv3",
-	"authors": [
-		{
-			"name": "Christian Paminger",
-			"email": "christian.paminger@fhcomplete.org",
-			"homepage": "http://fhcomplete.org"
-		},
-		{
-			"name": "Andreas Österreicher",
-			"email": "oesi@technikum-wien.at",
-			"homepage": "http://fhcomplete.org"
-		}
-	],
-	"support": {
-		"email": "info@fhcomplete.org",
-		"forum": "https://plus.google.com/communities/113278802529782592610",
-		"wiki": "http://wiki.fhcomplete.org/"
-	},
-	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "codeigniter-restserver",
-				"version": "2.6",
-				"dist": {
-					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jsoneditor",
-				"version": "5.5.6",
-				"dist": {
-					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "json-forms",
-				"version": "1.4.0",
-				"dist": {
-					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "borgar/textile-js",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/borgar/textile-js.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "rmariuzzo/jquery-checkboxes",
-				"version": "1.0.7",
-				"source": {
-					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
-					"type": "git",
-					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV1",
-				"version": "1.12.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV2",
-				"version": "2.2.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "fgelinas/timepicker",
-				"version": "0.3.3",
-				"dist": {
-					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "alvaro-prieto/colResizable",
-				"version": "1.6",
-				"dist": {
-					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tapmodo/Jcrop",
-				"version": "2.0.4",
-				"dist": {
-					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery-archive/jquery-metadata",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/jquery-archive/jquery-metadata.git",
-					"type": "git",
-					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tomazdragar/SimpleCropper",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/tomazdragar/SimpleCropper.git",
-					"type": "git",
-					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "joeldbirch/superfish",
-				"version": "1.7.9",
-				"dist": {
-					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/sizzle",
-				"version": "1.0",
-				"dist": {
-					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "nicolaskruchten/pivottable",
-				"version": "2.15.0",
-				"source": {
-					"url": "https://github.com/nicolaskruchten/pivottable.git",
-					"type": "git",
-					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
-				"version": "3.3.7",
-				"source": {
-					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		}
-	],
-	"require": {
-		"php": ">=5.4.0",
-
-		"alvaro-prieto/colResizable": "^1.6",
-		"borgar/textile-js": "1.0",
-		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
-		"christianbach/tablesorter": "^1.0",
-
-		"codeigniter/framework": "3.*",
-		"codeigniter-restserver": "2.6",
-
-		"components/jquery": "^3.2",
-		"components/jqueryui": "^1.12",
-		"components/font-awesome": "^4.7",
-		"components/angular.js": "1.3.16",
-
-		"easyrdf/easyrdf": "0.9.*",
-		"fgelinas/timepicker": "^0.3.3",
-		"fzaninotto/faker": "1.*",
-		"joeldbirch/superfish": "^1.7",
-
-		"jquery/jqueryV1": "^1.12",
-		"jquery/jqueryV2": "^2.2",
-		"jquery/sizzle": "^1.0",
-
-		"jquery-archive/jquery-metadata": "^1.0",
-
-		"json-forms": "1.4.0",
-		"jsoneditor": "5.5.6",
-		"kingsquare/json-schema-form": "*",
-		"michelf/php-markdown": "1.5.0",
-		"ml/json-ld": "1.*",
-		"mottie/tablesorter": "^2.29",
-		"netcarver/textile": "^3.5",
-		"nicolaskruchten/pivottable": "^2.15.0",
-		"rmariuzzo/jquery-checkboxes": "1.0.7",
-
-		"rougin/combustor": "1.1.*",
-		"rougin/refinery": "*",
-
-		"tapmodo/Jcrop": "^2.0",
-		"tinymce/tinymce": "4.*",
-		"tomazdragar/SimpleCropper": "^1.0",
-		"twbs/bootstrap": "^3.3",
-
-		"zetacomponents/workflow": "1.*",
-		"zetacomponents/document": "1.*",
-		"zetacomponents/workflow-database-tiein": "1.*",
-		"zetacomponents/workflow-event-log-tiein": "1.*"
-	},
-	"require-dev": {
-		"squizlabs/php_codesniffer": "2.*"
-	},
-	"config": {
-		"bin-dir": "vendor/bin"
-	},
-	"extra": {
-		"merge-plugin": {
-			"include": [
-				"composer.json",
-				"addons/*/composer.json"
-			],
-			"recurse": true,
-			"replace": false,
-			"merge-dev": false,
-			"merge-extra": false
-		}
-	}
-}
+{
+	"name": "fh-complete/fhc-core",
+	"type": "app",
+	"description": "FH-Complete Core",
+	"keywords": [
+		"fhc",
+		"fh-complete",
+		"campusmanagement"
+	],
+	"homepage": "https://github.com/FH-Complete/FHC-Core",
+	"license": "GPLv3",
+	"authors": [
+		{
+			"name": "Christian Paminger",
+			"email": "christian.paminger@fhcomplete.org",
+			"homepage": "http://fhcomplete.org"
+		},
+		{
+			"name": "Andreas Österreicher",
+			"email": "oesi@technikum-wien.at",
+			"homepage": "http://fhcomplete.org"
+		}
+	],
+	"support": {
+		"email": "info@fhcomplete.org",
+		"forum": "https://plus.google.com/communities/113278802529782592610",
+		"wiki": "http://wiki.fhcomplete.org/"
+	},
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "codeigniter-restserver",
+				"version": "2.6",
+				"dist": {
+					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jsoneditor",
+				"version": "5.5.6",
+				"dist": {
+					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "json-forms",
+				"version": "1.4.0",
+				"dist": {
+					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "borgar/textile-js",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/borgar/textile-js.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "rmariuzzo/jquery-checkboxes",
+				"version": "1.0.7",
+				"source": {
+					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
+					"type": "git",
+					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV1",
+				"version": "1.12.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV2",
+				"version": "2.2.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "fgelinas/timepicker",
+				"version": "0.3.3",
+				"dist": {
+					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "alvaro-prieto/colResizable",
+				"version": "1.6",
+				"dist": {
+					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tapmodo/Jcrop",
+				"version": "2.0.4",
+				"dist": {
+					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery-archive/jquery-metadata",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/jquery-archive/jquery-metadata.git",
+					"type": "git",
+					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tomazdragar/SimpleCropper",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/tomazdragar/SimpleCropper.git",
+					"type": "git",
+					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "joeldbirch/superfish",
+				"version": "1.7.9",
+				"dist": {
+					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/sizzle",
+				"version": "1.0",
+				"dist": {
+					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "nicolaskruchten/pivottable",
+				"version": "2.15.0",
+				"source": {
+					"url": "https://github.com/nicolaskruchten/pivottable.git",
+					"type": "git",
+					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
+				"version": "3.3.7",
+				"source": {
+					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		}
+	],
+	"require": {
+		"php": ">=5.4.0",
+
+		"alvaro-prieto/colResizable": "^1.6",
+		"borgar/textile-js": "1.0",
+		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
+		"christianbach/tablesorter": "^1.0",
+
+		"codeigniter/framework": "3.*",
+		"codeigniter-restserver": "2.6",
+
+		"components/jquery": "^3.2",
+		"components/jqueryui": "^1.12",
+		"components/font-awesome": "^4.7",
+		"components/angular.js": "1.3.16",
+
+		"easyrdf/easyrdf": "0.9.*",
+		"fgelinas/timepicker": "^0.3.3",
+		"fzaninotto/faker": "1.*",
+		"joeldbirch/superfish": "^1.7",
+
+		"jquery/jqueryV1": "^1.12",
+		"jquery/jqueryV2": "^2.2",
+		"jquery/sizzle": "^1.0",
+
+		"jquery-archive/jquery-metadata": "^1.0",
+
+		"json-forms": "1.4.0",
+		"jsoneditor": "5.5.6",
+		"kingsquare/json-schema-form": "*",
+		"michelf/php-markdown": "1.5.0",
+		"ml/json-ld": "1.*",
+		"mottie/tablesorter": "^2.29",
+		"netcarver/textile": "^3.5",
+		"nicolaskruchten/pivottable": "^2.15.0",
+		"rmariuzzo/jquery-checkboxes": "1.0.7",
+
+		"rougin/combustor": "1.1.*",
+		"rougin/refinery": "*",
+
+		"tapmodo/Jcrop": "^2.0",
+		"tinymce/tinymce": "4.*",
+		"tomazdragar/SimpleCropper": "^1.0",
+		"twbs/bootstrap": "^3.3",
+
+		"zetacomponents/workflow": "1.*",
+		"zetacomponents/document": "1.*",
+		"zetacomponents/workflow-database-tiein": "1.*",
+		"zetacomponents/workflow-event-log-tiein": "1.*"
+	},
+	"require-dev": {
+		"squizlabs/php_codesniffer": "2.*"
+	},
+	"config": {
+		"bin-dir": "vendor/bin"
+	}
+}
+
diff --git a/include/ampel.class.php b/include/ampel.class.php
index fba67585e..40f8a503d 100644
--- a/include/ampel.class.php
+++ b/include/ampel.class.php
@@ -1,579 +1,579 @@
-<?php
-/* Copyright (C) 2011 fhcomplete.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and 
- */
-/**
- * Klasse Ampel
- *  
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-require_once(dirname(__FILE__).'/sprache.class.php');
-
-class ampel extends basis_db
-{
-	public $new;
-	public $result = array();
-
-	//Tabellenspalten
-	public $ampel_id;		// bigint
-	public $kurzbz;			// varchar(64)
-	public $beschreibung = array();	// text[]
-	public $benutzer_select;// text
-	public $deadline;		// date
-	public $vorlaufzeit;	// smallint
-	public $verfallszeit;	// smallint
-	public $email;			// boolean
-	public $verpflichtend;	// boolean
-	public $buttontext;		// varchar(64)[]
-	public $insertamum;		// timestamp
-	public $insertvon;		// varchar(32)
-	public $updateamum;		// timestamp
-	public $updatevon;		// varchar(32)
-	
-	public $ampel_benutzer_id;	// bigint
-	public $uid;				// varchar(32)
-	 
-	/**
-	 * Konstruktor - Laedt optional eine Ampel
-	 * @param $amepl_id
-	 */
-	public function __construct($ampel_id=null)
-	{
-		parent::__construct();
-				
-		if(!is_null($ampel_id))
-			$this->load($ampel_id);
-	}
-
-	/**
-	 * Laedt eine Ampel mit der uebergebenen ID
-	 * 
-	 * @param $ampel_id
-	 * @return boolean
-	 */
-	public function load($ampel_id)
-	{
-		if(!is_numeric($ampel_id))
-		{
-			$this->errormsg = 'Ampel ID ist ungueltig';
-			return false;
-		}
-		
-		$sprache = new sprache();
-		$beschreibung = $sprache->getSprachQuery('beschreibung');
-		$buttontext = $sprache->getSprachQuery('buttontext');
-		
-		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER);
-
-		if($result = $this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object($result))
-			{
-				$this->ampel_id = $row->ampel_id;
-				$this->kurzbz = $row->kurzbz;
-				$this->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
-				$this->benutzer_select = $row->benutzer_select;
-				$this->deadline = $row->deadline;
-				$this->vorlaufzeit = $row->vorlaufzeit;
-				$this->verfallszeit = $row->verfallszeit;
-				$this->email = $row->email;
-				$this->verpflichtend = $row->verpflichtend;
-				$this->buttontext = $sprache->parseSprachResult('buttontext', $row);
-				$this->insertamum = $row->insertamum;
-				$this->insertvon = $row->insertvon;
-				$this->updateamum = $row->updateamum;
-				$this->updatevon = $row->updatevon;
-
-				return true;
-			}
-			else
-			{
-				$this->errormsg = 'Ampel mit dieser ID exisitert nicht';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Ampel';
-			return false;
-		}
-	}
-	
-	/**
-	 * Laedt alle vorhandenen Ampeln
-	 * @param aktiv lade nur aktive Ampeln
-	 */
-	public function getAll($aktiv=false)
-	{
-		$sprache = new sprache();
-		$beschreibung = $sprache->getSprachQuery('beschreibung');
-		$buttontext = $sprache->getSprachQuery('buttontext');
-		
-		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
-		if($aktiv)
-		{
-			$qry .= " WHERE (NOW()>(deadline-(vorlaufzeit || ' days')::interval)::date)";
-			$qry .= " AND (NOW()<(deadline+(verfallszeit || ' days')::interval)::date)";
-		}
-		$qry .= " ORDER BY deadline";
-		
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new ampel();
-					
-				$obj->ampel_id = $row->ampel_id;
-				$obj->kurzbz = $row->kurzbz;
-				$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
-				$obj->benutzer_select = $row->benutzer_select;
-				$obj->deadline = $row->deadline;
-				$obj->vorlaufzeit = $row->vorlaufzeit;
-				$obj->verfallszeit = $row->verfallszeit;
-				$obj->email = $this->db_parse_bool($row->email);
-				$obj->verpflichtend = $this->db_parse_bool($row->verpflichtend);
-				$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
-				$obj->insertamum = $row->insertamum;
-				$obj->insertvon = $row->insertvon;
-					
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg='Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Prueft ob ein User eine Ampel schon bestaetigt hat
-	 * 
-	 * @param $user
-	 * @param $ampel_id
-	 * @return boolean
-	 */
-	public function isBestaetigt($user, $ampel_id)
-	{
-		$qry = "SELECT 1 FROM public.tbl_ampel_benutzer_bestaetigt WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER)." AND uid=".$this->db_add_param($user);
-	
-		if($result = $this->db_query($qry))
-		{
-			if($this->db_num_rows($result)>0)
-				return true;
-			else
-				return false;
-		}
-		else
-		{
-			$this->errormsg='Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-	
-	/**
-	 * Prueft ob ein User zu einer Ampel zugeteilt ist
-	 * @param $user
-	 * @param $benutzer_select
-	 */
-	public function isZugeteilt($user, $benutzer_select)
-	{
-		$qry = "SELECT CASE WHEN ".$this->db_add_param($user)." IN (".$benutzer_select.") THEN true ELSE false END as zugeteilt";
-
-		if($result_zugeteilt = $this->db_query($qry))
-		{
-			if($row_zugeteilt = $this->db_fetch_object($result_zugeteilt))
-			{
-				if($row_zugeteilt->zugeteilt=='t')
-					return true;
-				else
-					return false;
-			}
-			else
-			{
-				$this->errormsg = 'Fehler beim Laden der Daten';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-	
-	/**
-	 * Laedt alle aktuellen Ampeln eines Users
-	 * @param string $user User, dessen Ampeln geladen werden sollen
-	 * @param boolean $bestaetigt Default false
-	 * 				wenn true, werden alle Ampeln geladen 
-	 * 				wenn false, werden nur die Ampeln geladen die noch NICHT bestaetigt wurden
-	 */
-	public function loadUserAmpel($user, $bestaetigt=false)   
-	{
-		$sprache = new sprache();
-		$beschreibung = $sprache->getSprachQuery('beschreibung');
-		$buttontext = $sprache->getSprachQuery('buttontext');		
-		
-		//all ampeln except where now is before the vorlaufzeit
-		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
-		
-		//only ampeln that are not confirmed
-		if(!$bestaetigt)
-		{
-			$qry.=" WHERE NOT EXISTS
-						(SELECT ampel_id 
-						 FROM public.tbl_ampel_benutzer_bestaetigt 
-						 WHERE uid=".$this->db_add_param($user)." AND ampel_id=tbl_ampel.ampel_id)";
-		}
-
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				if($this->isZugeteilt($user, $row->benutzer_select))
-				{
-					$obj = new ampel();
-					
-					$obj->ampel_id = $row->ampel_id;
-					$obj->kurzbz = $row->kurzbz;
-					$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
-					$obj->benutzer_select = $row->benutzer_select;
-					$obj->deadline = $row->deadline;
-					$obj->vorlaufzeit = $row->vorlaufzeit;
-					$obj->verfallszeit = $row->verfallszeit;
-					$obj->email = $row->email;
-					$obj->verpflichtend = $row->verpflichtend;
-					$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
-					$obj->insertamum = $row->insertamum;
-					$obj->insertvon = $row->insertvon;
-					
-					$this->result[] = $obj;
-				}
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-	
-	/**
-	 * Prueft die Daten vor dem Speichern
-	 * @return boolean
-	 */
-	public function validate()
-	{
-		$benutzer_select = mb_strtolower($this->benutzer_select);
-		
-		if(mb_strstr($benutzer_select, 'update ') || mb_strstr($benutzer_select, 'insert ') || mb_strstr($benutzer_select, 'delete '))
-		{
-			$this->errormsg = 'Der Benutzer Select darf nur Selects beinhalten';
-			return false;
-		}
-		
-		if(!mb_strstr($benutzer_select,'select '))
-		{
-			$this->errormsg = 'Der Benutzer Select muss einen Select-Befehl beinhalten';
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Speichert eine Ampel
-	 * @param $new
-	 */
-	public function save($new=null)
-	{
-		if(is_null($new))
-			$new = $this->new;
-			
-		if(!$this->validate())
-			return false;
-			
-		$sprache = new sprache();
-		$sprache->loadIndexArray();
-			
-		if($this->new)
-		{
-			$qry = "BEGIN;INSERT INTO public.tbl_ampel (kurzbz, ";
-			
-			foreach($this->beschreibung as $key=>$value)
-			{
-				$idx = sprache::$index_arr[$key];
-				$qry.=" beschreibung[$idx],";
-			}
-			foreach($this->buttontext as $key=>$value)
-			{
-				$idx = sprache::$index_arr[$key];
-				$qry.=" buttontext[$idx],";
-			}
-			
-			$qry.=" benutzer_select, deadline, 
-					vorlaufzeit, verfallszeit, email, verpflichtend, insertamum, insertvon , updateamum, updatevon) VALUES(".
-					$this->db_add_param($this->kurzbz).',';
-			reset($this->beschreibung);
-			foreach($this->beschreibung as $key=>$value)
-				$qry.=$this->db_add_param($value).',';
-			reset($this->buttontext);
-			foreach($this->buttontext as $key=>$value)
-				$qry.=$this->db_add_param($value).',';
-								
-			$qry .= $this->db_add_param($this->benutzer_select).','.
-					$this->db_add_param($this->deadline).','.
-					$this->db_add_param($this->vorlaufzeit).','.
-					$this->db_add_param($this->verfallszeit).','.
-					$this->db_add_param($this->email, FHC_BOOLEAN).','.
-					$this->db_add_param($this->verpflichtend, FHC_BOOLEAN).','.
-					$this->db_add_param($this->insertamum).','.
-					$this->db_add_param($this->insertvon).','.
-					$this->db_add_param($this->updateamum).','.
-					$this->db_add_param($this->updatevon).');';
-		}
-		else
-		{
-			$qry = 'UPDATE public.tbl_ampel SET'.
-					' kurzbz = '.$this->db_add_param($this->kurzbz).',';
-			reset($this->beschreibung);
-			foreach($this->beschreibung as $key=>$value)
-			{
-				$idx = sprache::$index_arr[$key];
-				$qry.=' beschreibung['.$idx.'] = '.$this->db_add_param($value).',';
-			}
-			reset($this->buttontext);
-			foreach($this->buttontext as $key=>$value)
-			{
-				$idx = sprache::$index_arr[$key];
-				$qry.=' buttontext['.$idx.'] = '.$this->db_add_param($value).',';
-			}
-			
-			$qry.=  ' benutzer_select = '.$this->db_add_param($this->benutzer_select).','.
-					' deadline = '.$this->db_add_param($this->deadline).','.
-					' vorlaufzeit = '.$this->db_add_param($this->vorlaufzeit).','.
-					' verfallszeit = '.$this->db_add_param($this->verfallszeit).','.
-					' email = '.$this->db_add_param($this->email, FHC_BOOLEAN).','.
-					' verpflichtend = '.$this->db_add_param($this->verpflichtend, FHC_BOOLEAN).','.
-					' updateamum ='.$this->db_add_param($this->updateamum).','.
-					' updatevon ='.$this->db_add_param($this->updatevon).
-					' WHERE ampel_id='.$this->db_add_param($this->ampel_id, FHC_INTEGER).';';					
-		}
-		
-		if($this->db_query($qry))
-		{
-			if($new)
-			{
-				$qry = "SELECT currval('public.seq_ampel_ampel_id') as id";
-				if($result = $this->db_query($qry))
-				{
-					if($row = $this->db_fetch_object($result))
-					{
-						$this->ampel_id = $row->id;
-						$this->db_query('COMMIT;');
-						return true;
-					}
-					else
-					{
-						$this->errormsg = 'Fehler beim Auslesen der Sequence';
-						$this->db_query('ROLLBACK');
-						return false;
-					}
-				}
-				else
-				{
-					$this->errormsg = 'Fehler beim Auslesen der Sequence';
-					$this->db_query('ROLLBACK');
-					return false;
-				}
-			}
-			else
-				return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return false;
-		}
-	}
-	
-	/**
-	 * Loescht eine Ampel
-	 
-	 * @param $ampel_id
-	 */
-	public function delete($ampel_id)
-	{
-		if(!is_numeric($ampel_id))
-		{
-			$this->errormsg='ID ist ungueltig';
-			return false;
-		}
-		$qry = "DELETE FROM public.tbl_ampel WHERE ampel_id=".$this->db_add_param($ampel_id);
-		
-		if($this->db_query($qry))
-			return true;
-		else
-		{
-			$this->errormsg = 'Fehler beim Loeschen der Ampel';
-			return false;
-		}
-	}
-	
-	/**
-	 * Loescht eine Bestaetigung einer Ampel
-	
-	 * @param $ampel_id
-	 */
-	public function deleteAmpelBenutzer($ampel_benutzer_bestaetigt_id)
-	{
-		if(!is_numeric($ampel_benutzer_bestaetigt_id))
-		{
-			$this->errormsg='ID ist ungueltig';
-			return false;
-		}
-		$qry = "DELETE FROM public.tbl_ampel_benutzer_bestaetigt WHERE ampel_benutzer_bestaetigt_id=".$this->db_add_param($ampel_benutzer_bestaetigt_id);
-	
-		if($this->db_query($qry))
-			return true;
-		else
-		{
-			$this->errormsg = 'Fehler beim Loeschen der Bestaetigung';
-			return false;
-		}
-	}
-	
-	/**
-	 * Bestaetigt die Ampel eines Users
-	 * @param $user
-	 * @param $ampel_id
-	 * @return boolean
-	 */
-	public function bestaetigen($user, $ampel_id)
-	{
-		$qry = 'INSERT INTO public.tbl_ampel_benutzer_bestaetigt(ampel_id, uid, insertamum, insertvon) VALUES('.
-				$this->db_add_param($ampel_id, FHC_INTEGER).','.
-				$this->db_add_param($user).','.
-				'now(),'.
-				$this->db_add_param($user).');';
-				
-		if($this->db_query($qry))
-			return true;
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return false;
-		}
-	}
-	
-	/**
-	 * Laedt Ampeln und Mitarbeiter zu einer OE/Ampel
-	 * @param $oe_arr
-	 * @param $ampel_id
-	 */
-	public function loadAmpelMitarbeiter($oe_arr, $ampel_id)
-	{
-		$sprache = new sprache();
-		$beschreibung = $sprache->getSprachQuery('beschreibung');
-		$buttontext = $sprache->getSprachQuery('buttontext');
-		
-		if(!is_numeric($ampel_id) && $ampel_id!='')
-		{
-			$this->errormsg = 'Ampel ID ist ungueltig';
-			return false;
-		}
-		
-		// Ampeln holen
-		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
-		if($ampel_id!='')
-			$qry.=" WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER);
-			
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				// Alle Mitarbeiter/Studenten dazu holen
-				$qry = "SELECT 
-							distinct on (tbl_ampel_benutzer_bestaetigt.ampel_benutzer_bestaetigt_id, a.uid) *,
-							tbl_ampel_benutzer_bestaetigt.insertamum,tbl_ampel_benutzer_bestaetigt.insertvon							
-						FROM 
-							(".$row->benutzer_select.") a 
-							JOIN campus.vw_benutzer USING(uid)
-							LEFT JOIN public.tbl_benutzerfunktion USING(uid)
-							LEFT JOIN public.tbl_ampel_benutzer_bestaetigt on(public.tbl_ampel_benutzer_bestaetigt.uid=a.uid AND ampel_id=".$this->db_add_param($row->ampel_id, FHC_INTEGER).")
-						WHERE
-							(tbl_ampel_benutzer_bestaetigt.ampel_id is null OR tbl_ampel_benutzer_bestaetigt.ampel_id=".$this->db_add_param($row->ampel_id).")
-							AND
-							(
-								(funktion_kurzbz='oezuordnung' AND oe_kurzbz in(".$this->implode4SQL($oe_arr)."))
-								OR
-								(funktion_kurzbz is null 
-								 AND (SELECT oe_kurzbz FROM 
-								 	  public.tbl_studiengang JOIN public.tbl_student USING(studiengang_kz) 
-								 	  WHERE vw_benutzer.uid=tbl_student.student_uid)
-								 	 in(".$this->implode4SQL($oe_arr).")
-								)
-							)
-						";
-
-				if($result_ma = $this->db_query($qry))
-				{
-					while($row_ma = $this->db_fetch_object($result_ma))
-					{
-						$obj = new ampel();
-						
-						$obj->ampel_id = $row->ampel_id;
-						$obj->kurzbz = $row->kurzbz;
-						$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
-						$obj->benutzer_select = $row->benutzer_select;
-						$obj->deadline = $row->deadline;
-						$obj->vorlaufzeit = $row->vorlaufzeit;
-						$obj->verfallszeit = $row->verfallszeit;
-						$obj->email = $row->email;
-						$obj->verpflichtend = $row->verpflichtend;
-						$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
-						$obj->insertamum = $row->insertamum;
-						$obj->insertvon = $row->insertvon;
-						
-						$obj->vorname = $row_ma->vorname;
-						$obj->nachname = $row_ma->nachname;
-						$obj->titelpre = $row_ma->titelpre;
-						$obj->titelpost = $row_ma->titelpost;
-						$obj->oe_kurzbz = $row_ma->oe_kurzbz;
-						
-						$obj->insertamum_best = $row_ma->insertamum;
-						$obj->insertvon_best = $row_ma->insertvon;
-						$obj->ampel_benutzer_bestaetigt_id = $row_ma->ampel_benutzer_bestaetigt_id;
-						
-						$this->result[] = $obj;
-					}
-				}
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-		
-	}
-}
-?>
+<?php
+/* Copyright (C) 2011 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and 
+ */
+/**
+ * Klasse Ampel
+ *  
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/sprache.class.php');
+
+class ampel extends basis_db
+{
+	public $new;
+	public $result = array();
+
+	//Tabellenspalten
+	public $ampel_id;		// bigint
+	public $kurzbz;			// varchar(64)
+	public $beschreibung = array();	// text[]
+	public $benutzer_select;// text
+	public $deadline;		// date
+	public $vorlaufzeit;	// smallint
+	public $verfallszeit;	// smallint
+	public $email;			// boolean
+	public $verpflichtend;	// boolean
+	public $buttontext;		// varchar(64)[]
+	public $insertamum;		// timestamp
+	public $insertvon;		// varchar(32)
+	public $updateamum;		// timestamp
+	public $updatevon;		// varchar(32)
+	
+	public $ampel_benutzer_id;	// bigint
+	public $uid;				// varchar(32)
+	 
+	/**
+	 * Konstruktor - Laedt optional eine Ampel
+	 * @param $amepl_id
+	 */
+	public function __construct($ampel_id=null)
+	{
+		parent::__construct();
+				
+		if(!is_null($ampel_id))
+			$this->load($ampel_id);
+	}
+
+	/**
+	 * Laedt eine Ampel mit der uebergebenen ID
+	 * 
+	 * @param $ampel_id
+	 * @return boolean
+	 */
+	public function load($ampel_id)
+	{
+		if(!is_numeric($ampel_id))
+		{
+			$this->errormsg = 'Ampel ID ist ungueltig';
+			return false;
+		}
+		
+		$sprache = new sprache();
+		$beschreibung = $sprache->getSprachQuery('beschreibung');
+		$buttontext = $sprache->getSprachQuery('buttontext');
+		
+		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER);
+
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+			{
+				$this->ampel_id = $row->ampel_id;
+				$this->kurzbz = $row->kurzbz;
+				$this->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
+				$this->benutzer_select = $row->benutzer_select;
+				$this->deadline = $row->deadline;
+				$this->vorlaufzeit = $row->vorlaufzeit;
+				$this->verfallszeit = $row->verfallszeit;
+				$this->email = $row->email;
+				$this->verpflichtend = $row->verpflichtend;
+				$this->buttontext = $sprache->parseSprachResult('buttontext', $row);
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Ampel mit dieser ID exisitert nicht';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Ampel';
+			return false;
+		}
+	}
+	
+	/**
+	 * Laedt alle vorhandenen Ampeln
+	 * @param aktiv lade nur aktive Ampeln
+	 */
+	public function getAll($aktiv=false)
+	{
+		$sprache = new sprache();
+		$beschreibung = $sprache->getSprachQuery('beschreibung');
+		$buttontext = $sprache->getSprachQuery('buttontext');
+		
+		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
+		if($aktiv)
+		{
+			$qry .= " WHERE (NOW()>(deadline-(vorlaufzeit || ' days')::interval)::date)";
+			$qry .= " AND (NOW()<(deadline+(verfallszeit || ' days')::interval)::date)";
+		}
+		$qry .= " ORDER BY deadline";
+						
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new ampel();
+					
+				$obj->ampel_id = $row->ampel_id;
+				$obj->kurzbz = $row->kurzbz;
+				$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
+				$obj->benutzer_select = $row->benutzer_select;
+				$obj->deadline = $row->deadline;
+				$obj->vorlaufzeit = $row->vorlaufzeit;
+				$obj->verfallszeit = $row->verfallszeit;
+				$obj->email = $this->db_parse_bool($row->email);
+				$obj->verpflichtend = $this->db_parse_bool($row->verpflichtend);
+				$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+					
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg='Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft ob ein User eine Ampel schon bestaetigt hat
+	 * 
+	 * @param $user
+	 * @param $ampel_id
+	 * @return boolean
+	 */
+	public function isBestaetigt($user, $ampel_id)
+	{
+		$qry = "SELECT 1 FROM public.tbl_ampel_benutzer_bestaetigt WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER)." AND uid=".$this->db_add_param($user);
+	
+		if($result = $this->db_query($qry))
+		{
+			if($this->db_num_rows($result)>0)
+				return true;
+			else
+				return false;
+		}
+		else
+		{
+			$this->errormsg='Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+	
+	/**
+	 * Prueft ob ein User zu einer Ampel zugeteilt ist
+	 * @param $user
+	 * @param $benutzer_select
+	 */
+	public function isZugeteilt($user, $benutzer_select)
+	{
+		$qry = "SELECT CASE WHEN ".$this->db_add_param($user)." IN (".$benutzer_select.") THEN true ELSE false END as zugeteilt";
+
+		if($result_zugeteilt = $this->db_query($qry))
+		{
+			if($row_zugeteilt = $this->db_fetch_object($result_zugeteilt))
+			{
+				if($row_zugeteilt->zugeteilt=='t')
+					return true;
+				else
+					return false;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Laden der Daten';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+	
+	/**
+	 * Laedt alle aktuellen Ampeln eines Users
+	 * @param string $user User, dessen Ampeln geladen werden sollen
+	 * @param boolean $bestaetigt Default false
+	 * 				wenn true, werden alle Ampeln geladen 
+	 * 				wenn false, werden nur die Ampeln geladen die noch NICHT bestaetigt wurden
+	 */
+	public function loadUserAmpel($user, $bestaetigt=false)   
+	{
+		$sprache = new sprache();
+		$beschreibung = $sprache->getSprachQuery('beschreibung');
+		$buttontext = $sprache->getSprachQuery('buttontext');		
+		
+		//all ampeln except where now is before the vorlaufzeit
+		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
+		
+		//only ampeln that are not confirmed
+		if(!$bestaetigt)
+		{
+			$qry.=" WHERE NOT EXISTS
+						(SELECT ampel_id 
+						 FROM public.tbl_ampel_benutzer_bestaetigt 
+						 WHERE uid=".$this->db_add_param($user)." AND ampel_id=tbl_ampel.ampel_id)";
+		}
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				if($this->isZugeteilt($user, $row->benutzer_select))
+				{
+					$obj = new ampel();
+					
+					$obj->ampel_id = $row->ampel_id;
+					$obj->kurzbz = $row->kurzbz;
+					$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
+					$obj->benutzer_select = $row->benutzer_select;
+					$obj->deadline = $row->deadline;
+					$obj->vorlaufzeit = $row->vorlaufzeit;
+					$obj->verfallszeit = $row->verfallszeit;
+					$obj->email = $row->email;
+					$obj->verpflichtend = $row->verpflichtend;
+					$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
+					$obj->insertamum = $row->insertamum;
+					$obj->insertvon = $row->insertvon;
+					
+					$this->result[] = $obj;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+	
+	/**
+	 * Prueft die Daten vor dem Speichern
+	 * @return boolean
+	 */
+	public function validate()
+	{
+		$benutzer_select = mb_strtolower($this->benutzer_select);
+		
+		if(mb_strstr($benutzer_select, 'update ') || mb_strstr($benutzer_select, 'insert ') || mb_strstr($benutzer_select, 'delete '))
+		{
+			$this->errormsg = 'Der Benutzer Select darf nur Selects beinhalten';
+			return false;
+		}
+		
+		if(!mb_strstr($benutzer_select,'select '))
+		{
+			$this->errormsg = 'Der Benutzer Select muss einen Select-Befehl beinhalten';
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Speichert eine Ampel
+	 * @param $new
+	 */
+	public function save($new=null)
+	{
+		if(is_null($new))
+			$new = $this->new;
+			
+		if(!$this->validate())
+			return false;
+			
+		$sprache = new sprache();
+		$sprache->loadIndexArray();
+			
+		if($this->new)
+		{
+			$qry = "BEGIN;INSERT INTO public.tbl_ampel (kurzbz, ";
+			
+			foreach($this->beschreibung as $key=>$value)
+			{
+				$idx = sprache::$index_arr[$key];
+				$qry.=" beschreibung[$idx],";
+			}
+			foreach($this->buttontext as $key=>$value)
+			{
+				$idx = sprache::$index_arr[$key];
+				$qry.=" buttontext[$idx],";
+			}
+			
+			$qry.=" benutzer_select, deadline, 
+					vorlaufzeit, verfallszeit, email, verpflichtend, insertamum, insertvon , updateamum, updatevon) VALUES(".
+					$this->db_add_param($this->kurzbz).',';
+			reset($this->beschreibung);
+			foreach($this->beschreibung as $key=>$value)
+				$qry.=$this->db_add_param($value).',';
+			reset($this->buttontext);
+			foreach($this->buttontext as $key=>$value)
+				$qry.=$this->db_add_param($value).',';
+								
+			$qry .= $this->db_add_param($this->benutzer_select).','.
+					$this->db_add_param($this->deadline).','.
+					$this->db_add_param($this->vorlaufzeit).','.
+					$this->db_add_param($this->verfallszeit).','.
+					$this->db_add_param($this->email, FHC_BOOLEAN).','.
+					$this->db_add_param($this->verpflichtend, FHC_BOOLEAN).','.
+					$this->db_add_param($this->insertamum).','.
+					$this->db_add_param($this->insertvon).','.
+					$this->db_add_param($this->updateamum).','.
+					$this->db_add_param($this->updatevon).');';
+		}
+		else
+		{
+			$qry = 'UPDATE public.tbl_ampel SET'.
+					' kurzbz = '.$this->db_add_param($this->kurzbz).',';
+			reset($this->beschreibung);
+			foreach($this->beschreibung as $key=>$value)
+			{
+				$idx = sprache::$index_arr[$key];
+				$qry.=' beschreibung['.$idx.'] = '.$this->db_add_param($value).',';
+			}
+			reset($this->buttontext);
+			foreach($this->buttontext as $key=>$value)
+			{
+				$idx = sprache::$index_arr[$key];
+				$qry.=' buttontext['.$idx.'] = '.$this->db_add_param($value).',';
+			}
+			
+			$qry.=  ' benutzer_select = '.$this->db_add_param($this->benutzer_select).','.
+					' deadline = '.$this->db_add_param($this->deadline).','.
+					' vorlaufzeit = '.$this->db_add_param($this->vorlaufzeit).','.
+					' verfallszeit = '.$this->db_add_param($this->verfallszeit).','.
+					' email = '.$this->db_add_param($this->email, FHC_BOOLEAN).','.
+					' verpflichtend = '.$this->db_add_param($this->verpflichtend, FHC_BOOLEAN).','.
+					' updateamum ='.$this->db_add_param($this->updateamum).','.
+					' updatevon ='.$this->db_add_param($this->updatevon).
+					' WHERE ampel_id='.$this->db_add_param($this->ampel_id, FHC_INTEGER).';';					
+		}
+		
+		if($this->db_query($qry))
+		{
+			if($new)
+			{
+				$qry = "SELECT currval('public.seq_ampel_ampel_id') as id";
+				if($result = $this->db_query($qry))
+				{
+					if($row = $this->db_fetch_object($result))
+					{
+						$this->ampel_id = $row->id;
+						$this->db_query('COMMIT;');
+						return true;
+					}
+					else
+					{
+						$this->errormsg = 'Fehler beim Auslesen der Sequence';
+						$this->db_query('ROLLBACK');
+						return false;
+					}
+				}
+				else
+				{
+					$this->errormsg = 'Fehler beim Auslesen der Sequence';
+					$this->db_query('ROLLBACK');
+					return false;
+				}
+			}
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+	
+	/**
+	 * Loescht eine Ampel
+	 
+	 * @param $ampel_id
+	 */
+	public function delete($ampel_id)
+	{
+		if(!is_numeric($ampel_id))
+		{
+			$this->errormsg='ID ist ungueltig';
+			return false;
+		}
+		$qry = "DELETE FROM public.tbl_ampel WHERE ampel_id=".$this->db_add_param($ampel_id);
+		
+		if($this->db_query($qry))
+			return true;
+		else
+		{
+			$this->errormsg = 'Fehler beim Loeschen der Ampel';
+			return false;
+		}
+	}
+	
+	/**
+	 * Loescht eine Bestaetigung einer Ampel
+	
+	 * @param $ampel_id
+	 */
+	public function deleteAmpelBenutzer($ampel_benutzer_bestaetigt_id)
+	{
+		if(!is_numeric($ampel_benutzer_bestaetigt_id))
+		{
+			$this->errormsg='ID ist ungueltig';
+			return false;
+		}
+		$qry = "DELETE FROM public.tbl_ampel_benutzer_bestaetigt WHERE ampel_benutzer_bestaetigt_id=".$this->db_add_param($ampel_benutzer_bestaetigt_id);
+	
+		if($this->db_query($qry))
+			return true;
+		else
+		{
+			$this->errormsg = 'Fehler beim Loeschen der Bestaetigung';
+			return false;
+		}
+	}
+	
+	/**
+	 * Bestaetigt die Ampel eines Users
+	 * @param $user
+	 * @param $ampel_id
+	 * @return boolean
+	 */
+	public function bestaetigen($user, $ampel_id)
+	{
+		$qry = 'INSERT INTO public.tbl_ampel_benutzer_bestaetigt(ampel_id, uid, insertamum, insertvon) VALUES('.
+				$this->db_add_param($ampel_id, FHC_INTEGER).','.
+				$this->db_add_param($user).','.
+				'now(),'.
+				$this->db_add_param($user).');';
+				
+		if($this->db_query($qry))
+			return true;
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+	
+	/**
+	 * Laedt Ampeln und Mitarbeiter zu einer OE/Ampel
+	 * @param $oe_arr
+	 * @param $ampel_id
+	 */
+	public function loadAmpelMitarbeiter($oe_arr, $ampel_id)
+	{
+		$sprache = new sprache();
+		$beschreibung = $sprache->getSprachQuery('beschreibung');
+		$buttontext = $sprache->getSprachQuery('buttontext');
+		
+		if(!is_numeric($ampel_id) && $ampel_id!='')
+		{
+			$this->errormsg = 'Ampel ID ist ungueltig';
+			return false;
+		}
+		
+		// Ampeln holen
+		$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
+		if($ampel_id!='')
+			$qry.=" WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER);
+			
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				// Alle Mitarbeiter/Studenten dazu holen
+				$qry = "SELECT 
+							distinct on (tbl_ampel_benutzer_bestaetigt.ampel_benutzer_bestaetigt_id, a.uid) *,
+							tbl_ampel_benutzer_bestaetigt.insertamum,tbl_ampel_benutzer_bestaetigt.insertvon							
+						FROM 
+							(".$row->benutzer_select.") a 
+							JOIN campus.vw_benutzer USING(uid)
+							LEFT JOIN public.tbl_benutzerfunktion USING(uid)
+							LEFT JOIN public.tbl_ampel_benutzer_bestaetigt on(public.tbl_ampel_benutzer_bestaetigt.uid=a.uid AND ampel_id=".$this->db_add_param($row->ampel_id, FHC_INTEGER).")
+						WHERE
+							(tbl_ampel_benutzer_bestaetigt.ampel_id is null OR tbl_ampel_benutzer_bestaetigt.ampel_id=".$this->db_add_param($row->ampel_id).")
+							AND
+							(
+								(funktion_kurzbz='oezuordnung' AND oe_kurzbz in(".$this->implode4SQL($oe_arr)."))
+								OR
+								(funktion_kurzbz is null 
+								 AND (SELECT oe_kurzbz FROM 
+								 	  public.tbl_studiengang JOIN public.tbl_student USING(studiengang_kz) 
+								 	  WHERE vw_benutzer.uid=tbl_student.student_uid)
+								 	 in(".$this->implode4SQL($oe_arr).")
+								)
+							)
+						";
+
+				if($result_ma = $this->db_query($qry))
+				{
+					while($row_ma = $this->db_fetch_object($result_ma))
+					{
+						$obj = new ampel();
+						
+						$obj->ampel_id = $row->ampel_id;
+						$obj->kurzbz = $row->kurzbz;
+						$obj->beschreibung = $sprache->parseSprachResult('beschreibung', $row);
+						$obj->benutzer_select = $row->benutzer_select;
+						$obj->deadline = $row->deadline;
+						$obj->vorlaufzeit = $row->vorlaufzeit;
+						$obj->verfallszeit = $row->verfallszeit;
+						$obj->email = $row->email;
+						$obj->verpflichtend = $row->verpflichtend;
+						$obj->buttontext = $sprache->parseSprachResult('buttontext', $row);
+						$obj->insertamum = $row->insertamum;
+						$obj->insertvon = $row->insertvon;
+						
+						$obj->vorname = $row_ma->vorname;
+						$obj->nachname = $row_ma->nachname;
+						$obj->titelpre = $row_ma->titelpre;
+						$obj->titelpost = $row_ma->titelpost;
+						$obj->oe_kurzbz = $row_ma->oe_kurzbz;
+						
+						$obj->insertamum_best = $row_ma->insertamum;
+						$obj->insertvon_best = $row_ma->insertvon;
+						$obj->ampel_benutzer_bestaetigt_id = $row_ma->ampel_benutzer_bestaetigt_id;
+						
+						$this->result[] = $obj;
+					}
+				}
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+		
+	}
+}
+?>
diff --git a/include/datum.class.php b/include/datum.class.php
index 1206ae6f0..90ba0066c 100644
--- a/include/datum.class.php
+++ b/include/datum.class.php
@@ -1,400 +1,400 @@
-<?php
-/* Copyright (C) 2006 Technikum-Wien
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * 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> and
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
- */
-
-class datum
-{
-	public $ts_day=86400;	// Timestamp eines Tages
-
-	/**
-	 * Konstruktor
-	 *
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * Liefert einen UNIX Timestamp von einem String im
-	 * Format "31.12.2007 14:30"
-	 */
-	public function mktime_datumundzeit($datumundzeit)
-	{
-		if(mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4}) ([0-9]{2}):([0-9]{2})",$datumundzeit, $regs))
-			return mktime($regs[4],$regs[5],0,$regs[2],$regs[1],$regs[3]);
-		else
-		{
-			$this->errormsg = 'Falsches Datumsformat';
-			return false;
-		}
-	}
-
-	/**
-	 * Liefert einen UNIX Timestamp von einem String im
-	 * Format "31.12.2007"
-	 */
-	public function mktime_datum($datum)
-	{
-		if(mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4})",$datum, $regs))
-		{
-			return mktime(0,0,0,$regs[2],$regs[1],$regs[3]);
-		}
-		else
-		{
-			$this->errormsg = 'Falsches Datumsformat';
-			return false;
-		}
-	}
-
-	/**
-	 * Liefert einen UNIX Timestamp von einem Datum im
-	 * ISO-Format "2007-01-31"
-	 */
-	public function mktime_fromdate($datum)
-	{
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$datum, $regs))
-		{
-			return mktime(0,0,0,$regs[2],$regs[3],$regs[1]);
-		}
-		else
-		{
-			$this->errormsg = 'Falsches Datumsformat';
-			return false;
-		}
-	}
-
-	/**
-	 * Liefert einen UNIX Timestamp von einem String im
-	 * Format "2007-01-31 14:30:12"
-	 */
-	public function mktime_fromtimestamp($timestamp)
-	{
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$timestamp, $regs))
-		{
-			return mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
-		}
-		else
-		{
-			$this->errormsg = 'Falsches Datumsformat';
-			return false;
-		}
-	}
-
-	/**
-	 * Springt von einen UNIX Timestamp ($datum) $wochen nach vor bzw. hinten
-	 */
-	public function jump_week($datum, $wochen)
-	{
-		$days = $wochen * 7;
-
-		$datetime=new DateTime();
-		$datetime->setTimestamp($datum);
-		$datetime->modify($days.' day');
-		return $datetime->format("U");
-	}
-
-	/**
-	 * Springt von einen UNIX Timestamp ($datum) $days nach vor bzw. hinten
-	 */
-	public function jump_day($datum, $days)
-	{
-		$stunde_vor=date("G",$datum);
-		// Ein Tag sind 86400 Sekunden
-		$datum+=86400*$days;
-		$stunde_nach=date("G",$datum);
-		if ($stunde_nach!=$stunde_vor)
-			$datum+=3600;
-		return $datum;
-	}
-
-	/**
-	 * Konvertiert das ISO Datumsformat (YYYY-MM-DD)
-	 * nach (DD.MM.YYYY)
-	 */
-	public function convertISODate($datum)
-	{
-		return (mb_strlen($datum)>0?date('d.m.Y',strtotime($datum)):'');
-	}
-
-
-	/**
-	 * Prueft Uhrzeit auf Gueltigkeit (HH:MM:SS)
-	 * @return true wenn ok, false wenn falsches Format
-	 */
-	public function checkUhrzeit($uhrzeit)
-	{
-		if(mb_ereg("([0-9]{2}):([0-9]{2})(:([0-9]{2}))?$",$uhrzeit))
-			return true;
-		else
-			return false;
-	}
-
-	/**
-	 * Prueft ob das Datum im Format dd.mm.YYYY oder YYYY-mm-dd ist
-	 * @return true wenn ok, false wenn falsches Format
-	 */
-	public function checkDatum($datum)
-	{
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})$",$datum) || mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4})$",$datum))
-			return true;
-		else
-			return false;
-	}
-
-	/**
-	 * Zieht ein Datum von einem anderen ab, und gibt die differenz in Tagen zurueck (mit Vorzeichen)
-	 * @param $datum1
-	 * @param $datum2
-	 */
-	public function DateDiff($datum1, $datum2)
-	{
-		$datetime1 = new DateTime($datum1);
-		$datetime2 = new DateTime($datum2);
-		$interval = $datetime1->diff($datetime2);
-		return $interval->format('%R%a');
-	}
-
-	/**
-	 * Prueft ob ein Datum / Datum und Uhrzeit zwischen 2 anderen liegt
-	 * Unterstuetzt auch offenes (leeres) Start und Ende Datum
-	 *
-	 * @param $start Startdatum
-	 * @param $ende Endedatum
-	 * @param $datum Datum das geprueft wird
-	 * @return true wenn dazwischen sonst false
-	 */
-	public function between($start, $ende, $datum)
-	{
-		$datestart = new DateTime($start);
-		$dateende = new DateTime($ende);
-		$dateref = new DateTime($datum);
-
-		// Start und Ende nicht gesetzt
-		if($start=='' && $ende=='')
-			return true;
-
-		// Start nicht gesetzt; Ende gesetzt
-		if($start=='' && $ende!='' && $dateende>=$dateref)
-			return true;
-
-		// Ende nicht gesetzt; Start gesetzt
-		if($ende=='' && $start!='' && $datestart<=$dateref)
-			return true;
-
-		// Start und Ende gesetzt
-		if($ende!='' && $start!='' && $datestart<=$dateref && $dateende>=$dateref)
-			return true;
-
-		return false;
-	}
-
-	/**
-	 * Summiert 2 Zeiten Stunde:Minute
-	 * Es liefert keine Uhrzeit zurueck sondern Stunden und Minuten
-	 * zB 12:10 + 23:15 = 35:25
-	 *
-	 * @param $zeit1
-	 * @param $zeit2
-	 * @return summe der beiden zeiten im Format Stunden:Minuten
-	 */
-	public function sumZeit($zeit1, $zeit2)
-	{
-		list($h1, $m1) = explode(':', $zeit1);
-		list($h2, $m2) = explode(':', $zeit2);
-
-		$m1 +=$m2;
-
-		if($m1>=60)
-		{
-			$uebertrag = (int)($m1/60);
-			$h1+= $uebertrag;
-		}
-		$m1=$m1%60;
-		$h1+=$h2;
-		if($m1<10)
-			$m1='0'.$m1;
-		if($h1<10)
-			$h1='0'.$h1;
-
-		return $h1.':'.$m1;
-	}
-
-	/**
-	 * Subtrahiert 2 Zeiten ($zeit1-$zeit2) Stunde:Minute
-	 * Es liefert keine Uhrzeit zurueck sondern Stunden und Minuten
-	 * zB 23:15 - 12:10 = 11:05
-	 *
-	 * @param $zeit1
-	 * @param $zeit2
-	 * @return subtraktion der beiden zeiten im Format Stunden:Minuten, null wenn zeit 1 kleiner als zeit2 ist
-	 */
-	public function subZeit($zeit1, $zeit2)
-	{
-		list($h1, $m1) = explode(':', $zeit1);
-		list($h2, $m2) = explode(':', $zeit2);
-
-		if($h1<$h2)
-			return null;
-		else if($h1 == $h2 && $m1<$m2)
-			return null;
-
-		$m1 -=$m2;
-//echo $h1.','.$m1.','.$h2.','.$m2;
-		if($m1<0)
-		{
-			$m1 = $m1 + 60;
-			$h1 = (int)$h1-1;
-		}
-		$m1=$m1%60;
-		$h1-=$h2;
-		if($m1<10)
-			$m1='0'.$m1;
-		if($h1<10)
-			$h1='0'.$h1;
-
-		return $h1.':'.$m1;
-	}
-
-	/**
-	 * Prueft und Liefert ein Datum im angegeben Format
-	 *   		fuer die Formatierung wird die Funktion formatDatum verwendet
-	 * @param $datum
-	 * @param $format
-	 * @param $strict wenn das Datum aus einem Suchfeld komment, dann strict auf TRUE setzen da sonst
-	 * 				  Eintraege wie zB 'last Monday' oder 'a' auch in ein Datum umgewandelt werden.
-	 * @return Formatierten Timestamp wenn ok, false im Fehlerfall
-	 */
-	function checkformatDatum($datum, $format='Y-m-d H:i:s', $strict=false)
-	{
-
-			@list($day, $month, $year) = @explode(".", $datum);
-			if (@checkdate($month, $day, $year))
-				return $this->formatDatum($datum, $format, $strict);
-			@list($day, $month, $year) = @explode("-", $datum);
-			if (@checkdate($month, $day, $year))
-				return $this->formatDatum($datum, $format, $strict);
-			@list($year, $month, $day) = @explode(".", $datum);
-			if (@checkdate($month, $day, $year))
-				return $this->formatDatum($datum, $format, $strict);
-			@list($year, $month, $day) = @explode("-", $datum);
-			if (@checkdate($month, $day, $year))
-				return $this->formatDatum($datum, $format, $strict);
-
-			if (strlen($datum)==6)
-			{
-				$year="20".substr($datum,0,2);
-				$month=substr($datum,2,2);
-				$day=substr($datum,4,2);
-				if (@checkdate($month, $day, $year))
-					return $this->formatDatum($datum, $format, $strict);
-			}
-			else if (strlen($datum)==8)
-			{
-				$year=substr($datum,0,4);
-				$month=substr($datum,4,2);
-				$day=substr($datum,	6,2);
-				if (@checkdate($month, $day, $year))
-					return $this->formatDatum($datum, $format, $strict);
-
-				$year=substr($datum,5,4);
-				$month=substr($datum,3,2);
-				$day=substr($datum,	0,2);
-				if (@checkdate($month, $day, $year))
-					return $this->formatDatum($datum, $format, $strict);
-			}
-			return false;
-		}
-
-
-	/**
-	 * Liefert ein Datum im angegeben Format
-	 * ToDo: Liefert aktuellen Timestamp wenn Sonderzeichen uebergeben werden
-	 *       zB '---'
-	 * @param $datum
-	 * @param $format
-	 * @param $strict wenn das Datum aus einem Suchfeld kommt, dann strict auf TRUE setzen da sonst
-	 * 				  Eintraege wie zB 'last Monday' oder 'a' auch in ein Datum umgewandelt werden.
-	 * @return Formatierten Timestamp wenn ok, false im Fehlerfall
-	 */
-	public function formatDatum($datum, $format='Y-m-d H:i:s', $strict=false)
-	{
-		if(trim($datum)=='')
-			return '';
-
-		$ts='';
-		$error=false;
-
-		//2008-12-31
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$datum, $regs))
-			$ts = mktime(0,0,0,$regs[2],$regs[3],$regs[1]);
-
-		//2008-12-31 12:30
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2})",$datum, $regs))
-			$ts = mktime($regs[4],$regs[5],0,$regs[2],$regs[3],$regs[1]);
-
-		//2008-12-31 12:30:15
-		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$datum, $regs))
-			$ts = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
-
-		if($ts=='')
-		{
-			//1.12.2008
-			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})",$datum, $regs))
-				$ts = mktime(0,0,0,$regs[2],$regs[1],$regs[3]);
-
-			//1.12.2008 12:30
-			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4}) ([0-9]{2}):([0-9]{2})",$datum, $regs))
-				$ts = mktime($regs[4],$regs[5],0,$regs[2],$regs[1],$regs[3]);
-
-			//1.12.2008 12:30:15
-			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$datum, $regs))
-				$ts = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[1],$regs[3]);
-		}
-
-		if($ts=='' && !$strict)
-		{
-			$ts = strtotime($datum);
-
-			if(!$ts || $ts==-1)
-			{
-				//wenn strtotime fehlschlaegt liefert diese -1 zurueck, ab php5.1.0 jedoch false
-				$error = true;
-			}
-		}
-
-		if($ts!='' && !$error)
-			return date($format, $ts);
-
-		return false;
-	}
-
-	/**
-	 * konvertiert Zeit in format stunden:minuten in Stunden als Dezimalahl
-	 * @param $timestring in Form stunden:minuten
-	 * @return int Stundenzahl als Dezimalzahl
-	 */
-	public function convertTimeStringToHours($timestring)
-	{
-		return intval(substr($timestring, 0, 2)) + intval(substr($timestring, 3, 2)) / 60;
-	}
-
-}
-?>
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+class datum
+{
+	public $ts_day=86400;	// Timestamp eines Tages
+
+	/**
+	 * Konstruktor
+	 *
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Liefert einen UNIX Timestamp von einem String im
+	 * Format "31.12.2007 14:30"
+	 */
+	public function mktime_datumundzeit($datumundzeit)
+	{
+		if(mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4}) ([0-9]{2}):([0-9]{2})",$datumundzeit, $regs))
+			return mktime($regs[4],$regs[5],0,$regs[2],$regs[1],$regs[3]);
+		else
+		{
+			$this->errormsg = 'Falsches Datumsformat';
+			return false;
+		}
+	}
+
+	/**
+	 * Liefert einen UNIX Timestamp von einem String im
+	 * Format "31.12.2007"
+	 */
+	public function mktime_datum($datum)
+	{
+		if(mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4})",$datum, $regs))
+		{
+			return mktime(0,0,0,$regs[2],$regs[1],$regs[3]);
+		}
+		else
+		{
+			$this->errormsg = 'Falsches Datumsformat';
+			return false;
+		}
+	}
+
+	/**
+	 * Liefert einen UNIX Timestamp von einem Datum im
+	 * ISO-Format "2007-01-31"
+	 */
+	public function mktime_fromdate($datum)
+	{
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$datum, $regs))
+		{
+			return mktime(0,0,0,$regs[2],$regs[3],$regs[1]);
+		}
+		else
+		{
+			$this->errormsg = 'Falsches Datumsformat';
+			return false;
+		}
+	}
+
+	/**
+	 * Liefert einen UNIX Timestamp von einem String im
+	 * Format "2007-01-31 14:30:12"
+	 */
+	public function mktime_fromtimestamp($timestamp)
+	{
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$timestamp, $regs))
+		{
+			return mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
+		}
+		else
+		{
+			$this->errormsg = 'Falsches Datumsformat';
+			return false;
+		}
+	}
+
+	/**
+	 * Springt von einen UNIX Timestamp ($datum) $wochen nach vor bzw. hinten
+	 */
+	public function jump_week($datum, $wochen)
+	{
+		$days = $wochen * 7;
+
+		$datetime=new DateTime();
+		$datetime->setTimestamp($datum);
+		$datetime->modify($days.' day');
+		return $datetime->format("U");
+	}
+
+	/**
+	 * Springt von einen UNIX Timestamp ($datum) $days nach vor bzw. hinten
+	 */
+	public function jump_day($datum, $days)
+	{
+		$stunde_vor=date("G",$datum);
+		// Ein Tag sind 86400 Sekunden
+		$datum+=86400*$days;
+		$stunde_nach=date("G",$datum);
+		if ($stunde_nach!=$stunde_vor)
+			$datum+=3600;
+		return $datum;
+	}
+
+	/**
+	 * Konvertiert das ISO Datumsformat (YYYY-MM-DD)
+	 * nach (DD.MM.YYYY)
+	 */
+	public function convertISODate($datum)
+	{
+		return (mb_strlen($datum)>0?date('d.m.Y',strtotime($datum)):'');
+	}
+
+
+	/**
+	 * Prueft Uhrzeit auf Gueltigkeit (HH:MM:SS)
+	 * @return true wenn ok, false wenn falsches Format
+	 */
+	public function checkUhrzeit($uhrzeit)
+	{
+		if(mb_ereg("([0-9]{2}):([0-9]{2})(:([0-9]{2}))?$",$uhrzeit))
+			return true;
+		else
+			return false;
+	}
+
+	/**
+	 * Prueft ob das Datum im Format dd.mm.YYYY oder YYYY-mm-dd ist
+	 * @return true wenn ok, false wenn falsches Format
+	 */
+	public function checkDatum($datum)
+	{
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})$",$datum) || mb_ereg("([0-9]{2}).([0-9]{2}).([0-9]{4})$",$datum))
+			return true;
+		else
+			return false;
+	}
+
+	/**
+	 * Zieht ein Datum von einem anderen ab, und gibt die differenz in Tagen zurueck (mit Vorzeichen)
+	 * @param $datum1
+	 * @param $datum2
+	 */
+	public function DateDiff($datum1, $datum2)
+	{
+		$datetime1 = new DateTime($datum1);
+		$datetime2 = new DateTime($datum2);
+		$interval = $datetime1->diff($datetime2);
+		return $interval->format('%R%a');
+	}
+
+	/**
+	 * Prueft ob ein Datum / Datum und Uhrzeit zwischen 2 anderen liegt
+	 * Unterstuetzt auch offenes (leeres) Start und Ende Datum
+	 *
+	 * @param $start Startdatum
+	 * @param $ende Endedatum
+	 * @param $datum Datum das geprueft wird
+	 * @return true wenn dazwischen sonst false
+	 */
+	public function between($start, $ende, $datum)
+	{
+		$datestart = new DateTime($start);
+		$dateende = new DateTime($ende);
+		$dateref = new DateTime($datum);
+
+		// Start und Ende nicht gesetzt
+		if($start=='' && $ende=='')
+			return true;
+
+		// Start nicht gesetzt; Ende gesetzt
+		if($start=='' && $ende!='' && $dateende>=$dateref)
+			return true;
+
+		// Ende nicht gesetzt; Start gesetzt
+		if($ende=='' && $start!='' && $datestart<=$dateref)
+			return true;
+
+		// Start und Ende gesetzt
+		if($ende!='' && $start!='' && $datestart<=$dateref && $dateende>=$dateref)
+			return true;
+
+		return false;
+	}
+
+	/**
+	 * Summiert 2 Zeiten Stunde:Minute
+	 * Es liefert keine Uhrzeit zurueck sondern Stunden und Minuten
+	 * zB 12:10 + 23:15 = 35:25
+	 *
+	 * @param $zeit1
+	 * @param $zeit2
+	 * @return summe der beiden zeiten im Format Stunden:Minuten
+	 */
+	public function sumZeit($zeit1, $zeit2)
+	{
+		list($h1, $m1) = explode(':', $zeit1);
+		list($h2, $m2) = explode(':', $zeit2);
+
+		$m1 +=$m2;
+
+		if($m1>=60)
+		{
+			$uebertrag = (int)($m1/60);
+			$h1+= $uebertrag;
+		}
+		$m1=$m1%60;
+		$h1+=$h2;
+		if($m1<10)
+			$m1='0'.$m1;
+		if($h1<10)
+			$h1='0'.$h1;
+
+		return $h1.':'.$m1;
+	}
+
+	/**
+	 * Subtrahiert 2 Zeiten ($zeit1-$zeit2) Stunde:Minute
+	 * Es liefert keine Uhrzeit zurueck sondern Stunden und Minuten
+	 * zB 23:15 - 12:10 = 11:05
+	 *
+	 * @param $zeit1
+	 * @param $zeit2
+	 * @return subtraktion der beiden zeiten im Format Stunden:Minuten, null wenn zeit 1 kleiner als zeit2 ist
+	 */
+	public function subZeit($zeit1, $zeit2)
+	{
+		list($h1, $m1) = explode(':', $zeit1);
+		list($h2, $m2) = explode(':', $zeit2);
+
+		if($h1<$h2)
+			return null;
+		else if($h1 == $h2 && $m1<$m2)
+			return null;
+
+		$m1 -=$m2;
+//echo $h1.','.$m1.','.$h2.','.$m2;
+		if($m1<0)
+		{
+			$m1 = $m1 + 60;
+			$h1 = (int)$h1-1;
+		}
+		$m1=$m1%60;
+		$h1-=$h2;
+		if($m1<10)
+			$m1='0'.$m1;
+		if($h1<10)
+			$h1='0'.$h1;
+
+		return $h1.':'.$m1;
+	}
+
+	/**
+	 * Prueft und Liefert ein Datum im angegeben Format
+	 *   		fuer die Formatierung wird die Funktion formatDatum verwendet
+	 * @param $datum
+	 * @param $format
+	 * @param $strict wenn das Datum aus einem Suchfeld komment, dann strict auf TRUE setzen da sonst
+	 * 				  Eintraege wie zB 'last Monday' oder 'a' auch in ein Datum umgewandelt werden.
+	 * @return Formatierten Timestamp wenn ok, false im Fehlerfall
+	 */
+	function checkformatDatum($datum, $format='Y-m-d H:i:s', $strict=false)
+	{
+
+			@list($day, $month, $year) = @explode(".", $datum);
+			if (@checkdate($month, $day, $year))
+				return $this->formatDatum($datum, $format, $strict);
+			@list($day, $month, $year) = @explode("-", $datum);
+			if (@checkdate($month, $day, $year))
+				return $this->formatDatum($datum, $format, $strict);
+			@list($year, $month, $day) = @explode(".", $datum);
+			if (@checkdate($month, $day, $year))
+				return $this->formatDatum($datum, $format, $strict);
+			@list($year, $month, $day) = @explode("-", $datum);
+			if (@checkdate($month, $day, $year))
+				return $this->formatDatum($datum, $format, $strict);
+
+			if (strlen($datum)==6)
+			{
+				$year="20".substr($datum,0,2);
+				$month=substr($datum,2,2);
+				$day=substr($datum,4,2);
+				if (@checkdate($month, $day, $year))
+					return $this->formatDatum($datum, $format, $strict);
+			}
+			else if (strlen($datum)==8)
+			{
+				$year=substr($datum,0,4);
+				$month=substr($datum,4,2);
+				$day=substr($datum,	6,2);
+				if (@checkdate($month, $day, $year))
+					return $this->formatDatum($datum, $format, $strict);
+
+				$year=substr($datum,5,4);
+				$month=substr($datum,3,2);
+				$day=substr($datum,	0,2);
+				if (@checkdate($month, $day, $year))
+					return $this->formatDatum($datum, $format, $strict);
+			}
+			return false;
+		}
+
+
+	/**
+	 * Liefert ein Datum im angegeben Format
+	 * ToDo: Liefert aktuellen Timestamp wenn Sonderzeichen uebergeben werden
+	 *       zB '---'
+	 * @param $datum
+	 * @param $format
+	 * @param $strict wenn das Datum aus einem Suchfeld kommt, dann strict auf TRUE setzen da sonst
+	 * 				  Eintraege wie zB 'last Monday' oder 'a' auch in ein Datum umgewandelt werden.
+	 * @return Formatierten Timestamp wenn ok, false im Fehlerfall
+	 */
+	public function formatDatum($datum, $format='Y-m-d H:i:s', $strict=false)
+	{
+		if(trim($datum)=='')
+			return '';
+
+		$ts='';
+		$error=false;
+
+		//2008-12-31
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$datum, $regs))
+			$ts = mktime(0,0,0,$regs[2],$regs[3],$regs[1]);
+
+		//2008-12-31 12:30
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2})",$datum, $regs))
+			$ts = mktime($regs[4],$regs[5],0,$regs[2],$regs[3],$regs[1]);
+
+		//2008-12-31 12:30:15
+		if(mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$datum, $regs))
+			$ts = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
+
+		if($ts=='')
+		{
+			//1.12.2008
+			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})",$datum, $regs))
+				$ts = mktime(0,0,0,$regs[2],$regs[1],$regs[3]);
+
+			//1.12.2008 12:30
+			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4}) ([0-9]{2}):([0-9]{2})",$datum, $regs))
+				$ts = mktime($regs[4],$regs[5],0,$regs[2],$regs[1],$regs[3]);
+
+			//1.12.2008 12:30:15
+			if(mb_ereg("([0-9]{1,2}).([0-9]{1,2}).([0-9]{4}) ([0-9]{2}):([0-9]{2}):([0-9]{2})",$datum, $regs))
+				$ts = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[1],$regs[3]);
+		}
+
+		if($ts=='' && !$strict)
+		{
+			$ts = strtotime($datum);
+
+			if(!$ts || $ts==-1)
+			{
+				//wenn strtotime fehlschlaegt liefert diese -1 zurueck, ab php5.1.0 jedoch false
+				$error = true;
+			}
+		}
+
+		if($ts!='' && !$error)
+			return date($format, $ts);
+
+		return false;
+	}
+
+	/**
+	 * konvertiert Zeit in format stunden:minuten in Stunden als Dezimalahl
+	 * @param $timestring in Form stunden:minuten
+	 * @return int Stundenzahl als Dezimalzahl
+	 */
+	public function convertTimeStringToHours($timestring)
+	{
+		return intval(substr($timestring, 0, 2)) + intval(substr($timestring, 3, 2)) / 60;
+	}
+
+}
+?>
diff --git a/include/mail.class.php b/include/mail.class.php
index 94d6f4344..b0285c11b 100644
--- a/include/mail.class.php
+++ b/include/mail.class.php
@@ -96,7 +96,8 @@ class mail
 
 		$header .= 'X-Mailer: FHComplete V1'.$eol; 
 	  	$header .= 'Mime-Version: 1.0'.$eol;
-		$header .= "Content-Type: multipart/mixed; boundary=\"$mime_boundary_mixed\"".$eol;
+		$header .= "Content-Type: multipart/related; boundary=\"$mime_boundary_mixed\"".$eol;
+		$header .= "Content-Transfer-Encoding: 8bit".$eol;
 		
 		// Body
 		$mailbody = "";
@@ -152,7 +153,7 @@ class mail
 				$dispo = empty($attachment[3]) ? 'attachment' : 'inline';
 				$mailbody .= $eol;
 				$mailbody .= "Content-Disposition: $dispo; filename={$attachment[2]}".$eol;
-				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;
+				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;					
 				if (!empty($attachment[3])) 
 				{
 					$mailbody .= "Content-ID: <{$attachment[3]}>".$eol;
@@ -231,6 +232,26 @@ class mail
 		return true;
 	}
 	
+	/**
+	 * Fuegt ein Bild zum Mail hinzu
+	 * $image	image-URL
+	 * $type	MIME Type "image/[image-type]", zB "image/jpg"
+	 * $name	Anzeigename des Files
+	 * $ContentID ContentID für inline-embedding (diese muss im script im tag <img src="cid:ContentID"> angegeben werden)
+	 */
+	public function addEmbeddedImage ($image, $type, $name = '', $ContentID)
+	{
+		$image_string = file_get_contents($image);
+		if (!$image_string) 
+		{
+			$this->errormsg = 'Fehler beim Einlesen der Datei';
+			return false;
+		}
+		
+		$image_b64 = chunk_split(base64_encode($image_string), 76, "\n");
+		$this->attachments[] = Array($image_b64, $type, $name, $ContentID);
+	}
+	
 	/**
 	 * Fuegt ein Attachment zum Mail hinzu
 	 * $content
diff --git a/locale/de-AT/global.php b/locale/de-AT/global.php
index d13729ba5..e8308806a 100644
--- a/locale/de-AT/global.php
+++ b/locale/de-AT/global.php
@@ -4,6 +4,7 @@ $this->phrasen['global/studienrichtung']='Studienrichtung';
 $this->phrasen['global/institut']='Institut';
 $this->phrasen['global/semester']='Semester';
 $this->phrasen['global/studiensemester']='Studiensemester';
+$this->phrasen['global/studienplan']='Studienplan';
 $this->phrasen['global/studienzentrum']='Studienzentrum';
 $this->phrasen['global/studiengangsleitung']='Studiengangsleitung';
 $this->phrasen['global/leitung']='Leitung';
diff --git a/locale/en-US/global.php b/locale/en-US/global.php
index 3a614ac46..c34ae6771 100644
--- a/locale/en-US/global.php
+++ b/locale/en-US/global.php
@@ -4,6 +4,7 @@ $this->phrasen['global/studienrichtung']='Degree-Program';
 $this->phrasen['global/institut']='Institute';
 $this->phrasen['global/semester']='Semester';
 $this->phrasen['global/studiensemester']='Semester';
+$this->phrasen['global/studienplan']='Study Plan';
 $this->phrasen['global/studienzentrum']='Study Center';
 $this->phrasen['global/studiengangsleitung']='Program Director';
 $this->phrasen['global/leitung']='Head';
diff --git a/locale/it-IT/global.php b/locale/it-IT/global.php
index 82f61b10b..f549662f0 100644
--- a/locale/it-IT/global.php
+++ b/locale/it-IT/global.php
@@ -1,158 +1,159 @@
-<?php
-$this->phrasen['global/abbrechen']='annulla';
-$this->phrasen['global/abmelden']='esci';
-$this->phrasen['global/abschicken']='Invia ';
-$this->phrasen['global/adresse']='indirizzo';
-$this->phrasen['global/aendern']='modifica';
-$this->phrasen['global/aktion']='azione';
-$this->phrasen['global/alle']='tutti';
-$this->phrasen['global/allgemeinerdownload']='download generale';
-$this->phrasen['global/angelegtAm']='registrato il ';
-$this->phrasen['global/angemeldet']='iscritto';
-$this->phrasen['global/anleitung']='istruzioni';
-$this->phrasen['global/anmelden']='iscriversi';
-$this->phrasen['global/anmerkung']='osservazioni';
-$this->phrasen['global/anmerkungen']='osservazioni';
-$this->phrasen['global/anzeigen']='mostra';
-$this->phrasen['global/ausblenden']='';
-$this->phrasen['global/auswaehlen']='';
-$this->phrasen['global/auswahl']='';
-$this->phrasen['global/bearbeiten']='modifica';
-$this->phrasen['global/beginn']='inizio';
-$this->phrasen['global/beispiele']='esempi';
-$this->phrasen['global/benutzer']='utente';
-$this->phrasen['global/beschreibung']='descrizione';
-$this->phrasen['global/betreff']='oggetto';
-$this->phrasen['global/bezeichnung']='denominazione';
-$this->phrasen['global/bis']='fino';
-$this->phrasen['global/code']='codice';
-$this->phrasen['global/datei']='file';
-$this->phrasen['global/dateiErfolgreichHochgeladen']='il file è stato caricato';
-$this->phrasen['global/dateiExistiertNicht']='il file è inesistente';
-$this->phrasen['global/dateiLoeschen']='cancella file';
-$this->phrasen['global/dateiNichtErfolgreichHochgeladen']='impossibile caricare il file. Si prega di ripetere l\'operazione.';
-$this->phrasen['global/datensatzWurdeNichtGefunden']='impossibile trovare i dati cercati';
-$this->phrasen['global/datenWurdenGespeichert']='i dati sono stati salvati';
-$this->phrasen['global/datum']='Data';
-$this->phrasen['global/datumNichtGesetzt']='non è stata impostata la data';
-$this->phrasen['global/deutsch']='tedesco';
-$this->phrasen['global/dienstag']='martedì';
-$this->phrasen['global/donnerstag']='giovedì ';
-$this->phrasen['global/download']='download';
-$this->phrasen['global/editieren']='editare';
-$this->phrasen['global/eintragen']='registrare';
-$this->phrasen['global/eintragWurdeGeloescht']='cancellata registrazione';
-$this->phrasen['global/emailAdresse']='indirizzo e-mail';
-$this->phrasen['global/emailAnAssistenz']='e-mail alla segreteria';
-$this->phrasen['global/emailgesendetan']='spedisci e-mail a';
-$this->phrasen['global/ende']='fine';
-$this->phrasen['global/englisch']='inglese';
-$this->phrasen['global/entfernen']='cestina';
-$this->phrasen['global/erfolgreichAngelegt']='ok, registrato';
-$this->phrasen['global/erfolgreichgelöscht']='ok, cancellato';
-$this->phrasen['global/erfolgreichgespeichert']='ok, salvato';
-$this->phrasen['global/erstellen']='crea';
-$this->phrasen['global/fax']='fax';
-$this->phrasen['global/fehleraufgetreten']='è avvenuto un errore';
-$this->phrasen['global/fehlerBeiDerParameteruebergabe']='errore di trasmissione dei parametri';
-$this->phrasen['global/fehlerBeimAktualisierenDerDaten']='errore di aggiornamento dei dati';
-$this->phrasen['global/fehlerBeimErmittelnDerUID ']='errore di ricerca della UID';
-$this->phrasen['global/fehlerBeimLadenDesDatensatzes']='errore di caricamento dei dati';
-$this->phrasen['global/fehlerBeimLesenAusDatenbank']='errore di lettura dalla banca dati';
-$this->phrasen['global/fehlerBeimLoeschenDesEintrags']='errore di cancellazione della registrazione';
-$this->phrasen['global/fehlerBeimOeffnenDerDatenbankverbindung']='errore di apertura del collegamento con la banca dati';
-$this->phrasen['global/fehlerBeimSpeichernDerDaten']='errore di salvataggio dati';
-$this->phrasen['global/fhTechnikumWien']='SFU';
-$this->phrasen['global/fhtw']='Sigmund Freud PrivatUniversität';
-$this->phrasen['global/frau']='Sig.ra';
-$this->phrasen['global/freitag']='venerdì';
-$this->phrasen['global/FuerDieseAktionBenoetigenSieAdministrationsrechte']='per questa azione si necessita l\'amministratore del sistema';
-$this->phrasen['global/funktion']='funzione';
-$this->phrasen['global/geburtsdatum']='Data di nascita';
-$this->phrasen['global/geburtsort']='Luogo di nascita';
-$this->phrasen['global/geschaeftsfuehrendeltg']='Amministratore';
-$this->phrasen['global/geschlecht']='';
-$this->phrasen['global/gruppe']='Gruppo';
-$this->phrasen['global/handbuch']='Manuale';
-$this->phrasen['global/handy']='Cellulare';
-$this->phrasen['global/hauptwohnsitz']='Residenza ';
-$this->phrasen['global/hilfe']='Assistenza';
-$this->phrasen['global/hinzufuegen']='aggiungi';
-$this->phrasen['global/institut']='Istituto';
-$this->phrasen['global/ja']='sì';
-$this->phrasen['global/kalender']='Calendario';
-$this->phrasen['global/keineBerechtigung']='non autorizzato';
-$this->phrasen['global/keineBerechtigungFuerDieseSeite']='errore di autorizzazione per questa pagina';
-$this->phrasen['global/keineBerechtigungZumAendernDesDatensatzes']='errore di autorizzazione per modificare i dati';
-$this->phrasen['global/keineDatenGefunden']='impossibile trovare i dati';
-$this->phrasen['global/kopieren']='copia';
-$this->phrasen['global/LDAPserverNichtErreichbar']='il server LDAP non è raggiungibile';
-$this->phrasen['global/lehreinheit']='';
-$this->phrasen['global/lehrveranstaltung']='Insegnamento';
-$this->phrasen['global/lehrziele']='obiettivi di studio';
-$this->phrasen['global/loeschen']='cancella';
-$this->phrasen['global/löschen']='cancella';
-$this->phrasen['global/mail']='messaggio mail';
-$this->phrasen['global/mann']='maschio/uomo';
-$this->phrasen['global/matrikelnummer']='Matricola';
-$this->phrasen['global/minute']='minuti';
-$this->phrasen['global/mittwoch']='mercoledì';
-$this->phrasen['global/montag']='lunedì';
-$this->phrasen['global/nachname']='Cognome';
-$this->phrasen['global/name']='Nome';
-$this->phrasen['global/nebenwohnsitz']='domicilio';
-$this->phrasen['global/nein']='no';
-$this->phrasen['global/neu']='nuovo';
-$this->phrasen['global/newsgroups']='newsgroup';
-$this->phrasen['global/nichtAngemeldet ']='errore di log in: impossibile trovare l\'UID dell\'utente ';
-$this->phrasen['global/nummer']='numero';
-$this->phrasen['global/ok']='ok';
-$this->phrasen['global/organisationseinheit']='Unità organizzativa';
-$this->phrasen['global/organisationseinheiten']='';
-$this->phrasen['global/ort']='luogo';
-$this->phrasen['global/passwort']='Password';
-$this->phrasen['global/person']='persona';
-$this->phrasen['global/personen']='persone ';
-$this->phrasen['global/personenkennzeichen']='Codice Persona';
-$this->phrasen['global/personenkz']='Codice Persona';
-$this->phrasen['global/plz']='CAP';
-$this->phrasen['global/postnomen']='Titolo';
-$this->phrasen['global/samstag']='sabato';
-$this->phrasen['global/sekretariat']='segreteria';
-$this->phrasen['global/semester']='Semestre';
-$this->phrasen['global/sonntag']='domenica';
-$this->phrasen['global/speichern']='salva';
-$this->phrasen['global/sprache']='lingua';
-$this->phrasen['global/staatsbuergerschaft']='cittadinanza';
-$this->phrasen['global/stellvertreter']='supplenza ';
-$this->phrasen['global/strasse']='via';
-$this->phrasen['global/studentenvertreter']='rappresentanti degli studendi';
-$this->phrasen['global/studiengang']='Corso di studi';
-$this->phrasen['global/studiengangKonnteNichtGefundenWerden ']='impossibile trovare corso di studi digitato';
-$this->phrasen['global/studiengangsleitung']='Direzione del corso di studi';
-$this->phrasen['global/studiengangsmanagement']='Management del corso di studi';
-$this->phrasen['global/studienrichtung']='indirizzo di studio';
-$this->phrasen['global/studiensemester']='Semestre di studio';
-$this->phrasen['global/studiensemesterKonnteNichtGefundenWerden ']='impossibile trovare semestre di studio digitato';
-$this->phrasen['global/studienzentrum']='';
-$this->phrasen['global/stunde']='ora';
-$this->phrasen['global/suchen']='cerca';
-$this->phrasen['global/telefon']='telefono';
-$this->phrasen['global/telefonnummer']='numero telefonico';
-$this->phrasen['global/titel']='Titolo';
-$this->phrasen['global/uid']='UID';
-$this->phrasen['global/umbenennen']='cambia nome';
-$this->phrasen['global/unbekannterFehleraufgetreten']='è avvenuto un errore sconosciuto';
-$this->phrasen['global/universität']='università';
-$this->phrasen['global/username']='Username';
-$this->phrasen['global/userNichtGefunden']='';
-$this->phrasen['global/verband']='Gruppo Principale';
-$this->phrasen['global/von']='inizio';
-$this->phrasen['global/vorname']='Nome';
-$this->phrasen['global/warnungWirklichLoeschen']='';
-$this->phrasen['global/zurueck']='Indietro';
-$this->phrasen['global/zuruecksetzen']='';
-$this->phrasen['global/zweck']='';
-$this->phrasen['global/ects']='ECTS';
-
-?>
+<?php
+$this->phrasen['global/abbrechen']='annulla';
+$this->phrasen['global/abmelden']='esci';
+$this->phrasen['global/abschicken']='Invia ';
+$this->phrasen['global/adresse']='indirizzo';
+$this->phrasen['global/aendern']='modifica';
+$this->phrasen['global/aktion']='azione';
+$this->phrasen['global/alle']='tutti';
+$this->phrasen['global/allgemeinerdownload']='download generale';
+$this->phrasen['global/angelegtAm']='registrato il ';
+$this->phrasen['global/angemeldet']='iscritto';
+$this->phrasen['global/anleitung']='istruzioni';
+$this->phrasen['global/anmelden']='iscriversi';
+$this->phrasen['global/anmerkung']='osservazioni';
+$this->phrasen['global/anmerkungen']='osservazioni';
+$this->phrasen['global/anzeigen']='mostra';
+$this->phrasen['global/ausblenden']='';
+$this->phrasen['global/auswaehlen']='';
+$this->phrasen['global/auswahl']='';
+$this->phrasen['global/bearbeiten']='modifica';
+$this->phrasen['global/beginn']='inizio';
+$this->phrasen['global/beispiele']='esempi';
+$this->phrasen['global/benutzer']='utente';
+$this->phrasen['global/beschreibung']='descrizione';
+$this->phrasen['global/betreff']='oggetto';
+$this->phrasen['global/bezeichnung']='denominazione';
+$this->phrasen['global/bis']='fino';
+$this->phrasen['global/code']='codice';
+$this->phrasen['global/datei']='file';
+$this->phrasen['global/dateiErfolgreichHochgeladen']='il file è stato caricato';
+$this->phrasen['global/dateiExistiertNicht']='il file è inesistente';
+$this->phrasen['global/dateiLoeschen']='cancella file';
+$this->phrasen['global/dateiNichtErfolgreichHochgeladen']='impossibile caricare il file. Si prega di ripetere l\'operazione.';
+$this->phrasen['global/datensatzWurdeNichtGefunden']='impossibile trovare i dati cercati';
+$this->phrasen['global/datenWurdenGespeichert']='i dati sono stati salvati';
+$this->phrasen['global/datum']='Data';
+$this->phrasen['global/datumNichtGesetzt']='non è stata impostata la data';
+$this->phrasen['global/deutsch']='tedesco';
+$this->phrasen['global/dienstag']='martedì';
+$this->phrasen['global/donnerstag']='giovedì ';
+$this->phrasen['global/download']='download';
+$this->phrasen['global/editieren']='editare';
+$this->phrasen['global/eintragen']='registrare';
+$this->phrasen['global/eintragWurdeGeloescht']='cancellata registrazione';
+$this->phrasen['global/emailAdresse']='indirizzo e-mail';
+$this->phrasen['global/emailAnAssistenz']='e-mail alla segreteria';
+$this->phrasen['global/emailgesendetan']='spedisci e-mail a';
+$this->phrasen['global/ende']='fine';
+$this->phrasen['global/englisch']='inglese';
+$this->phrasen['global/entfernen']='cestina';
+$this->phrasen['global/erfolgreichAngelegt']='ok, registrato';
+$this->phrasen['global/erfolgreichgelöscht']='ok, cancellato';
+$this->phrasen['global/erfolgreichgespeichert']='ok, salvato';
+$this->phrasen['global/erstellen']='crea';
+$this->phrasen['global/fax']='fax';
+$this->phrasen['global/fehleraufgetreten']='è avvenuto un errore';
+$this->phrasen['global/fehlerBeiDerParameteruebergabe']='errore di trasmissione dei parametri';
+$this->phrasen['global/fehlerBeimAktualisierenDerDaten']='errore di aggiornamento dei dati';
+$this->phrasen['global/fehlerBeimErmittelnDerUID ']='errore di ricerca della UID';
+$this->phrasen['global/fehlerBeimLadenDesDatensatzes']='errore di caricamento dei dati';
+$this->phrasen['global/fehlerBeimLesenAusDatenbank']='errore di lettura dalla banca dati';
+$this->phrasen['global/fehlerBeimLoeschenDesEintrags']='errore di cancellazione della registrazione';
+$this->phrasen['global/fehlerBeimOeffnenDerDatenbankverbindung']='errore di apertura del collegamento con la banca dati';
+$this->phrasen['global/fehlerBeimSpeichernDerDaten']='errore di salvataggio dati';
+$this->phrasen['global/fhTechnikumWien']='SFU';
+$this->phrasen['global/fhtw']='Sigmund Freud PrivatUniversität';
+$this->phrasen['global/frau']='Sig.ra';
+$this->phrasen['global/freitag']='venerdì';
+$this->phrasen['global/FuerDieseAktionBenoetigenSieAdministrationsrechte']='per questa azione si necessita l\'amministratore del sistema';
+$this->phrasen['global/funktion']='funzione';
+$this->phrasen['global/geburtsdatum']='Data di nascita';
+$this->phrasen['global/geburtsort']='Luogo di nascita';
+$this->phrasen['global/geschaeftsfuehrendeltg']='Amministratore';
+$this->phrasen['global/geschlecht']='';
+$this->phrasen['global/gruppe']='Gruppo';
+$this->phrasen['global/handbuch']='Manuale';
+$this->phrasen['global/handy']='Cellulare';
+$this->phrasen['global/hauptwohnsitz']='Residenza ';
+$this->phrasen['global/hilfe']='Assistenza';
+$this->phrasen['global/hinzufuegen']='aggiungi';
+$this->phrasen['global/institut']='Istituto';
+$this->phrasen['global/ja']='sì';
+$this->phrasen['global/kalender']='Calendario';
+$this->phrasen['global/keineBerechtigung']='non autorizzato';
+$this->phrasen['global/keineBerechtigungFuerDieseSeite']='errore di autorizzazione per questa pagina';
+$this->phrasen['global/keineBerechtigungZumAendernDesDatensatzes']='errore di autorizzazione per modificare i dati';
+$this->phrasen['global/keineDatenGefunden']='impossibile trovare i dati';
+$this->phrasen['global/kopieren']='copia';
+$this->phrasen['global/LDAPserverNichtErreichbar']='il server LDAP non è raggiungibile';
+$this->phrasen['global/lehreinheit']='';
+$this->phrasen['global/lehrveranstaltung']='Insegnamento';
+$this->phrasen['global/lehrziele']='obiettivi di studio';
+$this->phrasen['global/loeschen']='cancella';
+$this->phrasen['global/löschen']='cancella';
+$this->phrasen['global/mail']='messaggio mail';
+$this->phrasen['global/mann']='maschio/uomo';
+$this->phrasen['global/matrikelnummer']='Matricola';
+$this->phrasen['global/minute']='minuti';
+$this->phrasen['global/mittwoch']='mercoledì';
+$this->phrasen['global/montag']='lunedì';
+$this->phrasen['global/nachname']='Cognome';
+$this->phrasen['global/name']='Nome';
+$this->phrasen['global/nebenwohnsitz']='domicilio';
+$this->phrasen['global/nein']='no';
+$this->phrasen['global/neu']='nuovo';
+$this->phrasen['global/newsgroups']='newsgroup';
+$this->phrasen['global/nichtAngemeldet ']='errore di log in: impossibile trovare l\'UID dell\'utente ';
+$this->phrasen['global/nummer']='numero';
+$this->phrasen['global/ok']='ok';
+$this->phrasen['global/organisationseinheit']='Unità organizzativa';
+$this->phrasen['global/organisationseinheiten']='';
+$this->phrasen['global/ort']='luogo';
+$this->phrasen['global/passwort']='Password';
+$this->phrasen['global/person']='persona';
+$this->phrasen['global/personen']='persone ';
+$this->phrasen['global/personenkennzeichen']='Codice Persona';
+$this->phrasen['global/personenkz']='Codice Persona';
+$this->phrasen['global/plz']='CAP';
+$this->phrasen['global/postnomen']='Titolo';
+$this->phrasen['global/samstag']='sabato';
+$this->phrasen['global/sekretariat']='segreteria';
+$this->phrasen['global/semester']='Semestre';
+$this->phrasen['global/sonntag']='domenica';
+$this->phrasen['global/speichern']='salva';
+$this->phrasen['global/sprache']='lingua';
+$this->phrasen['global/staatsbuergerschaft']='cittadinanza';
+$this->phrasen['global/stellvertreter']='supplenza ';
+$this->phrasen['global/strasse']='via';
+$this->phrasen['global/studentenvertreter']='rappresentanti degli studendi';
+$this->phrasen['global/studiengang']='Corso di studi';
+$this->phrasen['global/studiengangKonnteNichtGefundenWerden ']='impossibile trovare corso di studi digitato';
+$this->phrasen['global/studiengangsleitung']='Direzione del corso di studi';
+$this->phrasen['global/studiengangsmanagement']='Management del corso di studi';
+$this->phrasen['global/studienrichtung']='indirizzo di studio';
+$this->phrasen['global/studiensemester']='Semestre di studio';
+$this->phrasen['global/studienplan']='Piano di studio';
+$this->phrasen['global/studiensemesterKonnteNichtGefundenWerden ']='impossibile trovare semestre di studio digitato';
+$this->phrasen['global/studienzentrum']='';
+$this->phrasen['global/stunde']='ora';
+$this->phrasen['global/suchen']='cerca';
+$this->phrasen['global/telefon']='telefono';
+$this->phrasen['global/telefonnummer']='numero telefonico';
+$this->phrasen['global/titel']='Titolo';
+$this->phrasen['global/uid']='UID';
+$this->phrasen['global/umbenennen']='cambia nome';
+$this->phrasen['global/unbekannterFehleraufgetreten']='è avvenuto un errore sconosciuto';
+$this->phrasen['global/universität']='università';
+$this->phrasen['global/username']='Username';
+$this->phrasen['global/userNichtGefunden']='';
+$this->phrasen['global/verband']='Gruppo Principale';
+$this->phrasen['global/von']='inizio';
+$this->phrasen['global/vorname']='Nome';
+$this->phrasen['global/warnungWirklichLoeschen']='';
+$this->phrasen['global/zurueck']='Indietro';
+$this->phrasen['global/zuruecksetzen']='';
+$this->phrasen['global/zweck']='';
+$this->phrasen['global/ects']='ECTS';
+
+?>
diff --git a/skin/images/fh_logo.png b/skin/images/fh_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..67efb4b20f5319f5e7886122f574ac289075023f
GIT binary patch
literal 11120
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
ZCg2E(*SA#7VE@Jfa?(mt6%r=F{|EP@V;KMd

literal 0
HcmV?d00001

diff --git a/skin/images/sancho_round_right_blue.png b/skin/images/sancho_round_right_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7eac934ab68061ff9402e3582267e4c5841bd09
GIT binary patch
literal 82113
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
LittLQcR~LLH1Q&Q

literal 0
HcmV?d00001

diff --git a/vilesci/cronjobs/ampel_erinnerungsmail.php b/vilesci/cronjobs/ampel_erinnerungsmail.php
new file mode 100644
index 000000000..af8a2d61a
--- /dev/null
+++ b/vilesci/cronjobs/ampel_erinnerungsmail.php
@@ -0,0 +1,315 @@
+<?php
+
+/* Copyright (C) 2018 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cristina Hainberger <hainberg@technikum-wien.at> */
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../include/basis_db.class.php');
+require_once('../../include/datum.class.php');
+require_once('../../include/mail.class.php');
+require_once('../../include/ampel.class.php');
+require_once('../../include/person.class.php');
+require_once('../../include/phrasen.class.php');
+
+$db = new basis_db();
+$datum = new datum();
+$now = $datum->mktime_fromdate(date('Y-m-d'));
+
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+//get all notifications
+$ampel_obj = new ampel();
+$ampel_obj->getAll();		
+$ampel_arr = $ampel_obj->result;
+
+//filter only notifications that are not expired, not before vorlaufzeit AND email is true
+$ampel_arr = filterAmpeln($ampel_arr);
+	
+//get user of notifications, ampel_id, description and deadline
+$new_ampel_user_arr = array();				//user with new notifications that are not confirmed
+$overdue_ampel_user_arr = array();			//user with overdue notifications that are not confirmed
+foreach($ampel_arr as $ampel)
+{
+	$deadline = $datum->mktime_fromdate($ampel->deadline);
+	$insert_date = $datum->formatDatum($ampel->insertamum, 'Y-m-d');
+	$qry_all_ampel_user = $ampel->benutzer_select;
+	$kurzbz = $ampel->kurzbz;
+	
+	$new = false;
+	$overdue = false;
+	$new_user_arr = array();
+	$overdue_user_arr = array();
+
+	if($result = $db->db_query($qry_all_ampel_user))
+	{		
+		while($row = $db->db_fetch_object($result))
+		{			
+			$user = $row->uid;
+
+			//break if almost confirmed
+			if ($ampel_obj->isBestaetigt($user, $ampel->ampel_id))
+				break;
+			
+			//check if notification is new (within last week, as cronjob will run every week)
+			if ($datum->DateDiff (date('Y-m-d'), $insert_date) >= -7)
+			{
+				$new = true;
+				$new_user_arr[] = $user;
+			}
+			
+			//check if notification is overdue
+			if ($now > $deadline)
+			{
+				$overdue = true;
+				$overdue_user_arr[] = $user;
+			}			 
+		}			
+	}
+	
+	if ($new)
+	{
+	$new_ampel_user_arr[] = array(
+							'ampel_id' => $ampel->ampel_id, 
+							'ampel_bezeichnung' => $kurzbz,
+							'user' => $new_user_arr,
+							'deadline' => date('d.m.Y', $deadline));
+	} 
+	
+	if ($overdue)
+	{
+	$overdue_ampel_user_arr[] = array(
+								'ampel_id' => $ampel->ampel_id, 
+								'ampel_bezeichnung' => $kurzbz,
+								'user' => $overdue_user_arr,
+								'deadline' => date('d.m.Y', $deadline));
+	}
+}
+
+//rearrange arrays as needed to send in eMails
+$new_ampel_user_arr = organizeAmpelnForMail($new_ampel_user_arr);
+$overdue_ampel_user_arr = organizeAmpelnForMail($overdue_ampel_user_arr);
+
+//send eMail for new notifications
+foreach ($new_ampel_user_arr as $receiver)
+{
+	//get data about sender
+	$person = new person();
+	$person->getPersonFromBenutzer($receiver['user']);
+	$firstName = $person->vorname;
+	
+	//link to notifications system site
+	$link = APP_ROOT . "cis/index.php?sprache=German&content_id=&menu=" . APP_ROOT . "cis/menu.php?content_id=&content=" . APP_ROOT . "cis/private/tools/ampelverwaltung.php";
+
+	//eMail data
+	$to = $receiver['user']  . '@' . DOMAIN;
+	$from = 'noreply@'.DOMAIN;				
+	$subject = 'Sie haben eine neue Ampel!';
+	$title = "Sie haben neue Nachrichten in Ihrem Ampelsystem!";
+	$content = "<p>Hallo " . $firstName . ",</p>";
+	$content .= "<p>es gibt neue Ampeln für Sie:</p><br>";
+	
+	for ($i = 0; $i < count($receiver) - 1; $i++)
+	{
+		$receiver[$i]['ampel_id'];
+		$content .= "<p><i>NEU:</i>&nbsp&nbsp<strong>" . $receiver[$i]['ampel_bezeichnung'] . "</strong></p>";
+	}
+	
+	$content .= "<br><p>Sie können sie jetzt gleich in Ihrem Ampelsystem bestätigen:</p>";
+	$content .= "<br><a style=\"color: #74ba24;\" href=" . $link . ">Zu meinem Ampelsystem</a></br>";
+	$content .= "<p><br>Schönen Tag noch,</p>";
+	$content .= "<p>Sancho</p>";
+	
+	//send eMail
+	sendMail($to, $from, $subject, $content, $title);
+}
+
+//send eMail for overdue notifications
+foreach ($overdue_ampel_user_arr as $receiver)
+{
+	//get data about sender
+	$person = new person();
+	$person->getPersonFromBenutzer($receiver['user']);
+	$firstName = $person->vorname;
+	
+	//link to notifications system site
+	$link = APP_ROOT . "cis/index.php?sprache=German&content_id=&menu=" . APP_ROOT . "cis/menu.php?content_id=&content=" . APP_ROOT . "cis/private/tools/ampelverwaltung.php";
+
+	//eMail data
+	$to = $receiver['user']  . '@' . DOMAIN;
+	$from = 'noreply@'.DOMAIN;			
+	$subject = 'Bestätigen Sie bitte Ihre Ampel!';
+	$title = "Die Deadline für Ihre Ampel ist überschritten!";
+	$content = "<p>Hallo " . $firstName . ",</p>";
+	$content .= "<p>es gibt Ampeln, die von Ihnen noch bestätigt werden müssen:</p><br>";
+	
+	for ($i = 0; $i < count($receiver) - 1; $i++)
+	{
+		$receiver[$i]['ampel_id'];
+		$content .= "<p><i>BESTÄTIGUNG FEHLT:</i>&nbsp&nbsp<strong>" . $receiver[$i]['ampel_bezeichnung'] . "</strong></p>";
+		$content .= "<p><small><i style=\"color: #65696E;\">Die Deadline für die Bestätigung war am <span style=\"color: #FF0000;\">" . $receiver[$i]['deadline'] . "</span></i></small></p><br>";
+	}
+	
+	$content .= "<br><p>Sie können sie jetzt gleich in Ihrem Ampelsystem bestätigen:</p>";
+	$content .= "<br><a style=\"color: #74ba24;\" href=" . $link . ">Zu meinem Ampelsystem</a></br>";
+	$content .= "<p><br>Schönen Tag noch,</p>";
+	$content .= "<p>Sancho</p>";
+	
+	//send eMail
+	sendMail($to, $from, $subject, $content, $title);
+}
+
+
+//*************************************************************		FUNCTIONS
+function filterAmpeln($ampel_arr)
+{
+	$datum = new datum();
+	$now = $datum->mktime_fromdate(date('Y-m-d'));
+	$arr = array();
+	
+	foreach ($ampel_arr as $ampel)
+	{
+		$deadline = $datum->mktime_fromdate($ampel->deadline);
+		$vorlaufzeit = $ampel->vorlaufzeit;
+		$verfallszeit = $ampel->verfallszeit;
+
+		$datum_liegt_vor_vorlaufzeit = false;
+		$datum_liegt_nach_verfallszeit = false;
+
+		if (!is_null($vorlaufzeit))
+			$datum_liegt_vor_vorlaufzeit = $now < strtotime('-' .  $vorlaufzeit . ' day', $deadline); 
+
+		if (!is_null($verfallszeit))
+			$datum_liegt_nach_verfallszeit = $now > strtotime('+' . $verfallszeit . ' day', $deadline);
+		
+		if (!$datum_liegt_vor_vorlaufzeit && !$datum_liegt_nach_verfallszeit  && $ampel->email)
+		{
+			$arr[] = $ampel;
+		}
+	}	
+	return $arr;
+}
+function organizeAmpelnForMail ($ampel_user_arr)
+{
+	$helper_arr = array();
+	$unique_user_arr = array();
+	foreach ($ampel_user_arr as $ampel_user)
+	{
+		foreach ($ampel_user['user'] as $user)
+		{
+			if(!in_array($user, $helper_arr))
+			{
+				$helper_arr[] = $user;
+				$unique_user_arr[] = array(
+							'user' => $user,
+							array(
+							'ampel_id' => $ampel_user['ampel_id'],
+							'ampel_bezeichnung' => $ampel_user['ampel_bezeichnung'],
+							'deadline' => $ampel_user['deadline']));
+			}
+			else
+			{
+				$index = array_search($user, array_column($unique_user_arr, 'user'));
+				$unique_user_arr[$index][] =
+							array(
+							'ampel_id' => $ampel_user['ampel_id'],
+							'ampel_bezeichnung' => $ampel_user['ampel_bezeichnung'],
+							'deadline' => $ampel_user['deadline']);
+			}
+		}
+	}
+	return $unique_user_arr;
+}
+function sendMail($to, $from, $subject, $html_content, $title = 'Sancho hat neue Nachrichten für Sie!')
+{
+	$sancho_img = APP_ROOT . "skin/images/sancho_round_right_blue.png";
+	$logo_img = APP_ROOT . "skin/images/fh_logo.png";
+	
+	//mail content as plain text (fallback if html not activated)
+	$plain_text = "Hallo,\n\n";
+	if (!empty ($title))
+		$plain_text .= strip_tags($title) . "\n\n";	
+	$plain_text .= "Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Inhalt vollständig darzustellen.";
+	
+	//mail content as html text
+	/*
+	 * no css styles in html-head (email clients picky about that)
+	 * tables inside tables for correct styles in different email clients
+	 */
+	$html_text = '
+		<html>
+			<head>	
+				<title>Sancho Ampelmail</title>
+			</head>
+			<body><center>
+				<table width="650px" cellpadding="0" cellspacing="0" style="border: 2px solid #65696e; border-spacing: 0px; margin-top: 40px;">  
+					<tr>
+						<td align="left">
+							<table cellpadding="0" width="100%" cellspacing="0" style="padding:0; border-bottom: 2px solid #A0A0A0; margin: 0; font-family: arial, verdana, sans-serif; font-size: 0.8em; border-spacing: 0px;">
+								<tr>
+									<td width="25%" style="padding: 25px;">
+										<img src="cid:SanchoFace" align="left" alt="sancho_face" width="105" height="105">
+									</td>
+									<td width="75%" style="padding: 25px;">
+										<h4 align="center" style="padding-top: 20">' . $title . '</h4>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					 <tr>
+						<td align="left">
+							<table cellpadding="0" width="100%" cellspacing="0" style="padding:0; border-bottom: 2px solid #A0A0A0; margin: 0; font-family: arial, verdana, sans-serif; font-size: 0.8em; border-spacing: 0px;">
+								<tr>
+									<td style="padding: 25px;">
+										<br>' . $html_content . '</br>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td align="left">
+							<table cellpadding="0" width="100%" cellspacing="0" style="padding:0; margin: 0; font-family: arial, verdana, sans-serif; font-size: 0.8em; border-spacing: 0px;">
+								<tr>
+									<td width="75%" style="padding: 25px;">
+										<span style="color: #0a629c; padding: 20 0 0 20;">So spannend kann Technik sein!</span>
+									</td>
+									<td width="25%" style="padding: 25px;">
+										<a href="https://www.technikum-wien.at"><img src="cid:Logo" align="right" alt="logo" width="120" height="70">
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+			</center></body>
+		</html>';
+	
+	$mail = new mail($to, $from, $subject, $plain_text);
+	$mail->setHtmlContent($html_text);
+	$mail->addEmbeddedImage($sancho_img, "image/png", "", "SanchoFace");
+	$mail->addEmbeddedImage($logo_img, "image/png", "", "Logo");
+
+	if(!$mail->send())
+		echo $p->t('global/emailNichtVersendet') . ' an ' . $to . "<br>";
+}
+
+
+
+
+

From 097218884c82a917ac06e6046bd0f24f7f2b01ea Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:37:15 +0200
Subject: [PATCH 04/44] Coodle Farbcodierung

---
 cis/private/coodle/coodle_worker.php |  42 +++++++++-
 cis/private/coodle/termin.php        | 120 ++++++++++++++++++++++-----
 2 files changed, 135 insertions(+), 27 deletions(-)

diff --git a/cis/private/coodle/coodle_worker.php b/cis/private/coodle/coodle_worker.php
index a16fe553c..87c9ffe9d 100644
--- a/cis/private/coodle/coodle_worker.php
+++ b/cis/private/coodle/coodle_worker.php
@@ -68,6 +68,8 @@ switch($work)
 		$email='';
 		$gruppe_kurzbz='';
 		$name='';
+		$backgroundcolor = '';
+		$textcolor = '';
 		switch($typ)
 		{
 			case 'Ort': $ort = $id; break;
@@ -85,7 +87,7 @@ switch($work)
 			$gruppe = new gruppe();
 			if(!$gruppe->loadUser($gruppe_kurzbz))
 				die('Fehler: '.$gruppe->errormsg);
-            	
+
 			foreach($gruppe->result as $row)
 			{
 				$coodle->coodle_id = $coodle_id;
@@ -108,7 +110,15 @@ switch($work)
 					}
 				}
 			}
-			echo 'true';
+			
+			$data['result'] = 'true';
+			$data['backgroundColor'] = $backgroundcolor;
+			$data['textColor'] = $textcolor;
+
+			if(isset($_POST['format']) && $_POST['format'] == 'json')
+				echo json_encode($data);
+			else
+				echo 'true';
 		}
 		else 
 		{
@@ -133,9 +143,33 @@ switch($work)
 			$coodle->insertvon = $user;
 			$coodle->updateamum = date('Y-m-d H:i:s');
 			$coodle->updatevon = $user;
-            
+
+			if ($uid != '')
+			{
+				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
+				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
+			}
+			elseif ($ort != '')
+			{
+				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 80%)';
+				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 50%)';
+			}
+			elseif ($email != '')
+			{
+				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
+				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
+			}
+			$data['result'] = 'true';
+			$data['backgroundColor'] = $backgroundcolor;
+			$data['textColor'] = $textcolor;
+			
 			if($coodle->saveRessource(true))
-				echo 'true';
+			{
+				if(isset($_POST['format']) && $_POST['format'] == 'json')
+					echo json_encode($data);
+				else 
+					echo 'true';
+			}
 			else
 				echo 'Fehler beim Speichern:'.$coodle->errormsg;
 		}
diff --git a/cis/private/coodle/termin.php b/cis/private/coodle/termin.php
index 64619402c..0454ba660 100644
--- a/cis/private/coodle/termin.php
+++ b/cis/private/coodle/termin.php
@@ -286,7 +286,22 @@ echo '<html>
 
 	.ressourceItem
 	{
+		display: table-cell;
 		font-size: 0.8em;
+		padding: 3px;
+		margin-bottom: 3px;
+		border-radius: 10px 0 0 10px;
+		-moz-border-radius: 10px 0 0 10px;
+	}
+
+	.ressourceImage
+	{
+		display: table-cell;
+		vertical-align: top;
+		padding: 3px;
+		margin-bottom: 3px;
+		border-radius: 10px 0 0 10px;
+		-moz-border-radius: 10px 0 0 10px;
 	}
 
 	#fertig
@@ -315,6 +330,28 @@ echo '<html>
 		color: #666;
 	}
 
+	.fc-event-draggable
+	{
+		z-index: 1000 !important;
+	}
+
+	.ui-state-active
+	{
+		border: none !important;
+		background-color: lightgrey !important;
+		background-image: none !important;
+	}
+	
+	.ressourceElement
+	{
+		background-color: lightblue;
+		margin: 3px;
+		padding: 2px 4px;
+		border-radius: 2px;
+		margin-bottom: 3px;
+	}
+
+
 </style>
 <script type="text/javascript">
 
@@ -588,7 +625,7 @@ echo '
 	</div>
 	<div id="ressourcen">
 	<h4>'.$p->t('coodle/ressourcen').'</h4>
-	<div id="ressourcecontainer">
+	<div id="ressourcecontainer" style="display: table">
 	</div>
 	<div id="ressourcenInput">
 	<p>
@@ -632,6 +669,7 @@ echo '
 				type:"POST",
 				url:"coodle_worker.php",
 				data:{
+						"format" : "json",
 						"work": "addressource",
 						"id": id,
 						"typ": typ,
@@ -640,15 +678,16 @@ echo '
 					 },
 				success: function(data)
 					{
-						if(data!="true")
+						var data_obj = jQuery.parseJSON(data);
+						if(data_obj.result != "true")
 							alert("ERROR:"+data)
 						else
 						{
 							// Speichern der Ressource OK
-							if(typ=="Gruppe")
+							if(typ == "Gruppe")
 								location.reload(true);
 							else
-								addRessourceToContent(id, typ, bezeichnung);
+								addRessourceToContent(id, typ, bezeichnung, data_obj.backgroundColor, data_obj.textColor);
 						}
 
 					},
@@ -656,21 +695,28 @@ echo '
 			});
 	}
 	// Zeigt eine Ressource mit deren Events an
-	function addRessourceToContent(id, typ, bezeichnung)
+	function addRessourceToContent(id, typ, bezeichnung, backgroundColor, textColor, cr32)
 	{
 		// HTML Tags aus der Bezeichnung Entfernen, sofern vorhanden
-		var div = document.createElement("div");
+		var div = document.createElement("ul");
 	  	var text = document.createTextNode(bezeichnung);
 	  	div.appendChild(text);
 	  	bezeichnung = div.innerHTML;
+		if (backgroundColor == "")
+			backgroundColor = "lightgrey";
+
+		if (textColor == "")
+			textColor = "white";
 
 		// Anzeige der Ressource mit Loeschen Button
-		var code = \'<span class="ressourceItem"> \
+		var code = \'<div class="ressourceElement" style="background-color: \
+				\'+backgroundColor+\' \
+				"><div class="ressourceImage"> \
 				<a href="#delete" onclick="removeRessource(this, \\\'\'+id+\'\\\',\\\'\'+typ+\'\\\'); return false;"> \
-					<img src="../../../skin/images/delete_round.png" height="13px" title="'.$p->t('coodle/ressourceEntfernen').'"/> \
-				</a> \
-				\'+bezeichnung+\' \
-			<br /></span>\';
+					<img src="../../../skin/images/delete_x.png" height="13px" title="'.$p->t('coodle/ressourceEntfernen').'"/> \
+				</a></div><div class="ressourceItem"> \
+				\'+bezeichnung+cr32+\' \
+			<br /></div></div>\';
 		$("#ressourcecontainer").append(code);
 
 		// Events der Ressource hinzufuegen
@@ -685,8 +731,8 @@ echo '
 				error: function() {
 					alert("Error fetching data for "+typ+" "+id);
 				},
-				color:"lightgrey"
-				//textColor:"black"
+				color: backgroundColor,
+				textColor: textColor
 			});
 
 	}
@@ -736,7 +782,7 @@ echo '
 					alert("Error fetching data for "+typ+" "+id);
 				}
 			});
-		$(item).parent().remove();
+		$(item).closest(".ressourceElement").remove();
 	}';
 
 echo '
@@ -748,36 +794,64 @@ echo '
 if(!$coodle->getRessourcen($coodle_id))
 	die('Fehler:'.$coodle->errormsg);
 
+$backgroundcolor = 0;
+$zahl = 0;
+$textcolor = '';
 foreach($coodle->result as $row)
 {
 	echo "\n\t";
-	$typ='';
-	$id='';
-	$bezeichnung='';
+	$typ = '';
+	$id = '';
+	$bezeichnung = '';
 
 	if($row->uid!='')
 	{
-		$typ='Person';
-		$id=$row->uid;
+		$typ = 'Person';
+		$id = $row->uid;
 		$benutzer = new benutzer();
 		$benutzer->load($row->uid);
 		$bezeichnung = $benutzer->nachname.' '.$benutzer->vorname;
+// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
+		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
 	}
 	elseif($row->ort_kurzbz!='')
 	{
-		$typ='Ort';
-		$id=$row->ort_kurzbz;
+		$typ = 'Ort';
+		$id = $row->ort_kurzbz;
 		$ort = new ort();
 		$ort->load($row->ort_kurzbz);
-		$bezeichnung = $ort->bezeichnung;
+		$bezeichnung = $ort->bezeichnung.' '.$row->ort_kurzbz;
+// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 80%)';
+		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 50%)';
 	}
 	elseif($row->email!='')
 	{
 		$typ = 'Extern';
 		$id = $row->email;
 		$bezeichnung = $row->name;
+// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
+		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
 	}
-	echo 'addRessourceToContent("'.$db->convert_html_chars($id).'", "'.$db->convert_html_chars($typ).'", "'.$db->convert_html_chars($bezeichnung).'");';
+	$zahl = abs(crc32($id));
+	$zahl = strval($zahl);
+// 	$zahl = strrev($zahl);
+	$zahl = substr($zahl, -3, 3);
+	$zahl = intval($zahl);
+	$zahl = abs($zahl % 360);
+	
+// 	$backgroundcolor = crc32($id);
+// 	$backgroundcolor = strval($backgroundcolor);
+// 	$backgroundcolor = strrev($backgroundcolor);
+// 	$backgroundcolor = substr($backgroundcolor, 0, 3);
+// 	$backgroundcolor = intval($backgroundcolor);
+// 	$backgroundcolor = abs($backgroundcolor % 360);
+// 	$backgroundcolor = 'hsl('.$backgroundcolor.', 80%, 90%)';
+	
+	$backgroundcolor = 'hsl('.$zahl.', 80%, 90%)';
+	
+	echo 'addRessourceToContent("'.$db->convert_html_chars($id).'", "'.$db->convert_html_chars($typ).'", "'.$db->convert_html_chars($bezeichnung).'", "'.$backgroundcolor.'", "'.$textcolor.'", "'.$zahl.'");';
+
+	$zahl = $zahl+20;
 }
 
 // Bereits eingetragene Terminvorschlaege laden

From 32fb5efa596a6744cfcc8e7f948b361edbd2b39e Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:44:23 +0200
Subject: [PATCH 05/44] =?UTF-8?q?Messagin-Tabellen=20in=20Personen-Zusamme?=
 =?UTF-8?q?nlegen=20ber=C3=BCcksichtigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/stammdaten/personen_wartung.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vilesci/stammdaten/personen_wartung.php b/vilesci/stammdaten/personen_wartung.php
index 1413a1599..8f8cd52f3 100644
--- a/vilesci/stammdaten/personen_wartung.php
+++ b/vilesci/stammdaten/personen_wartung.php
@@ -120,6 +120,11 @@ if(isset($radio_1) && isset($radio_2) && $radio_1>=0 && $radio_2>=0)
 			$sql_query_upd1.="UPDATE public.tbl_notizzuordnung SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
 			$sql_query_upd1.="UPDATE system.tbl_log SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
 			$sql_query_upd1.="UPDATE wawi.tbl_konto SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
+			$sql_query_upd1.="UPDATE public.tbl_msg_message SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
+			$sql_query_upd1.="UPDATE public.tbl_msg_recipient SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
+			$sql_query_upd1.="UPDATE public.tbl_msg_status SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
+			$sql_query_upd1.="UPDATE system.tbl_person_lock SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
+			$sql_query_upd1.="UPDATE system.tbl_log SET person_id=".$db->db_add_param($radio_2, FHC_INTEGER)." WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
 			$sql_query_upd1.="DELETE FROM public.tbl_person WHERE person_id=".$db->db_add_param($radio_1, FHC_INTEGER).";";
 
 			if($db->db_query($sql_query_upd1))

From e2a542391a88281fee45b56314d9e9db876abf3f Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:47:05 +0200
Subject: [PATCH 06/44] =?UTF-8?q?Studienplan=20G=C3=BCltigkeit=20GUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Select für OrgForm
---
 vilesci/lehre/studienplan_gueltigkeit.php | 28 ++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/vilesci/lehre/studienplan_gueltigkeit.php b/vilesci/lehre/studienplan_gueltigkeit.php
index f2a5f3849..0b27a5e02 100644
--- a/vilesci/lehre/studienplan_gueltigkeit.php
+++ b/vilesci/lehre/studienplan_gueltigkeit.php
@@ -23,6 +23,7 @@ require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/studiengang.class.php');
 require_once('../../include/studienplan.class.php');
 require_once('../../include/studiensemester.class.php');
+require_once('../../include/organisationsform.class.php');
 
 $user = get_uid();
 $rechte = new benutzerberechtigung();
@@ -32,6 +33,7 @@ if(!$rechte->isBerechtigt('lehre/studienordnung', null, 's'))
 	die('keine Berechtigung für diese Seite!');
 
 $studiengang_kz = isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:'';
+$orgform_kurzbz = isset($_GET['orgform_kurzbz'])?$_GET['orgform_kurzbz']:'';
 $db = new basis_db();
 
 echo '<!doctype html>
@@ -61,13 +63,37 @@ echo '
 ';
 $stg = new studiengang();
 $stg->getAll('typ, kurzbz');
+$types = new studiengang();
+$types->getAllTypes();
+$typ = '';
 foreach($stg->result as $row)
 {
+	if ($typ != $row->typ || $typ == '')
+	{
+		if ($typ != '')
+			echo '</optgroup>';
+			echo '<optgroup label="'.($types->studiengang_typ_arr[$row->typ] != ''?$types->studiengang_typ_arr[$row->typ]:$row->typ).'">';
+	}
 	if($row->studiengang_kz == $studiengang_kz)
 		$selected = 'selected';
 	else
 		$selected = '';
 	echo '<option value="'.$row->studiengang_kz.'" '.$selected.'>'.$db->convert_html_chars($row->kuerzel.' - '.$row->bezeichnung).'</option>';
+	$typ = $row->typ;
+}
+echo '</select>
+<select name="orgform_kurzbz">
+<option value="" '.($orgform_kurzbz==''?'selected':'').'>Alle Orgformen</option>';
+$orgform = new organisationsform();
+$orgform->getOrgformLV();
+foreach ($orgform->result as $of)
+{
+	if($orgform_kurzbz == $of->orgform_kurzbz)
+		$selected = 'selected';
+	else
+		$selected = '';
+		
+	echo '<OPTION value="'.$db->convert_html_chars($of->orgform_kurzbz).'" '.$selected.'>'.$db->convert_html_chars($of->orgform_kurzbz).' - '.$db->convert_html_chars($of->bezeichnung).'</OPTION>';
 }
 echo '</select>
 <input type="submit" value="Anzeigen">
@@ -77,7 +103,7 @@ $max_semester=0;
 if($studiengang_kz!='')
 {
 	$studienplan = new studienplan();
-	$studienplan->getStudienplaeneFromSem($studiengang_kz);
+	$studienplan->getStudienplaeneFromSem($studiengang_kz, null, null, $orgform_kurzbz);
 
 	foreach($studienplan->result as $row)
 	{

From 5a39ae11f4c92c1799e67485bbffb13afd00bb17 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:48:49 +0200
Subject: [PATCH 07/44] Studienordnung GUI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Nächstes Studiensemester wird selected
- Gesetzte Studiensemester sind disabled
---
 vilesci/lehre/studienordnung.inc.php | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/vilesci/lehre/studienordnung.inc.php b/vilesci/lehre/studienordnung.inc.php
index de719c2df..fc84e7047 100644
--- a/vilesci/lehre/studienordnung.inc.php
+++ b/vilesci/lehre/studienordnung.inc.php
@@ -321,7 +321,10 @@ switch($method)
 		$studienSemesterResult = $studienplan->loadStudiensemesterFromStudienplan($studienplan_id);
 
 		$studiensemester = new studiensemester();
-		$studiensemester->getAll();
+		$studiensemester->getAll('desc');
+		$studiensemester_array = array();
+		foreach ($studiensemester->studiensemester AS $row)
+			$studiensemester_array[$row->studiensemester_kurzbz] = false;
 
 		$ausbildungssemesterResult = array();
 /*
@@ -357,6 +360,9 @@ switch($method)
 
 		foreach($ausbildungssemesterResult as $row)
 		{
+			if (array_key_exists($row->studiensemester, $studiensemester_array))
+				$studiensemester_array[$row->studiensemester] = true;
+				
 			echo '<tr id="row_'.$row->studiensemester.'" style="font-size: 1em !important;"><td style="font-size: 1em; padding: 0.5em 0.5em 0.5em 0.5em;" align="center">'.$row->studiensemester.'</td>';
 			for($i = 1; $i<=$ausbildungssemester; $i++)
 			{
@@ -373,10 +379,23 @@ switch($method)
 		}
 		echo '<tr>
 				<td align="center"><select id="studiensemester">';
-				$length = count($studiensemester->studiensemester)-1;
-				for($i = $length; $i>0; $i--)
+				$lastStudiensemesterActive = '';
+				$selected = '';
+				//Das nächste Studiensemester wird selected
+				foreach($studiensemester_array AS $key => $value)
 				{
-					echo '<option value='.$studiensemester->studiensemester[$i]->studiensemester_kurzbz.'>'.$studiensemester->studiensemester[$i]->studiensemester_kurzbz.'</option>';
+					if ($value == true)
+					{							
+						echo '<option value='.$key.' disabled="disabled">'.$key.'</option>';
+						$lastStudiensemesterActive = false;
+					}
+					else
+					{
+						if ($selected == '' && $lastStudiensemesterActive !== false)
+							$selected = 'selected';
+						echo '<option value='.$key.' '.$selected.'>'.$key.'</option>';
+					}
+					$selected = '';
 				}
 		echo '</select></td>';
 		for($j=1; $j<=$ausbildungssemester; $j++)

From 6b20891d9725982313282e10ea165098dc21e878 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:50:16 +0200
Subject: [PATCH 08/44] Neue Vorlagen Ausbildungsvertrag

---
 system/xsl/AusbVerEng_0.xsl              | 63 ++-------------
 system/xsl/AusbVerEng_9005.xsl           | 79 ++++---------------
 system/xsl/AusbVerEng_Lehrgaenge.xsl     | 98 +++++++-----------------
 system/xsl/Ausbildungsver_0.xsl          | 32 ++------
 system/xsl/Ausbildungsver_9005.xsl       | 32 ++------
 system/xsl/Ausbildungsver_Lehrgaenge.xsl | 31 ++------
 system/xsl/accountinfoblatt_0.xsl        |  4 +-
 7 files changed, 73 insertions(+), 266 deletions(-)

diff --git a/system/xsl/AusbVerEng_0.xsl b/system/xsl/AusbVerEng_0.xsl
index bcf07de4b..3cda18677 100644
--- a/system/xsl/AusbVerEng_0.xsl
+++ b/system/xsl/AusbVerEng_0.xsl
@@ -686,7 +686,6 @@
 			<text:section text:style-name="Sect1" text:name="Bereich1">
 				<text:h text:style-name="P72" text:outline-level="1">Ausbildungsvertrag</text:h>
 					<!-- Ueberprueft ob benoetigte Datenfelder leer sind -->
-					<xsl:if test="svnr = ''"><text:p text:style-name="P91">Keine Sozialversicherungsnummer oder Ersatzkennzeichen vorhanden</text:p></xsl:if>
 					<xsl:if test="gebdatum = ''"><text:p text:style-name="P91">Kein Geburtsdatum vorhanden</text:p></xsl:if>
 					<xsl:if test="titel_kurzbz = ''"><text:p text:style-name="P91">Kein akademischer Grad vorhanden</text:p></xsl:if>
 					<xsl:if test="student_maxsemester = ''"><text:p text:style-name="P91">Keine Ausbildungsdauer vorhanden</text:p></xsl:if>
@@ -733,52 +732,6 @@
 				<text:p text:style-name="P4">
 					<text:span text:style-name="T12">Geburtsdatum (Date of birth): <text:tab/><xsl:value-of select="gebdatum"/></text:span>
 				</text:p>
-				<text:p text:style-name="P4">
-					<text:span text:style-name="T10">Sozialversicherungsnr. </text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T10">
-							<text:note text:id="ftn1" text:note-class="footnote">
-								<text:note-citation>1</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="Standard">
-										<text:span text:style-name="T15">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T2">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes idgF und der Bildungsdokumentationsverordnung-Fachhochschulen idgF<text:s/>hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln.</text:span>
-									</text:p>
-									<text:p text:style-name="P8"/>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T10"> </text:span>
-					</text:span>
-					<text:span text:style-name="T13">:<text:tab/><xsl:value-of select="svnr"/></text:span>
-				</text:p>
-				<text:p text:style-name="P5">
-					<text:span text:style-name="T12">
-						<text:tab/>(Social security number)</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T12">
-							<text:note text:id="ftn2" text:note-class="footnote">
-								<text:note-citation>2</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="Standard">
-										<text:span text:style-name="T17">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T4">Pursuant to § 3 section 1 of the Education Documentation Act as amended and the Education Documentation Regulation for Universities of Applied Sciences as amended, the operator shall record the social security number pursuant to § 7 paragraph 2 and shall transfer it via the Agency for Quality Assurance and Accreditation Austria to the competent Ministry and Statistics Austria.</text:span>
-									</text:p>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T12"> </text:span>
-					</text:span>
-					<text:span text:style-name="T12">: </text:span>
-				</text:p>
 				<text:p text:style-name="P17"/>
 				<text:p text:style-name="P17"/>
 				<text:p text:style-name="P3">
@@ -1220,7 +1173,7 @@
 					<text:span text:style-name="T40">6.2.9 Verwertungsrechte</text:span>
 					<text:span text:style-name="T41"> </text:span>
 				</text:p>
-				<text:p text:style-name="P39">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der Studentin oder dem Studenten getroffen wurden, ist die Studentin oder der Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+				<text:p text:style-name="P39">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der Studentin oder dem Studenten getroffen wurden, ist die Studentin oder der Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 				<text:p text:style-name="P39"/>
 				<text:p text:style-name="P41">6.2.10 Aufzeichnungen und Mitschnitte</text:p>
 				<text:p text:style-name="P39">Es ist der/dem Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, StudiVZ etc., aber auch auf Youtube usw. oder durch sonstige für diese Zwecke geeignete Kommunikations-mittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben. </text:p>
@@ -1233,7 +1186,7 @@
 				<text:p text:style-name="P20">Die Studentin bzw. der Student ist zur Geheimhaltung von Forschungs- und Entwicklungsaktivitäten und -ergebnissen gegenüber Dritten verpflichtet. </text:p>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P67">6.2.9 Exploitation Rights</text:p>
-				<text:p text:style-name="P20">Unless other arrangements have been agreed between the operator and the student at an individual level, on written request, the student undertakes to offer the operator the rights to research and development results. </text:p>
+				<text:p text:style-name="P20">Unless otherwise agreed between the operator and the student on an individual basis, the student is required, upon written request, to offer the operator the rights to research and development results generated as part of funded projects.</text:p>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
@@ -1244,7 +1197,6 @@
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
-				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20">6.2.11 Confidentiality </text:p>
 				<text:p text:style-name="P20">The student is required to maintain confidentiality towards third parties of research and development activities and results. </text:p>
 				<text:p text:style-name="P20"/>
@@ -1254,7 +1206,7 @@
 				<text:p text:style-name="P39">Im Falle eines Unfalles mit körperlicher Verletzung des/der Studierenden im Zusammenhang mit dem Studium ist die/der Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Dies betrifft auch Wegunfälle zur oder von der FH.</text:p>
 				<text:p text:style-name="P39"/>
 				<text:p text:style-name="P39">6.2.13 Schadensmeldung </text:p>
-				<text:p text:style-name="P39">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
+				<text:p text:style-name="P39">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die Studierende verpflichtet, diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 				<text:p text:style-name="P39"/>
 				<text:p text:style-name="P92">6.2.14 Rückgabeverpflichtung bei Studienende </text:p>
 				<text:p text:style-name="P39">Die Studentin bzw. der Student ist verpflichtet, bei einer Beendigung des Studiums unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:p>
@@ -1280,7 +1232,8 @@
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20">6.2.13 Damage Report</text:p>
-				<text:p text:style-name="P20">If any damage should be caused to the inventory of the University of Applied Sciences, the student undertakes to report this to the administrative assistant of the degree program within three days. Any liability claims shall remain unaffected.</text:p>
+				<text:p text:style-name="P20">In the case of damage to the inventory of the University of Applied Sciences, the student is obliged to notify the course secretariat immediately, but no later than within three days. Any liability claims remain unaffected.</text:p>
+				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P20"/>
 				<text:p text:style-name="P92">6.2.14 Obligation to Return Borrowed Items</text:p>
 				<text:p text:style-name="P20">The student undertakes to return promptly all equipment, books, keys and other materials that have been made available, when the course is finished or broken off.</text:p>
@@ -1336,7 +1289,7 @@
 						<text:p text:style-name="P76">persönliche<text:span text:style-name="T24">m</text:span> Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Studienganges, der Fach-hochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P76">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.9);</text:p>
+						<text:p text:style-name="P76">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.9);</text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P76">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.11); </text:p>
@@ -1414,7 +1367,7 @@
 						<text:span text:style-name="T38">Das gesamte Studienprogramm wird in englischer Sprache angeboten. Die Studentin bzw. der Student erklärt, die englische Sprache in Wort und Schrift in dem für eine akademische Ausbildung erforderlichen Ausmaß zu beherrschen.</text:span>
 					</text:p>
 					<text:p text:style-name="P71"/>
-					<text:p text:style-name="P53">Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der Student bzw. die Studentin. </text:p>
+					<text:p text:style-name="P53">Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der Student bzw. die Studentin. </text:p>
 				</xsl:if>
 				<text:list xml:id="list101940709679101" text:continue-numbering="true" text:style-name="WW8Num4">
 					<text:list-item>
@@ -1444,7 +1397,7 @@
 					</text:p>
 					<text:p text:style-name="P56"/>
 					<text:p text:style-name="P56"/>
-					<text:p text:style-name="P55">Students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet and e-mail) shall be borne by the student. </text:p>
+					<text:p text:style-name="P55">Students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet) shall be borne by the student. </text:p>
 				</xsl:if>
 				<text:p text:style-name="P65">
 					<text:soft-page-break/>
diff --git a/system/xsl/AusbVerEng_9005.xsl b/system/xsl/AusbVerEng_9005.xsl
index fde93d7f4..7d6b7be6b 100644
--- a/system/xsl/AusbVerEng_9005.xsl
+++ b/system/xsl/AusbVerEng_9005.xsl
@@ -715,7 +715,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:h text:style-name="P98" text:outline-level="1">Ausbildungsvertrag</text:h>
 				<text:p text:style-name="P54">außerordentliches Studium (Besuch einzelner Lehrveranstaltungen eines Studiengangs)</text:p>
 					<!-- Ueberprueft ob benoetigte Datenfelder leer sind -->
-					<xsl:if test="svnr = ''"><text:p text:style-name="P100">Keine Sozialversicherungsnummer oder Ersatzkennzeichen vorhanden</text:p></xsl:if>
 					<xsl:if test="gebdatum = ''"><text:p text:style-name="P100">Kein Geburtsdatum vorhanden</text:p></xsl:if>
 					<xsl:if test="student_maxsemester = ''"><text:p text:style-name="P100">Keine Ausbildungsdauer vorhanden</text:p></xsl:if>
 				<text:p text:style-name="P7"/>
@@ -757,52 +756,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:p text:style-name="P3">
 					<text:span text:style-name="T15">Geburtsdatum (Date of birth): <text:tab/><xsl:value-of select="gebdatum"/></text:span>
 				</text:p>
-				<text:p text:style-name="P3">
-					<text:span text:style-name="T12">Sozialversicherungsnr. </text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T12">
-							<text:note text:id="ftn1" text:note-class="footnote">
-								<text:note-citation>1</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="P64">
-										<text:span text:style-name="T19">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T2">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes idgF und der Bildungsdokumentationsverordnung-Fachhochschulen idgF hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln. </text:span>
-									</text:p>
-									<text:p text:style-name="P53"/>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T12"> </text:span>
-					</text:span>
-					<text:span text:style-name="T17">:<text:tab/><xsl:value-of select="svnr"/></text:span>
-				</text:p>
-				<text:p text:style-name="P4">
-					<text:span text:style-name="T15">
-						<text:tab/>(Social security number)</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T15">
-							<text:note text:id="ftn2" text:note-class="footnote">
-								<text:note-citation>2</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="Standard">
-										<text:span text:style-name="T20">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T5">Pursuant to § 3 section 1 of the Education Documentation Act as amended and the Education Documentation Regulation for Universities of Applied Sciences as amended, the operator shall record the social security number pursuant to § 7 paragraph 2 and shall transfer it via the Agency for Quality Assurance and Accreditation Austria to the competent Ministry and Statistics Austria. </text:span>
-									</text:p>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T15"> </text:span>
-					</text:span>
-					<text:span text:style-name="T15">: </text:span>
-				</text:p>
 				<text:p text:style-name="P34"/>
 				<text:p text:style-name="P55">
 					<text:span text:style-name="T15">(kurz „ao. Studentin“ bzw. „ao. Student“ genannt)<text:tab/>(referred to as &quot;external student&quot;)</text:span>
@@ -1049,11 +1002,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:p text:style-name="P25">
 					<text:span text:style-name="Strong_20_Emphasis"/>
 				</text:p>
-				<text:p text:style-name="P25">
-					<text:span text:style-name="Strong_20_Emphasis">
-						<text:span text:style-name="T12"/>
-					</text:span>
-				</text:p>
 				<text:p text:style-name="P25">
 					<text:span text:style-name="Strong_20_Emphasis">
 						<text:span text:style-name="T9">6.1 Rights </text:span>
@@ -1106,6 +1054,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 					<text:span text:style-name="T51">Die ao. Studentin bzw. der ao. Student</text:span> ist verpflichtet, zwei Wochen vor Beginn jedes Semesters einen Studienbeitrag gemäß Fachhochschul-Studiengesetz in der Höhe von derzeit € 363,36 netto pro Semester zu entrichten. Im Falle einer Erhöhung des gesetzlichen Studienbeitragssatzes erhöht sich der angeführte Betrag entsprechend. </text:p>
 				<text:p text:style-name="P40">Die vollständige Bezahlung des Studienbeitrags ist Voraussetzung für die Aufnahme bzw. die Fortsetzung des ao. Studiums. Bei Nichtantritt des ao. Studiums oder Abbruch zu Beginn oder während des Semesters verfällt der Studienbeitrag. </text:p>
 				<text:p text:style-name="P40"/>
+				<text:p text:style-name="P40"/>
 				<text:p text:style-name="P47">6.2.3 ÖH-Beitrag</text:p>
 				<text:p text:style-name="P47">Gemäß § 4 Abs 10 FHStG sind Studierende an Fachhochschulen Mitglieder der Österreichischen HochschülerInnenschaft (ÖH). Der/Die ao. Studierende hat semesterweise einen ÖH-Beitrag an den Erhalter zu entrichten, der diesen an die ÖH abführt. Die Entrichtung des Betrags ist Voraussetzung für die Zulassung zum ao. Studium bzw. für dessen Fortsetzung.</text:p>
 				<text:p text:style-name="P47"/>
@@ -1153,7 +1102,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 					<text:span text:style-name="T52">Die ao. Studentin bzw. der ao. Student</text:span> hat unaufgefordert dafür zu sorgen, dass die von ihr/ihm beigebrachten Daten aktuell sind. Änderungen sind der Studiengangsassistenz unverzüglich schriftlich mitzuteilen. Darüber hinaus trifft sie/ihn die Pflicht, sich von studienbezogenen Informationen, die ihr/ihm an die vom Erhalter zur Verfügung gestellte Emailadresse zugestellt werden, in geeigneter Weise Kenntnis zu verschaffen.</text:p>
 				<text:p text:style-name="P50"/>
 				<text:p text:style-name="P52">6.2.8 Verwertungsrechte </text:p>
-				<text:p text:style-name="P52">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+				<text:p text:style-name="P52">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 				<text:p text:style-name="P52"/>
 				<text:p text:style-name="P52">6.2.9 Aufzeichnungen und Mitschnitte</text:p>
 				<text:p text:style-name="P52">Es ist der/dem ao. Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, StudiVZ etc, aber auch auf Youtube usw. oder durch sonstige für diese Zwecke geeignete Kommunikations-mittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben. </text:p>
@@ -1166,7 +1115,9 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:p text:style-name="P18"/>
 				<text:p text:style-name="P18"/>
 				<text:p text:style-name="P48">6.2.8 Exploitation Rights</text:p>
-				<text:p text:style-name="P48">Unless other arrangements have been agreed between the operator and the external student at an individual level, on written request, the external student undertakes to offer the operator the rights to research and development results. </text:p>
+				<text:p text:style-name="P48">Unless otherwise agreed between the operator and the student on an individual basis, the student is required, upon written request, to offer the operator the rights to research and development results generated as part of funded projects.</text:p>
+				<text:p text:style-name="P48"/>
+				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48">6.2.9 Recordings </text:p>
@@ -1180,7 +1131,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:p text:style-name="P48">Im Falle eines Unfalles mit körperlicher Verletzung des/der ao. Studierenden im Zusammenhang mit dem ao. Studium ist die/der ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Dies betrifft auch Wegunfälle zur oder von der FH.</text:p>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48">6.2.12 Schadensmeldung </text:p>
-				<text:p text:style-name="P48">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
+				<text:p text:style-name="P48">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48">6.2.13 Rückgabeverpflichtung bei Studienende </text:p>
 				<text:p text:style-name="P48">Die ao. Studentin bzw. der ao. Student ist verpflichtet, bei einer Beendigung des ao. Studiums unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:p>
@@ -1195,7 +1146,9 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				<text:p text:style-name="P48">In the event of an accident with bodily injury to an external student in connection with his / her external studies, he / she is obliged to report this to the administrative assistant of the degree program within three days. This also applies to accidents on the way to or from the UAS. </text:p>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48">6.2.12 Damage Report</text:p>
-				<text:p text:style-name="P48">If any damage should be caused to the inventory of the University of Applied Sciences, the external student undertakes to report this to the administrative assistant of the degree program within three days. Any liability claims shall remain unaffected.</text:p>
+				<text:p text:style-name="P48">In the case of damage to the inventory of the University of Applied Sciences, the student is obliged to notify the course secretariat immediately, but no later than within three days. Any liability claims remain unaffected.</text:p>
+				<text:p text:style-name="P48"/>
+				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48"/>
 				<text:p text:style-name="P48">6.2.13 Obligation to Return Borrowed Items</text:p>
 				<text:p text:style-name="P48">The external student undertakes to return promptly all equipment, books, keys and other materials that have been made available, when the course is finished or broken off.</text:p>
@@ -1236,7 +1189,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 						<text:p text:style-name="P85">persönlichem Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Studienganges, der Fach-hochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P87">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.8);</text:p>
+						<text:p text:style-name="P87">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.8);</text:p>
 					</text:list-item>
 				</text:list>
 				<text:p text:style-name="P67">
@@ -1292,7 +1245,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P93">
-							<text:soft-page-break/>Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.1<text:span text:style-name="T53">0</text:span>); </text:p>
+							<text:soft-page-break/>Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.10); </text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P83">strafgerichtlicher Verurteilung (wobei die Art des Deliktes und der Grad der Schuld berücksichtigt werden);</text:p>
@@ -1301,7 +1254,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 						<text:p text:style-name="P83">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (z.B. Unkostenbeitrag, Studienbeitrag etc.); </text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P82">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.<text:span text:style-name="T53">6</text:span>);</text:p>
+						<text:p text:style-name="P82">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.6);</text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P82">Plagiieren im Rahmen wissenschaftlicher Arbeiten.</text:p>
@@ -1319,7 +1272,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 				</text:p>
 				<text:list xml:id="list183619874298973" text:continue-numbering="true" text:style-name="WW8Num4">
 					<text:list-item>
-						<text:p text:style-name="P93">breach of confidentiality (see Section 6.2.1<text:span text:style-name="T53">0</text:span>);</text:p>
+						<text:p text:style-name="P93">breach of confidentiality (see Section 6.2.10);</text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P83">a criminal conviction (whereby the nature of the offence and the level of culpability are taken into account);</text:p>
@@ -1328,7 +1281,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 						<text:p text:style-name="P83">non-fulfilment of the financial obligations, despite a reminder (e.g. contribution towards expenses, tuition fees , etc.); </text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P82">refusal to provide any data (see section 6.2.<text:span text:style-name="T53">6</text:span>); </text:p>
+						<text:p text:style-name="P82">refusal to provide any data (see section 6.2.6);</text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P82">plagiarism in academic work.</text:p>
@@ -1354,14 +1307,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 					<text:p text:style-name="P90"/>
 					<text:p text:style-name="P90">Falls das gesamte Studienprogramm in englischer Sprache angeboten wird, erklärt die ao. Studentin bzw. der ao. Student, die englische Sprache in Wort und Schrift in dem für eine akademische Ausbildung erforderlichen Ausmaß zu beherrschen.</text:p>
 					<text:p text:style-name="P90"/>
-					<text:p text:style-name="P90">Ao. Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der ao. Student bzw. die ao. Studentin.</text:p>
+					<text:p text:style-name="P90">Ao. Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der ao. Student bzw. die ao. Studentin.</text:p>
 					<text:p text:style-name="P90"/>
 					<text:p text:style-name="P94">8. Supplementary Agreements </text:p>
 					<text:p text:style-name="P90"/>
 					<text:p text:style-name="P90">If the degree program is offered in English, the external student declares to master the English language in word and in writing to the extent necessary for an academic degree program.</text:p>
 					<text:p text:style-name="P90"/>
 					<text:p text:style-name="P90"/>
-					<text:p text:style-name="P90">External students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet and e-mail) shall be borne by the external student. </text:p>
+					<text:p text:style-name="P90">External students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet) shall be borne by the external student. </text:p>
 				</xsl:if>
 				<text:p text:style-name="P75">
 					<text:span text:style-name="T26">
diff --git a/system/xsl/AusbVerEng_Lehrgaenge.xsl b/system/xsl/AusbVerEng_Lehrgaenge.xsl
index 6abbd6b26..cb5a267cb 100644
--- a/system/xsl/AusbVerEng_Lehrgaenge.xsl
+++ b/system/xsl/AusbVerEng_Lehrgaenge.xsl
@@ -909,53 +909,6 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:p text:style-name="P2">
 					<text:span text:style-name="T15">Geburtsdatum (Date of birth): <text:tab/><xsl:value-of select="gebdatum"/></text:span>
 				</text:p>
-				<text:p text:style-name="P2">
-					<text:span text:style-name="T13">Sozialversicherungsnr. </text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T13">
-							<text:note text:id="ftn1" text:note-class="footnote">
-								<text:note-citation>1</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="Standard">
-										<text:span text:style-name="T18">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T2">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes idgF und der Bildungsdokumentationsverordnung-Fachhochschulen <text:s/>idgF hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln.</text:span>
-									</text:p>
-									<text:p text:style-name="P6"/>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T13"> </text:span>
-					</text:span>
-					<text:span text:style-name="T16">:<text:tab/><xsl:value-of select="svnr"/></text:span>
-				</text:p>
-				<text:p text:style-name="P3">
-					<text:span text:style-name="T15">
-						<text:tab/>(Social security number)</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T15">
-							<text:note text:id="ftn2" text:note-class="footnote">
-								<text:note-citation>2</text:note-citation>
-								<text:note-body>
-									<text:p text:style-name="Standard">
-										<text:span text:style-name="T20">
-											<text:s/>
-										</text:span>
-										<text:span text:style-name="T4">Pursuant to § 3 section 1 of the Education Documentation Act as amended and the Education Documentation Regulation for Universities of Applied Sciences as amended, the operator shall record the social security number pursuant to § 7 paragraph 2 and shall transfer it via the Agency for Quality Assurance and Accreditation Austria to the competent Ministry and Statistics Austria.</text:span>
-									</text:p>
-								</text:note-body>
-							</text:note>
-						</text:span>
-					</text:span>
-					<text:span text:style-name="Footnote_20_Symbol">
-						<text:span text:style-name="T15"> </text:span>
-					</text:span>
-					<text:span text:style-name="T15">: <text:tab/>
-					</text:span>
-				</text:p>
 				<text:p text:style-name="P41"/>
 			</text:section>
 			<text:section text:style-name="Sect1" text:name="Bereich3">
@@ -1355,11 +1308,11 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:p text:style-name="P36">Die ao. Studentin bzw. der ao. Student hat unaufgefordert dafür zu sorgen, dass die von ihr/ihm beigebrachten Daten aktuell sind. Änderungen sind der Studiengangsassistenz unverzüglich schriftlich mitzuteilen. Darüber hinaus trifft sie/ihn die Pflicht, sich von studienbezogenen Informationen, die ihr/ihm an die vom Erhalter zur Verfügung gestellte Emailadresse zugestellt werden, in geeigneter Weise Kenntnis zu verschaffen.</text:p>
 				<text:p text:style-name="P38"/>
 				<text:p text:style-name="P38">6.2.5 Verwertungsrechte </text:p>
-				<text:p text:style-name="P38">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+				<text:p text:style-name="P38">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 				<text:p text:style-name="P38"/>
 				<text:p text:style-name="P38">6.2.6 Aufzeichnungen und Mitschnitte</text:p>
 				<text:p text:style-name="P38">Es ist der/dem ao. Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, WhatsAPP, LinkedIn, XING etc, aber auch auf Youtube, Instagram usw. oder durch sonstige für diese Zwecke geeignete Kommunikations-mittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben. </text:p>
-				<text:p text:style-name="P38">Ausgenommen hiervon ist eine Aufzeichnung zu ausschließlichen Lern-, Studien- und Forschungszwecken und zum privaten Gebrauch, sofern hierfür der / die Vortragende vorab ausdrücklich seine / ihre schriftliche Zustimmung erteilt hat. </text:p>
+				<text:p text:style-name="P38">Ausgenommen hiervon ist eine Aufzeichnung zu ausschließlichen Lern-, Studien- und Forschungszwecken und</text:p>
 				<text:p text:style-name="P92">6.2.4 Updating personal data and the retrieval of information</text:p>
 				<text:p text:style-name="P57">
 					<text:span text:style-name="T48">Without being reminded, the external student must ensure that the data provided by them is up-to-date. Changes are to be immediately communicated to the administrative assistant in writing. Furthermore, it is the students’ responsibility to make themselves suitably aware of information relating to their studies which has been sent to them at the email address provided for them by the operator.</text:span>
@@ -1367,16 +1320,20 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:p text:style-name="P57"/>
 				<text:p text:style-name="P57"/>
 				<text:p text:style-name="P68">6.2.5 Exploitation Rights</text:p>
-				<text:p text:style-name="P68">Unless other arrangements have been agreed between the operator and the external student at an individual level, on written request, the external student undertakes to offer the operator the rights to research and development results. </text:p>
+				<text:p text:style-name="P68">Unless otherwise agreed between the operator and the student on an individual basis, the student is required, upon written request, to offer the operator the rights to research and development results generated as part of funded projects.</text:p>
+				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68">6.2.6 Recordings </text:p>
 				<text:p text:style-name="P68">It is expressly forbidden for the external student to record lectures in part or in total (e.g. by using film and / or sound recordings or other audio-visual means suitable for this purpose). In addition, any form of making the aforementioned recordings publically available (wired or wireless) for example in social networks such as Facebook, WhatsAPP, LinkedIn, XING etc, but also on Youtube, Instagram etc., or by other means of communication designed for these purposes is strictly prohibited. These regulations shall apply correspondingly to scripts, other learning aids and examination data. </text:p>
-				<text:p text:style-name="P68">The only exception is a recording exclusively for the purpose of learning, study and research and for personal use, provided that the lecturer has expressly granted his / her prior written consent.<text:bookmark-start text:name="_Ref78867653"/>
+				<text:p text:style-name="P68">The only exception is a recording exclusively for the purpose of learning, study and research<text:bookmark-start text:name="_Ref78867653"/>
 				</text:p>
-				<text:p text:style-name="P33"/>
-				<text:p text:style-name="P33"/>
-				<text:p text:style-name="P33"/>
+				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68">zum privaten Gebrauch, sofern hierfür der / die Vortragende vorab ausdrücklich seine / ihre schriftliche Zustimmung erteilt hat. </text:p>
+				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P33">
 					<text:soft-page-break/>
 					<text:span text:style-name="T42">6.2.7</text:span>
@@ -1386,8 +1343,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:p text:style-name="P13">Die ao. Studentin bzw. der ao. Student ist zur Geheimhaltung von Forschungs- und Entwicklungsaktivitäten und -ergebnissen gegenüber Dritten verpflichtet. </text:p>
 				<text:p text:style-name="P13"/>
 				<text:p text:style-name="P68">6.2.8 Schadensmeldung</text:p>
-				<text:p text:style-name="P68">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Lehrgangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
-				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Lehrgangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68">6.2.9 Rückgabeverpflichtung bei Studienende</text:p>
 				<text:p text:style-name="P68">Die ao. Studentin bzw. der ao. Student ist verpflichtet, bei einer Beendigung des Lehrgangs unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:p>
@@ -1405,12 +1361,16 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				</text:p>
 				<text:p text:style-name="P70">Die ao. Studentin bzw. der ao. Student kann den Ausbildungsvertrag schriftlich jeweils zum Ende eines Semesters kündigen. <text:span text:style-name="T49">Die Verpflichtung zur vollständigen Leistung der Lehrgangskosten wird von einer Kündigung durch die ao. Studentin bzw. den ao. Studenten nicht berührt.</text:span>
 				</text:p>
-				<text:p text:style-name="P93">6.2.7 Confidentiality </text:p>
+				<text:p text:style-name="P93">and for personal use, provided that the lecturer has expressly granted his / her prior written consent.</text:p>
+				<text:p text:style-name="P13"/>
+				<text:p text:style-name="P68">6.2.7 Confidentiality</text:p>
 				<text:p text:style-name="P13">The external student is required to maintain confidentiality towards third parties of research and development activities and results. </text:p>
 				<text:p text:style-name="P13"/>
 				<text:p text:style-name="P13"/>
 				<text:p text:style-name="P68">6.2.8 Damage Report</text:p>
-				<text:p text:style-name="P68">If any damage should be caused to the inventory of the University of Applied Sciences, the external student undertakes to report this to the administrative assistant of the Certificate Program for Further Education within three days. Any liability claims shall remain unaffected.</text:p>
+				<text:p text:style-name="P68">In the case of damage to the inventory of the University of Applied Sciences, the student is obliged to notify the course secretariat immediately, but no later than within three days. Any liability claims remain unaffected.</text:p>
+				<text:p text:style-name="P68"/>
+				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68"/>
 				<text:p text:style-name="P68">6.2.9 Obligation to Return Borrowed Items</text:p>
 				<text:p text:style-name="P68">The external student undertakes to return promptly all equipment, books, keys and other materials that have been made available, when the Certificate Program for Further Education is finished or broken off.</text:p>
@@ -1461,10 +1421,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 						<text:p text:style-name="P99">persönlichem Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Lehrganges, der Fach-hochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P99">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.<text:span text:style-name="T51">5</text:span>);</text:p>
+						<text:p text:style-name="P99">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.5);</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P99">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.<text:span text:style-name="T51">7</text:span>); </text:p>
+						<text:p text:style-name="P99">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.7); </text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P99">strafgerichtlicher Verurteilung (wobei die Art des Deliktes und der Grad der Schuld berücksichtigt werden);</text:p>
@@ -1501,11 +1461,11 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 						<text:p text:style-name="P99">personal behavior, which leads to an adverse effect on the image and / or operation of the Certificate Program, the university or the operator or on persons who are working for the university or the operator;</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P99">breach of the obligation to offer the operator the rights to research and development results (see Section 6.2.<text:span text:style-name="T51">5</text:span>);<text:line-break/>
+						<text:p text:style-name="P99">breach of the obligation to offer the operator the rights to research and development results (see Section 6.2.5);<text:line-break/>
 						</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P99">breach of confidentiality (see Section 6.2.<text:span text:style-name="T51">7</text:span>);</text:p>
+						<text:p text:style-name="P99">breach of confidentiality (see Section 6.2.7);</text:p>
 					</text:list-item>
 					<text:list-item>
 						<text:p text:style-name="P99">a criminal conviction (whereby the nature of the offence and the level of culpability are taken into account);</text:p>
@@ -1514,13 +1474,13 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:p text:style-name="P115"/>
 				<text:list xml:id="list155838677773193" text:continue-numbering="true" text:style-name="WW8Num4">
 					<text:list-item>
-						<text:p text:style-name="P116">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (z.B. Unkostenbeitrag, Studienbeitrag etc.); </text:p>
+						<text:p text:style-name="P116">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (z.B. Unkostenbeitrag, Studienbeitrag etc.);</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P98">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.<text:span text:style-name="T51">3</text:span>) </text:p>
+						<text:p text:style-name="P98">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.3);</text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P98">Plagiieren im Rahmen wissenschaftlicher Arbeiten </text:p>
+						<text:p text:style-name="P98">Plagiieren im Rahmen wissenschaftlicher Arbeiten.</text:p>
 					</text:list-item>
 				</text:list>
 				<text:p text:style-name="P13"/>
@@ -1532,7 +1492,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 					<text:span text:style-name="T21">8. Ergänzende Vereinbarungen</text:span>
 				</text:p>
 				<text:p text:style-name="P97"/>
-				<text:p text:style-name="P49">Ao. Studierende des Programms sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der ao. Student bzw. die ao. Studentin. </text:p>
+				<text:p text:style-name="P49">Ao. Studierende des Programms sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der ao. Student bzw. die ao. Studentin. </text:p>
 				<text:p text:style-name="P49"/>
 				<text:p text:style-name="P85">
 					<text:span text:style-name="T21">9. Unwirksamkeit von Vertrags-bestimmungen</text:span>
@@ -1549,10 +1509,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 						<text:p text:style-name="P111">non-fulfilment of the financial obligations, despite a reminder (e.g. contribution towards expenses, tuition fees , etc.); </text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P98">refusal to provide any data (see section 6.2.<text:span text:style-name="T51">3</text:span>); </text:p>
+						<text:p text:style-name="P98">refusal to provide any data (see section 6.2.3); </text:p>
 					</text:list-item>
 					<text:list-item>
-						<text:p text:style-name="P98">plagiarism in academic work</text:p>
+						<text:p text:style-name="P98">plagiarism in academic work.</text:p>
 					</text:list-item>
 				</text:list>
 				<text:p text:style-name="P13"/>
@@ -1566,7 +1526,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 					<text:span text:style-name="T21">8. Supplementary Agreements</text:span>
 				</text:p>
 				<text:p text:style-name="P46"/>
-				<text:p text:style-name="P45">External students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet and e-mail) shall be borne by the external student. </text:p>
+				<text:p text:style-name="P45">External students in the program are required to obtain and maintain computer equipment which allows them to participate in the distance learning elements. The total cost of acquisition and operation (including costs for Internet) shall be borne by the external student. </text:p>
 				<text:p text:style-name="P45"/>
 				<text:p text:style-name="P45"/>
 				<text:p text:style-name="P86">
diff --git a/system/xsl/Ausbildungsver_0.xsl b/system/xsl/Ausbildungsver_0.xsl
index 9578c4b28..62ccd3b70 100644
--- a/system/xsl/Ausbildungsver_0.xsl
+++ b/system/xsl/Ausbildungsver_0.xsl
@@ -363,7 +363,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</text:sequence-decls>
 		<text:h text:style-name="P22" text:outline-level="1" text:is-list-header="true">Ausbildungsvertrag</text:h>
 				<!-- Ueberprueft ob benoetigte Datenfelder leer sind -->
-				<xsl:if test="svnr = ''"><text:p text:style-name="P42">Keine Sozialversicherungsnummer oder Ersatzkennzeichen vorhanden</text:p></xsl:if>
 				<xsl:if test="gebdatum = ''"><text:p text:style-name="P42">Kein Geburtsdatum vorhanden</text:p></xsl:if>
 				<xsl:if test="titel_kurzbz = ''"><text:p text:style-name="P42">Kein akademischer Grad vorhanden</text:p></xsl:if>
 				<xsl:if test="student_maxsemester = ''"><text:p text:style-name="P42">Keine Ausbildungsdauer vorhanden</text:p></xsl:if>
@@ -384,25 +383,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</text:p>
 		<text:p text:style-name="P6">Adresse: <text:tab/><xsl:value-of select="strasse"/>; <xsl:value-of select="plz"/></text:p>
 		<text:p text:style-name="P7">Geburtsdatum: <text:tab/><text:database-display text:table-name="" text:table-type="table" text:column-name="Geb.datum"><xsl:value-of select="gebdatum"/></text:database-display></text:p>
-		<text:p text:style-name="P1">
-		<text:span text:style-name="T10"><text:span text:style-name="T10">Sozialversicherungsnummer:</text:span>
-		<text:span text:style-name="Footnote_20_Symbol">
-			<text:span text:style-name="T10">
-			<text:note text:id="ftn1" text:note-class="footnote">
-			 <text:note-citation text:label="1">1</text:note-citation>
-				<text:note-body>
-				<text:p text:style-name="Standard">
-					<text:span text:style-name="T4">
-					<text:s/>
-					</text:span>
-					<text:span text:style-name="T5">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes idgF und der Bildungsdokumentationsverordnung-Fachhochschulen idgF<text:s/> hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln.</text:span>
-				</text:p>
-				<text:p text:style-name="P10"/>
-				</text:note-body>
-			</text:note>
-			</text:span>
-		</text:span><text:tab/><xsl:value-of select="svnr"/></text:span>
-		</text:p>
 		<text:p text:style-name="P11"/>
 		<text:p text:style-name="P4">(kurz „Studentin“ bzw. „Student“ genannt) andererseits im Rahmen des <xsl:value-of select="studiengang_typ"/> Studienganges „<xsl:value-of select="studiengang"/>“, StgKz <xsl:value-of select="studiengang_kz"/>, in der Organisationsform eines 
 	<xsl:choose>
@@ -577,7 +557,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P35">Die Studentin bzw. der Student hat unaufgefordert dafür zu sorgen, dass die von ihr/ihm beigebrachten Daten aktuell sind. Änderungen sind der Studiengangsassistenz unverzüglich schriftlich mitzuteilen. Darüber hinaus trifft sie/ihn die Pflicht, sich von studienbezogenen Informationen, die ihr/ihm an die vom Erhalter zur Verfügung gestellte Emailadresse zugestellt werden, in geeigneter Weise Kenntnis zu verschaffen.</text:p>
 		
 		<text:p text:style-name="P32">6.2.9 Verwertungsrechte</text:p>
-		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der Studentin oder dem Studenten getroffen wurden, ist die Studentin oder der Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der Studentin oder dem Studenten getroffen wurden, ist die Studentin oder der Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 		
 		<text:p text:style-name="P32">6.2.10 Aufzeichnungen und Mitschnitte</text:p>
 		<text:p text:style-name="P35">Es ist der/dem Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, StudiVZ etc., aber auch auf Youtube usw. oder durch sonstige für diese Zwecke geeignete Kommunikationsmittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben.</text:p>
@@ -592,7 +572,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P5"/>
 		
 		<text:p text:style-name="P5">6.2.13 Schadensmeldung</text:p>
-		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
+		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die Studierende verpflichtet, diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 		<text:p text:style-name="P5"/>
 		
 		<text:p text:style-name="P5">6.2.14 Rückgabeverpflichtung bei Studienende</text:p>
@@ -636,7 +616,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<text:p text:style-name="P40">persönlichem Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Studienganges, der Fachhochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.9);</text:p>
+			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.9);</text:p>
 		</text:list-item>
 		<text:list-item>
 			<text:p text:style-name="P40">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.11); </text:p>
@@ -648,10 +628,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<text:p text:style-name="P40">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (z.B. Unkostenbeitrag, Studienbeitrag etc.);</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.7)</text:p>
+			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.7);</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten</text:p>
+			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten.</text:p>
 		</text:list-item>
 		</text:list>
 		<text:p text:style-name="P12"/>
@@ -673,7 +653,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P5">Das gesamte Studienprogramm wird in englischer Sprache angeboten. Die Studentin bzw. der Student erklärt, die englische Sprache in Wort und Schrift in dem für eine akademische Ausbildung erforderlichen Ausmaß zu beherrschen.</text:p>
 		<text:p text:style-name="P17"/>
 		<text:p text:style-name="P5">
-		Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der Student bzw. die Studentin.
+		Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der Student bzw. die Studentin.
 		</text:p>
 		<text:p text:style-name="P5"/>
 	</xsl:if>
diff --git a/system/xsl/Ausbildungsver_9005.xsl b/system/xsl/Ausbildungsver_9005.xsl
index 14ec2820a..af22bdb71 100644
--- a/system/xsl/Ausbildungsver_9005.xsl
+++ b/system/xsl/Ausbildungsver_9005.xsl
@@ -359,7 +359,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</text:sequence-decls>
 		<text:h text:style-name="P22" text:outline-level="1" text:is-list-header="true">Ausbildungsvertrag außerordentliches Studium (Besuch einzelner Lehrveranstaltungen eines Studiengangs)</text:h>
 			<!-- Ueberprueft ob benoetigte Datenfelder leer sind -->
-			<xsl:if test="svnr = ''"><text:p text:style-name="P42">Keine Sozialversicherungsnummer oder Ersatzkennzeichen vorhanden</text:p></xsl:if>
 			<xsl:if test="gebdatum = ''"><text:p text:style-name="P42">Kein Geburtsdatum vorhanden</text:p></xsl:if>
 			<xsl:if test="student_maxsemester = ''"><text:p text:style-name="P42">Keine Ausbildungsdauer vorhanden</text:p></xsl:if>
 		<text:p text:style-name="P2"/>
@@ -378,25 +377,6 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</text:p>
 		<text:p text:style-name="P6">Adresse: <text:tab/><xsl:value-of select="strasse"/>; <xsl:value-of select="plz"/></text:p>
 		<text:p text:style-name="P7">Geburtsdatum: <text:tab/><text:database-display text:table-name="" text:table-type="table" text:column-name="Geb.datum"><xsl:value-of select="gebdatum"/></text:database-display></text:p>
-		<text:p text:style-name="P1">
-		<text:span text:style-name="T10"><text:span text:style-name="T10">Sozialversicherungsnummer:</text:span>
-		<text:span text:style-name="Footnote_20_Symbol">
-			<text:span text:style-name="T10">
-			<text:note text:id="ftn1" text:note-class="footnote">
-			 <text:note-citation text:label="1">1</text:note-citation>
-				<text:note-body>
-				<text:p text:style-name="Standard">
-					<text:span text:style-name="T4">
-					<text:s/>
-					</text:span>
-					<text:span text:style-name="T5">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes idgF und der Bildungsdokumentationsverordnung-Fachhochschulen <text:s/> idgF hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln.</text:span>
-				</text:p>
-				<text:p text:style-name="P10"/>
-				</text:note-body>
-			</text:note>
-			</text:span>
-		</text:span><text:tab/><xsl:value-of select="svnr"/></text:span>
-		</text:p>
 		<text:p text:style-name="P11"/>
 		<text:p text:style-name="P4">(kurz „ao. Studentin“ bzw. „ao. Student“ genannt) andererseits im Rahmen des außerordentlichen Studiums bzw. des Besuchs einzelner Lehrveranstaltungen an der FH Technikum Wien.</text:p>
 		<text:p text:style-name="P4">Die konkreten Lehrveranstaltungen des außerordentlichen Studiums sind in der Information über die Zulassung zum außerordentlichen Studium angeführt.</text:p>
@@ -528,7 +508,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P32">6.2.7 Aktualisierung eigener Daten und Bezug von Informationen</text:p>
 		<text:p text:style-name="P35">Die ao. Studentin bzw. der ao. Student hat unaufgefordert dafür zu sorgen, dass die von ihr/ihm beigebrachten Daten aktuell sind. Änderungen sind der Studiengangsassistenz unverzüglich schriftlich mitzuteilen. Darüber hinaus trifft sie/ihn die Pflicht, sich von studienbezogenen Informationen, die ihr/ihm an die vom Erhalter zur Verfügung gestellte Emailadresse zugestellt werden, in geeigneter Weise Kenntnis zu verschaffen.</text:p>
 		<text:p text:style-name="P32">6.2.8 Verwertungsrechte</text:p>
-		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 		<text:p text:style-name="P32">6.2.9 Aufzeichnungen und Mitschnitte</text:p>
 		<text:p text:style-name="P35">Es ist der/dem ao. Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, StudiVZ etc, aber auch auf Youtube usw. oder durch sonstige für diese Zwecke geeignete Kommunikationsmittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben.</text:p>
 		<text:p text:style-name="P35">Ausgenommen hiervon ist eine Aufzeichnung zu ausschließlichen Lern-, Studien- und Forschungszwecken und zum privaten Gebrauch, sofern hierfür der/die Vortragende vorab ausdrücklich seine/ihre schriftliche Zustimmung erteilt hat.</text:p>
@@ -537,7 +517,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P31">6.2.11 Unfallmeldung</text:p>
 		<text:p text:style-name="P5">Im Falle eines Unfalles mit körperlicher Verletzung des/der ao. Studierenden im Zusammenhang mit dem ao. Studium ist die/der ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Dies betrifft auch Wegunfälle zur oder von der FH.</text:p>
 		<text:p text:style-name="P31">6.2.12 Schadensmeldung</text:p>
-		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
+		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Studiengangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 		<text:p text:style-name="P31">6.2.13 Rückgabeverpflichtung bei Studienende</text:p>
 		<text:p text:style-name="P5">Die ao. Studentin bzw der ao. Student ist verpflichtet, bei einer Beendigung des ao. Ausbildungsverhältnisses unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:p>
 		<text:p text:style-name="P5"/>
@@ -575,7 +555,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<text:p text:style-name="P40">persönlichem Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Studienganges, der Fachhochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.8);</text:p>
+			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.8);</text:p>
 		</text:list-item>
 		<text:list-item>
 			<text:p text:style-name="P40">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.10); </text:p>
@@ -587,10 +567,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<text:p text:style-name="P40">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (z.B. Unkostenbeitrag, Studienbeitrag etc.);</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.5)</text:p>
+			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.5);</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten</text:p>
+			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten.</text:p>
 		</text:list-item>
 		</text:list>
 		<text:p text:style-name="P12"/>
@@ -614,7 +594,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</text:list>
 		<text:p text:style-name="P5">Das gesamte Studienprogramm wird in englischer Sprache angeboten. Die ao. Studentin bzw. der ao. Student erklärt, die englische Sprache in Wort und Schrift in dem für eine akademische Ausbildung erforderlichen Ausmaß zu beherrschen.</text:p>
 		<text:p text:style-name="P17"/>
-		<text:p text:style-name="P5">Ao. Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der ao. Student bzw. die ao. Studentin.</text:p>
+		<text:p text:style-name="P5">Ao. Studierende des Studiengangs sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der ao. Student bzw. die ao. Studentin.</text:p>
 		<text:p text:style-name="P5"/>
 	</xsl:if>
 
diff --git a/system/xsl/Ausbildungsver_Lehrgaenge.xsl b/system/xsl/Ausbildungsver_Lehrgaenge.xsl
index 8e711bd2a..616d90c1f 100644
--- a/system/xsl/Ausbildungsver_Lehrgaenge.xsl
+++ b/system/xsl/Ausbildungsver_Lehrgaenge.xsl
@@ -432,25 +432,6 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 		</text:p>
 		<text:p text:style-name="P6">Adresse: <text:tab/><xsl:value-of select="strasse"/>; <xsl:value-of select="plz"/></text:p>
 		<text:p text:style-name="P7">Geburtsdatum: <text:tab/><text:database-display text:table-name="" text:table-type="table" text:column-name="Geb.datum"><xsl:value-of select="gebdatum"/></text:database-display></text:p>
-		<text:p text:style-name="P1">
-		<text:span text:style-name="T10"><text:span text:style-name="T10">Sozialversicherungsnummer:</text:span>
-		<text:span text:style-name="Footnote_20_Symbol">
-			<text:span text:style-name="T10">
-			<text:note text:id="ftn1" text:note-class="footnote">
-			 <text:note-citation text:label="1">1</text:note-citation>
-				<text:note-body>
-				<text:p text:style-name="Standard">
-					<text:span text:style-name="T4">
-					<text:s/>
-					</text:span>
-					<text:span text:style-name="T5">Gemäß § 3 Absatz 1 des Bildungsdokumentationsgesetzes und der Bildungsdokumentationsverordnung-Fachhochschulen <text:s/>hat der Erhalter die Sozialversicherungsnummer zu erfassen und gemäß § 7 Absatz 2 im Wege der Agentur für Qualitätssicherung und Akkreditierung Austria an das zuständige Bundesministerium und die Bundesanstalt Statistik Österreich zu übermitteln.</text:span>
-				</text:p>
-				<text:p text:style-name="P10"/>
-				</text:note-body>
-			</text:note>
-			</text:span>
-		</text:span><text:tab/><xsl:value-of select="svnr"/></text:span>
-		</text:p>
 		<text:p text:style-name="P11"/>
 		<text:p text:style-name="P4">(kurz „ao. Studentin“ bzw. „ao. Student“ genannt) andererseits, im Rahmen des Lehrgangs zur Weiterbildung nach §9 FHStG idgF</text:p>
 		<text:p text:style-name="P11"/>
@@ -614,14 +595,14 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 		<text:p text:style-name="P32">6.2.4 Aktualisierung eigener Daten und Bezug von Informationen</text:p>
 		<text:p text:style-name="P35">Die ao. Studentin bzw. der ao. Student hat unaufgefordert dafür zu sorgen, dass die von ihr/ihm beigebrachten Daten aktuell sind. Änderungen sind der Lehrgangsassistenz unverzüglich schriftlich mitzuteilen. Darüber hinaus trifft sie/ihn die Pflicht, sich von studienbezogenen Informationen, die ihr/ihm an die vom Erhalter zur Verfügung gestellte Emailadresse zugestellt werden, in geeigneter Weise Kenntnis zu verschaffen.</text:p>
 		<text:p text:style-name="P32">6.2.5 Verwertungsrechte</text:p>
-		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen auf dessen schriftliche Anfrage hin anzubieten.</text:p>
+		<text:p text:style-name="P35">Sofern nicht im Einzelfall andere Regelungen zwischen dem Erhalter und der ao. Studentin oder dem ao. Studenten getroffen wurden, ist die ao. Studentin oder der ao. Student verpflichtet, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen, die im Rahmen von geförderten Projekten geschaffen wurden, auf dessen schriftliche Anfrage hin einzuräumen.</text:p>
 		<text:p text:style-name="P32">6.2.6 Aufzeichnungen und Mitschnitte</text:p>
 		<text:p text:style-name="P35">Es ist der/dem ao. Studierenden ausdrücklich untersagt, Lehrveranstaltungen als Ganzes oder nur Teile davon aufzuzeichnen und/oder mitzuschneiden (z.B. durch Film- und/oder Tonaufnahmen oder sonstige hierfür geeignete audiovisuelle Mittel). Darüber hinaus ist jede Form der öffentlichen Zurverfügungstellung (drahtlos oder drahtgebunden) der vorgenannten Aufnahmen z.B. in sozialen Netzwerken wie Facebook, WhatsAPP, LinkedIn, Xing etc, aber auch auf Youtube, Instagram usw. oder durch sonstige für diese Zwecke geeignete Kommunikationsmittel untersagt. Diese Regelungen gelten sinngemäß auch für Skripten, sonstige Lernbehelfe und Prüfungsangaben.</text:p>
 		<text:p text:style-name="P35">Ausgenommen hiervon ist eine Aufzeichnung zu ausschließlichen Lern-, Studien- und Forschungszwecken und zum privaten Gebrauch, sofern hierfür der/die Vortragende vorab ausdrücklich seine/ihre schriftliche Zustimmung erteilt hat.</text:p>
 		<text:p text:style-name="P31">6.2.7 Geheimhaltungspflicht</text:p>
 		<text:p text:style-name="P5">Die ao. Studentin bzw. der ao. Student ist zur Geheimhaltung von Forschungs- und Entwicklungsaktivitäten und -ergebnissen gegenüber Dritten verpflichtet. </text:p>
 		<text:p text:style-name="P31">6.2.8 Schadensmeldung</text:p>
-		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen innerhalb von drei Tagen dem Lehrgangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
+		<text:p text:style-name="P5">Im Falle des Eintretens eines Schadens am Inventar der Fachhochschule ist der/die ao. Studierende verpflichtet, diesen unverzüglich, spätestens aber innerhalb von drei Tagen dem Lehrgangssekretariat zu melden. Allfällige Haftungsansprüche bleiben hiervon unberührt.</text:p>
 		<text:p text:style-name="P31">6.2.9 Rückgabeverpflichtung bei Studienende</text:p>
 		<text:p text:style-name="P5">Die ao. Studentin bzw. der ao. Student ist verpflichtet, bei einer Beendigung des Lehrgangs unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:p>
 
@@ -663,10 +644,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P40">persönlichem Verhalten, das zu einer Beeinträchtigung des Images und/oder Betriebes des Lehrgangs, der Fachhochschule bzw. des Erhalters oder von Personen führt, die für die Fachhochschule bzw. den Erhalter tätig sind;</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.3)</text:p>
+			<text:p text:style-name="P40">Weigerung zur Beibringung von Daten (siehe Pkt. 6.2.3);</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen anzubieten (siehe Pkt. 6.2.5);</text:p>
+			<text:p text:style-name="P40">Verletzung der Verpflichtung, dem Erhalter die Rechte an Forschungs- und Entwicklungsergebnissen einzuräumen (siehe Pkt. 6.2.5);</text:p>
 		</text:list-item>
 		<text:list-item>
 			<text:p text:style-name="P40">Verletzung der Geheimhaltungspflicht (siehe Pkt. 6.2.7); </text:p>
@@ -678,7 +659,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P40">Nichterfüllung finanzieller Verpflichtungen trotz Mahnung;</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten</text:p>
+			<text:p text:style-name="P40">Plagiieren im Rahmen wissenschaftlicher Arbeiten.</text:p>
 		</text:list-item>
 		</text:list>
 		<text:p text:style-name="P12"/>
@@ -698,7 +679,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 		</text:list-item>
 		</text:list>
 		<text:p text:style-name="P5">
-		Ao. Studierende des Programms sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet und e-mail) trägt der ao. Student bzw. die ao. Studentin.
+		Ao. Studierende des Programms sind verpflichtet, eine EDV-Ausstattung zu beschaffen und zu unterhalten, die es ermöglicht, an den Fernlehrelementen teilzunehmen. Die gesamten Kosten der Anschaffung und des Betriebs (inkl. Kosten für Internet) trägt der ao. Student bzw. die ao. Studentin.
 		</text:p>
 		<text:p text:style-name="P5"/>
 
diff --git a/system/xsl/accountinfoblatt_0.xsl b/system/xsl/accountinfoblatt_0.xsl
index 6d68de283..82995634a 100644
--- a/system/xsl/accountinfoblatt_0.xsl
+++ b/system/xsl/accountinfoblatt_0.xsl
@@ -227,7 +227,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P8">Linux: Nach dem Systemstart im Boot Manager einfach Linux auswählen. Das System startet mit dem KDE Login Manager. Dort ist ebenfalls der Accountname und das Passwort einzugeben.</text:p>
 			<text:p text:style-name="P8"/>
 			<text:p text:style-name="P6">Ändern des Passwortes</text:p>
-			<text:p text:style-name="P8">Zur Änderung Ihres Passwortes loggen Sie sich mit Ihrem Webbrowser auf https://cis.technikum-wien.at ein und wählen dem Menüpunkt &apos;Profil &gt; Passwort ändern&apos;.</text:p>
+			<text:p text:style-name="P8">Zur Änderung Ihres Passwortes loggen Sie sich mit Ihrem Webbrowser auf https://cis.technikum-wien.at ein und wählen dem Menüpunkt &apos;Mein CIS &gt; Passwort ändern&apos;.</text:p>
 			<text:p text:style-name="P8"/>
 			<text:p text:style-name="P6">Wie und wo kann ich meine Daten ablegen?</text:p>
 			<text:p text:style-name="P8">Nach einem erfolgreichen Login ist unter Windows XP/7 das Laufwerk M: mit Ihrem Userverzeichnis am Server verbunden. Dort haben Sie die Möglichkeit Ihre Daten abzulegen. Achten Sie immer darauf, Ihr Quota (Speicherplatz den Sie zur Verfügung haben) nicht zu überschreiten. Einige Programme funktionieren dann nicht mehr einwandfrei.</text:p>
@@ -280,7 +280,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P8"/>
 			<text:p text:style-name="P6">Password Change</text:p>
 			<text:p text:style-name="P8">Open your web browser and go to https://cis.technikum-wien.at. Enter your user name (Account) and</text:p>
-			<text:p text:style-name="P8">password, select &quot;Profile &gt; Change Password&quot; from the pane on the left and follow the instructions.</text:p>
+			<text:p text:style-name="P8">password, select &quot;My CIS &gt; Change Password&quot; from the pane on the left and follow the instructions.</text:p>
 			<text:p text:style-name="P8"/>
 			<text:p text:style-name="P6">Disk space for your files</text:p>
 			<text:p text:style-name="P8">In Windows XP and Windows 7, log in to the UAS Technikum Wien domain, and you will be automatically</text:p>

From e527c9f6d7b3ed360e6118abcd36fa71550ec1f7 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:52:01 +0200
Subject: [PATCH 09/44] Mlist_Generate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Initiales Löchen von inaktiven BenutzerInnen  berücksichtigt lehre-Atrribut statt Studiengang=0
---
 system/mlists/mlists_generate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/mlists/mlists_generate.php b/system/mlists/mlists_generate.php
index aca2e9b17..18123d0a4 100644
--- a/system/mlists/mlists_generate.php
+++ b/system/mlists/mlists_generate.php
@@ -78,12 +78,12 @@ $error_msg='';
 	}
 
 	/**
-	 * Löscht alle BenutzerInnen aus NICHT-generierten Verteilern im Studiengang 0 (Erhalter), deren Account vor mehr als 3 Wochen deaktiviert wurde
+	 * Löscht alle BenutzerInnen aus NICHT-generierten Verteilern die nicht für die Lehre sind (Attribut lehre=false), deren Account vor mehr als 3 Wochen deaktiviert wurde
 	 */
 
 	$qry_delete = "	DELETE FROM public.tbl_benutzergruppe
 					WHERE tbl_benutzergruppe.studiensemester_kurzbz IS NULL
-					AND gruppe_kurzbz IN (SELECT gruppe_kurzbz FROM public.tbl_gruppe WHERE generiert=false AND studiengang_kz=0)
+					AND gruppe_kurzbz IN (SELECT gruppe_kurzbz FROM public.tbl_gruppe WHERE generiert=false AND lehre=false)
 					AND uid IN (SELECT uid FROM public.tbl_benutzer WHERE aktiv=false AND updateaktivam<now()-'3 weeks'::interval);";
 
 	if(!($result = $db->db_query($qry_delete)))

From 15180bd6f5ab61b38b0da6e84a3f197572e2c5e4 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:55:48 +0200
Subject: [PATCH 10/44] Notenverwaltung
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hinweis an LektorInnen, wenn geänderte, nicht freigegebene Noten vorhanden sind
- Attribute "offiziell" und "bezeichung_mehrsprachig" in Klasse eingebaut
---
 .../benotungstool/lvgesamtnoteverwalten.php   | 782 +++++++++---------
 include/note.class.php                        | 117 ++-
 locale/de-AT/benotungstool.php                |   1 +
 locale/en-US/benotungstool.php                |   1 +
 4 files changed, 511 insertions(+), 390 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index b65af39b4..fa9bdc980 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -1,50 +1,47 @@
 <?php
-/* Copyright (C) 2006 Technikum-Wien
- *
+/*
+ * Copyright (C) 2006 Technikum-Wien
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * 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> and
- *		  Rudolf Hangl 		< rudolf.hangl@technikum-wien.at >
- *		  Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
+ * Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ * Rudolf Hangl < rudolf.hangl@technikum-wien.at >
+ * Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
  */
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../config/global.config.inc.php');
-require_once('../../../../include/functions.inc.php');
-require_once('../../../../include/lehrveranstaltung.class.php');
-require_once('../../../../include/studiengang.class.php');
-require_once('../../../../include/studiensemester.class.php');
-require_once('../../../../include/lehreinheit.class.php');
-require_once('../../../../include/benutzerberechtigung.class.php');
-require_once('../../../../include/uebung.class.php');
-require_once('../../../../include/beispiel.class.php');
-require_once('../../../../include/studentnote.class.php');
-require_once('../../../../include/datum.class.php');
-require_once('../../../../include/legesamtnote.class.php');
-require_once('../../../../include/lvgesamtnote.class.php');
-require_once('../../../../include/zeugnisnote.class.php');
-require_once('../../../../include/pruefung.class.php');
-require_once('../../../../include/person.class.php');
-require_once('../../../../include/benutzer.class.php');
-require_once('../../../../include/mitarbeiter.class.php');
-require_once('../../../../include/mail.class.php');
-require_once('../../../../include/phrasen.class.php');
-require_once('../../../../include/note.class.php');
-require_once('../../../../include/notenschluessel.class.php');
-require_once('../../../../include/studienplan.class.php');
-require_once('../../../../include/addon.class.php');
+require_once ('../../../../config/cis.config.inc.php');
+require_once ('../../../../config/global.config.inc.php');
+require_once ('../../../../include/functions.inc.php');
+require_once ('../../../../include/lehrveranstaltung.class.php');
+require_once ('../../../../include/studiengang.class.php');
+require_once ('../../../../include/studiensemester.class.php');
+require_once ('../../../../include/lehreinheit.class.php');
+require_once ('../../../../include/benutzerberechtigung.class.php');
+require_once ('../../../../include/uebung.class.php');
+require_once ('../../../../include/beispiel.class.php');
+require_once ('../../../../include/studentnote.class.php');
+require_once ('../../../../include/datum.class.php');
+require_once ('../../../../include/legesamtnote.class.php');
+require_once ('../../../../include/lvgesamtnote.class.php');
+require_once ('../../../../include/zeugnisnote.class.php');
+require_once ('../../../../include/pruefung.class.php');
+require_once ('../../../../include/person.class.php');
+require_once ('../../../../include/benutzer.class.php');
+require_once ('../../../../include/mitarbeiter.class.php');
+require_once ('../../../../include/mail.class.php');
+require_once ('../../../../include/phrasen.class.php');
+require_once ('../../../../include/note.class.php');
+require_once ('../../../../include/notenschluessel.class.php');
+require_once ('../../../../include/studienplan.class.php');
+require_once ('../../../../include/addon.class.php');
 
 $summe_stud = 0;
 $summe_t2 = 0;
@@ -54,30 +51,30 @@ $grades = array();
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
-if (!$db = new basis_db())
+if (! $db = new basis_db())
 	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
 
 $user = get_uid();
-if (!check_lektor($user))
+if (! check_lektor($user))
 	die($p->t('global/keineBerechtigungFuerDieseSeite'));
 $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($user);
 
-if (isset($_GET['lvid']) && is_numeric($_GET['lvid'])) //Lehrveranstaltung_id
+if (isset($_GET['lvid']) && is_numeric($_GET['lvid'])) // Lehrveranstaltung_id
 	$lvid = $_GET['lvid'];
 else
 	die($p->t('global/fehlerBeiDerParameteruebergabe'));
 
-if (isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
+if (isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) // Lehreinheit_id
 	$lehreinheit_id = $_GET['lehreinheit_id'];
 else
 	$lehreinheit_id = '';
-//Laden der Lehrveranstaltung
+// Laden der Lehrveranstaltung
 $lv_obj = new lehrveranstaltung();
-if (!$lv_obj->load($lvid))
+if (! $lv_obj->load($lvid))
 	die($lv_obj->errormsg);
 
-//Studiengang laden
+// Studiengang laden
 $stg_obj = new studiengang($lv_obj->studiengang_kz);
 
 $datum_obj = new datum();
@@ -87,7 +84,7 @@ if (isset($_GET['stsem']))
 else
 	$stsem = '';
 
-if ($stsem != '' && !check_stsem($stsem))
+if ($stsem != '' && ! check_stsem($stsem))
 	die($p->t('anwesenheitsliste/studiensemesterIstUngueltig'));
 
 $datum_obj = new datum();
@@ -95,6 +92,11 @@ $datum_obj = new datum();
 $noten_obj = new note();
 $noten_obj->getAll();
 
+$sprachen = new sprache();
+$sprachen->getAll(true);
+
+$errormsg = '';
+
 echo '<!DOCTYPE HTML>
 <html>
 <head>
@@ -144,6 +146,26 @@ echo '<!DOCTYPE HTML>
 		border-width:1px;
 		border-color:#333333;
 	}
+	.error
+	{
+		padding: 15px;
+		margin-bottom: 20px;
+		border: 1px solid transparent;
+		border-radius: 4px;
+		color: #a94442;
+		background-color: #f2dede;
+		border-color: #ebccd1;
+	}
+	.warning
+	{
+		padding: 15px;
+		margin-bottom: 20px;
+		border: 1px solid transparent;
+		border-radius: 4px;
+		color: #8a6d3b;
+		background-color: #fcf8e3;
+		border-color: #faebcc;
+	}
 	</style>
 	<script language="JavaScript" type="text/javascript">
 	var notenrequests = 0;
@@ -154,12 +176,14 @@ echo '<!DOCTYPE HTML>
 $noten_array = array();
 foreach ($noten_obj->result as $row)
 {
-	echo "	noten_array['".$row->note."']='".addslashes($row->bezeichnung)."';\n";
+	echo "	noten_array['" . $row->note . "']='" . addslashes($row->bezeichnung) . "';\n";
 	$noten_array[$row->note]['bezeichnung'] = $row->bezeichnung;
 	$noten_array[$row->note]['positiv'] = $row->positiv;
 	$noten_array[$row->note]['aktiv'] = $row->aktiv;
 	$noten_array[$row->note]['lehre'] = $row->lehre;
 	$noten_array[$row->note]['anmerkung'] = $row->anmerkung;
+	foreach ($sprachen->result AS $s)
+		$noten_array[$row->note]['bezeichnung_mehrsprachig'][$s->sprache] = $row->bezeichnung_mehrsprachig[$s->sprache];
 }
 
 ?>
@@ -251,52 +275,55 @@ foreach ($noten_obj->result as $row)
 					notenode = document.createTextNode(notentext);
 					notentd.appendChild(notenode);
 					notenstatus = document.getElementById("status_"+uid);
+					changedwarning = document.getElementById("messagesdiv");
+					warningdiv = document.getElementById("notenWarning");
 					if (resp == "update_f")
+					{
 						notenstatus.innerHTML = "<img src='../../../../skin/images/changed.png'>";
+						if (warningdiv != null)
+							warningdiv.parentNode.removeChild(warningdiv); // Entfernt das Warning-Div
+						changedwarning.innerHTML = '<div class="warning"><?php echo $p->t('benotungstool/geaenderteNotenVorhanden'); ?></div>';
+					}
 				}
-				else
-		 		{
-			 		alert(resp);
-			 		document.getElementById(uid).note.value="";
-		 		}
-  			},
-  			error:function(result)
-  			{
-  				alert('Speichern der Note fehlgeschlagen');
-  			}
-  		});
-	}
-
-	// *************************************************
-	// * Formular zum Eintragen einer Pruefung erstellen
-	// *************************************************
-	function pruefungAnlegen(uid,datum,note,lehreinheit_id,punkte,typ)
-	{
-		if (typeof(typ)=='undefined')
-			typ = 'Termin2';
-		var str = "<form name='nachpruefung_form'><table style='width:95%'>";
-		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
-
-		var anlegendiv = document.getElementById("nachpruefung_div");
-		var y = getOffset('y');
-		y = y+50;
-		anlegendiv.style.top = y+"px";
-		var x = getOffset('x');
-		x = x+300;
-
-		anlegendiv.style.left = x+"px";
-
-		str += "<tr><td colspan='2'><b><?php echo $p->t('benotungstool/pruefungAnlegenFuer');?> "+uid+":</b></td></tr>";
-		str += "<tr><td><?php echo $p->t('global/datum');?>:</td>";
-		str += "<td><input type='hidden' name='uid' value='"+uid+"'>";
-		str += "<input type='hidden' name='le_id' value='"+lehreinheit_id+"'>";
-		str += "<input type='hidden' name='typ' value='"+typ+"'>";
-		str += "<input type='text' id='pruefungsdatum' name='datum' size='10' value='"+datum+"'> [DD.MM.YYYY]</td></tr>";
+				else 
+				{ 
+					alert(resp); 
+					document.getElementById(uid).note.value=""; 
+				}
+			}, 
+			error:function(result)
+			{
+				alert('Speichern der Note fehlgeschlagen');
+			}
+		});
+	} 
+	
+	// ************************************************* 
+	// * Formular zum Eintragen einer Pruefung erstellen 
+	// ************************************************* 
+	function pruefungAnlegen(uid,datum,note,lehreinheit_id,punkte,typ) 
+	{ 
+		if(typeof(typ)=='undefined') 
+			typ = 'Termin2'; 
+			var str = " <form name='nachpruefung_form'>	<table style='width: 95%'>"; 
+			str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>"; 
+			
+			var anlegendiv = document.getElementById("nachpruefung_div"); 
+			var y = getOffset('y'); y = y+50; 
+			anlegendiv.style.top = y+"px"; 
+			var x =	getOffset('x'); x = x+300; 
+			anlegendiv.style.left = x+"px"; 
+			str += "<tr><td colspan='2'><b><?php echo $p->t('benotungstool/pruefungAnlegenFuer');?> "+uid+":</b></td></tr>"; 
+			str += "<tr><td><?php echo $p->t('global/datum');?>:</td>"; 
+			str += "<td><input type='hidden' name='uid' value='"+uid+"'>"; 
+			str += "<input type='hidden' name='le_id' value='"+lehreinheit_id+"'>"; 
+			str += "<input type='hidden' name='typ' value='"+typ+"'>"; 
+			str += "<input type='text' id='pruefungsdatum' name='datum' size='10' value='"+datum+"'> [DD.MM.YYYY]</td></tr>";
 
 		<?php
 		if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 		{
-			echo 'str += "<tr><td>'.$p->t('benotungstool/punkte').':</td>";';
+			echo 'str += "<tr><td>' . $p->t('benotungstool/punkte') . ':</td>";';
 			echo 'str += "<td><input type=\'text\' id=\'pruefungspunkte\' name=\'punkte\' ';
 			echo 'size=\'10\' value=\'"+punkte+"\' oninput=\'PruefungPunkteEingabe()\'></td></tr>";';
 		}
@@ -310,13 +337,13 @@ foreach ($noten_obj->result as $row)
 		foreach ($noten_obj->result as $row_note)
 		{
 			if ($row_note->lehre && $row_note->aktiv)
-				echo '<option value="'.$row_note->note.'">'.$row_note->bezeichnung.'</option>';
+				echo '<option value="' . $row_note->note . '">' . $row_note->bezeichnung_mehrsprachig[$sprache] . '</option>';
 		}
 		echo '</select></td>';
 		?>';
-		str += "</tr><tr><td colspan='2' align='center'>";
-		str += "<input id='pruefungsnotensave' type='button' name='speichern' ";
-		str += "value='<?php echo $p->t('global/speichern');?>' onclick='pruefungSpeichern();'></td></tr>";
+		str += "</tr><tr><td colspan='2' align='center'>"; 
+		str += "<input id='pruefungsnotensave' type='button' name='speichern'";
+		str +="value='<?php echo $p->t('global/speichern');?>' onclick='pruefungSpeichern();' ></td></tr>"; 
 		str += "</table></form>";
 		anlegendiv.innerHTML = str;
 		anlegendiv.style.visibility = "visible";
@@ -399,19 +426,25 @@ foreach ($noten_obj->result as $row)
 							notentd.appendChild(notenode);
 						}
 						notenstatus = document.getElementById("status_"+uid);
-						if (resp == "update_f")
-							notenstatus.innerHTML = "<img src='../../../../skin/images/changed.png'>";
-						document.getElementById("lvnoteneingabe_"+uid).style.visibility = "hidden";
+						changedwarning = document.getElementById("messagesdiv");
+						warningdiv = document.getElementById("notenWarning");
 
-						anlegendiv.innerHTML = "";
-						anlegendiv.style.visibility = "hidden";
-
-						var pruefhtml = "<table><tr><td class='td_datum'>"+datum+"</td>";
-						pruefhtml += "<td class='td_note'>"+noten_array[note]+"</td>";
-						pruefhtml += "<td><input type='button' name='anlegen' ";
-						pruefhtml += " value='<?php echo $p->t('global/aendern'); ?>' ";
-						pruefhtml += " onclick='pruefungAnlegen(\""+uid+"\",\""+datum+"\",\""+note+"\",\""+lehreinheit_id+"\",\""+punkte+"\",\""+typ+"\")'>";
-						pruefhtml += "</td></tr></table>";
+						if (resp == "update_f" || resp == "update")
+						{
+							notenstatus.innerHTML = "<img src='../../../../skin/images/changed.png'>"; 
+							if (warningdiv != null)
+								warningdiv.parentNode.removeChild(warningdiv); // Entfernt das Warning-Div
+							changedwarning.innerHTML = '<div class="warning"><?php echo $p->t('benotungstool/geaenderteNotenVorhanden'); ?></div>'; 
+						} 
+						document.getElementById("lvnoteneingabe_"+uid).style.visibility = "hidden"; 
+						anlegendiv.innerHTML = ""; 
+						anlegendiv.style.visibility = "hidden"; 
+						var pruefhtml = "<table><tr><td class='td_datum'>"+datum+"</td>"; 
+							pruefhtml += "<td class='td_note'>"+noten_array[note]+"</td>";
+							pruefhtml += "<td><input type='button' name='anlegen'";
+							pruefhtml +=" value='<?php echo $p->t('global/aendern'); ?>' ";
+							pruefhtml +=" onclick='pruefungAnlegen(\""+uid+"\",\""+datum+"\",\""+note+"\",\""+lehreinheit_id+"\",\""+punkte+"\",\""+typ+"\")'>";
+							pruefhtml += "</td></tr></table>";
 						document.getElementById("span_"+typ+"_"+uid).innerHTML = pruefhtml;
 					}
 				},
@@ -546,17 +579,13 @@ foreach ($noten_obj->result as $row)
 	// ****
 	function GradeImport()
 	{
-		var str = "<form name='gradeimport_form'><center><table style='width:95%'>";
-		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
-
-		var anlegendiv = document.getElementById("nachpruefung_div");
-		var y = getOffset('y');
-		y = y+50;
-		anlegendiv.style.top = y+"px";
-
-		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisung');?>:</td>';
-		str += '<td></td><tr><td><textarea id="noteimporttextarea" name="notenimport"></textarea></td></tr>';
-		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulk();'>";
+		var str = "<form name='gradeimport_form'><center><table style='width: 95%'>"; 
+		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>"; 
+		var anlegendiv = document.getElementById("nachpruefung_div"); 
+		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px"; 
+		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisung');?>:</td>'; 
+		str	+= '<td></td><tr><td><textarea id="noteimporttextarea" name="notenimport"></textarea></td></tr>'; 
+		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulk();'>"; 
 		str += "</td><td></td></tr></table></center></form>";
 		anlegendiv.innerHTML = str;
 		anlegendiv.style.visibility = "visible";
@@ -587,10 +616,10 @@ foreach ($noten_obj->result as $row)
 			foreach ($noten_obj->result as $row_note)
 			{
 				if ($row_note->lehre && $row_note->aktiv)
-					$gradesArray[] = '"'.$row_note->anmerkung.'"';
+					$gradesArray[] = '"' . $row_note->anmerkung . '"';
 			}
 			// Output JS variable with valid grades
-			echo 'var validGrades = ['.implode(',', $gradesArray).'];';
+			echo 'var validGrades = [' . implode(',', $gradesArray) . '];';
 		}
 		?>
 
@@ -674,8 +703,8 @@ $qry = "SELECT
 			JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
 			JOIN campus.tbl_uebung USING(lehreinheit_id)
 		WHERE
-			studiensemester_kurzbz=".$db->db_add_param($stsem)." AND
-			lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)."
+			studiensemester_kurzbz=" . $db->db_add_param($stsem) . " AND
+			lehrveranstaltung_id=" . $db->db_add_param($lvid, FHC_INTEGER) . "
 		UNION
 		SELECT
 			1
@@ -683,8 +712,8 @@ $qry = "SELECT
 			campus.tbl_legesamtnote
 		WHERE
 			lehreinheit_id in (SELECT lehreinheit_id FROM lehre.tbl_lehreinheit
-								WHERE studiensemester_kurzbz=".$db->db_add_param($stsem)." AND
-								lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER).")
+								WHERE studiensemester_kurzbz=" . $db->db_add_param($stsem) . " AND
+								lehrveranstaltung_id=" . $db->db_add_param($lvid, FHC_INTEGER) . ")
 
 		";
 $grade_from_kreuzerltool = false;
@@ -696,39 +725,37 @@ if ($result = $db->db_query($qry))
 else
 	die($p->t('global/fehleraufgetreten'));
 
-//Kopfzeile
+// Kopfzeile
 echo '
 <table width="100%">
 	<tr>
 		<td>
-			<h1>'.$p->t('benotungstool/gesamtnote').'</h1>
-			<h2>'.$lv_obj->bezeichnung_arr[$sprache].'</h2>
+			<h1>' . $p->t('benotungstool/gesamtnote') . '</h1>
+			<h2>' . $lv_obj->bezeichnung_arr[$sprache] . '</h2>
 		</td>
 		<td align="right">';
 
-//Studiensemester laden
+// Studiensemester laden
 $stsem_obj = new studiensemester();
 if ($stsem == '')
 	$stsem = $stsem_obj->getaktorNext();
 $stsem_obj->getAll();
 
-//Studiensemester DropDown
+// Studiensemester DropDown
 $stsem_content = $p->t('global/studiensemester');
 $stsem_content .= ": <SELECT name='stsem' onChange=\"self.location=this.options[this.selectedIndex].value\">";
 foreach ($stsem_obj->studiensemester as $studiensemester)
 {
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
+	$selected = ($stsem == $studiensemester->studiensemester_kurzbz ? 'selected' : '');
 	$optionvalue = "lvgesamtnoteverwalten.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz";
-
-	$stsem_content .= "<OPTION value='".$optionvalue."' $selected>
+	
+	$stsem_content .= "<OPTION value='" . $optionvalue . "' $selected>
 		$studiensemester->studiensemester_kurzbz
 		</OPTION>\n";
 }
 $stsem_content .= "</SELECT>\n";
 
-if (!$rechte->isBerechtigt('admin', 0) &&
-   !$rechte->isBerechtigt('admin', $lv_obj->studiengang_kz) &&
-   !$rechte->isBerechtigt('lehre', $lv_obj->studiengang_kz))
+if (! $rechte->isBerechtigt('admin', 0) && ! $rechte->isBerechtigt('admin', $lv_obj->studiengang_kz) && ! $rechte->isBerechtigt('lehre', $lv_obj->studiengang_kz))
 {
 	$qry = "SELECT
 				lehreinheit_id
@@ -737,10 +764,10 @@ if (!$rechte->isBerechtigt('admin', 0) &&
 				JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
 				JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
 			WHERE
-				tbl_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)."
-				AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
-				AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid=".$db->db_add_param($user).';';
-
+				tbl_lehrveranstaltung.lehrveranstaltung_id=" . $db->db_add_param($lvid, FHC_INTEGER) . "
+				AND tbl_lehreinheit.studiensemester_kurzbz=" . $db->db_add_param($stsem) . "
+				AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid=" . $db->db_add_param($user) . ';';
+	
 	if ($result = $db->db_query($qry))
 	{
 		if ($db->db_num_rows($result) == 0)
@@ -757,37 +784,37 @@ echo '
 	</tr>
 	<tr>
 		<td>
-			<a href="'.$p->t('dms_link/dokuwikiGesamtnote').'" class="Item" target="_blank">
-			'.$p->t('global/anleitung').'
+			<a href="' . $p->t('dms_link/dokuwikiGesamtnote') . '" class="Item" target="_blank">
+			' . $p->t('global/anleitung') . '
 			</a>';
 
 if (defined('CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN') && CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN)
 {
 	$hrefpath = "../notenliste.xls.php?stg=$stg_obj->studiengang_kz&lvid=$lvid&stsem=$stsem";
-	echo "<br><a class='Item' href='".$hrefpath."'>".$p->t('benotungstool/notenlisteImport')."</a>";
+	echo "<br><a class='Item' href='" . $hrefpath . "'>" . $p->t('benotungstool/notenlisteImport') . "</a>";
 }
 
 // eingetragene lv-gesamtnoten freigeben
 if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 {
-	//Passwort pruefen
+	// Passwort pruefen
 	if (checkldapuser($user, $_REQUEST['passwort']))
 	{
 		$jetzt = date("Y-m-d H:i:s");
 		$neuenoten = 0;
 		$studlist = "<table border='1'>
 			<tr>
-				<td><b>".$p->t('global/personenkz')."</b></td>
-				<td><b>".$p->t('global/nachname')."</b></td>
-				<td><b>".$p->t('global/vorname')."</b></td>";
-
+				<td><b>" . $p->t('global/personenkz') . "</b></td>
+				<td><b>" . $p->t('global/nachname') . "</b></td>
+				<td><b>" . $p->t('global/vorname') . "</b></td>";
+		
 		if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 		{
-			$studlist .= "<td><b>".$p->t('benotungstool/punkte')."</b></td>\n";
+			$studlist .= "<td><b>" . $p->t('benotungstool/punkte') . "</b></td>\n";
 		}
-		$studlist .= "<td><b>".$p->t('benotungstool/note')."</b></td>\n";
-		$studlist .= "<td><b>".$p->t('benotungstool/bearbeitetvon')."</b></td></tr>\n";
-
+		$studlist .= "<td><b>" . $p->t('benotungstool/note') . "</b></td>\n";
+		$studlist .= "<td><b>" . $p->t('benotungstool/bearbeitetvon') . "</b></td></tr>\n";
+		
 		// studentenquery
 		$qry_stud = "SELECT
 						DISTINCT uid, vorname, nachname, matrikelnr
@@ -795,8 +822,8 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 						campus.vw_student_lehrveranstaltung
 						JOIN campus.vw_student USING(uid)
 					WHERE
-						studiensemester_kurzbz = ".$db->db_add_param($stsem)."
-						AND lehrveranstaltung_id = ".$db->db_add_param($lvid, FHC_INTEGER)."
+						studiensemester_kurzbz = " . $db->db_add_param($stsem) . "
+						AND lehrveranstaltung_id = " . $db->db_add_param($lvid, FHC_INTEGER) . "
 					ORDER BY nachname, vorname ";
 		if ($result_stud = $db->db_query($qry_stud))
 		{
@@ -811,59 +838,59 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 						$lvgesamtnote->freigabedatum = $jetzt;
 						$lvgesamtnote->freigabevon_uid = $user;
 						$lvgesamtnote->save();
-						$studlist .= "<tr><td>".trim($row_stud->matrikelnr)."</td>";
-						$studlist .= "<td>".trim($row_stud->nachname)."</td>";
-						$studlist .= "<td>".trim($row_stud->vorname)."</td>";
+						$studlist .= "<tr><td>" . trim($row_stud->matrikelnr) . "</td>";
+						$studlist .= "<td>" . trim($row_stud->nachname) . "</td>";
+						$studlist .= "<td>" . trim($row_stud->vorname) . "</td>";
 						if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 						{
 							$studlist .= "<td>";
-							if($lvgesamtnote->punkte != '')
+							if ($lvgesamtnote->punkte != '')
 								$studlist .= trim(number_format($lvgesamtnote->punkte, 2));
 							$studlist .= "</td>\n";
 						}
-						$studlist .= "<td>".$noten_array[trim($lvgesamtnote->note)]['bezeichnung']."</td>";
-						$studlist .= "<td>".$lvgesamtnote->mitarbeiter_uid;
-						if($lvgesamtnote->updatevon != '')
-							$studlist .= " (".$lvgesamtnote->updatevon.")";
+						$studlist .= "<td>" . $noten_array[trim($lvgesamtnote->note)]['bezeichnung_mehrsprachig'][$sprache] . "</td>";
+						$studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
+						if ($lvgesamtnote->updatevon != '')
+							$studlist .= " (" . $lvgesamtnote->updatevon . ")";
 						$studlist .= "</td></tr>\n";
-						$neuenoten++;
+						$neuenoten ++;
 					}
 				}
 			}
 		}
-
+		
 		$studlist .= "</table>";
-
-		//mail an assistentin und den user selber verschicken
+		
+		// mail an assistentin und den user selber verschicken
 		if ($neuenoten > 0)
 		{
 			$lv = new lehrveranstaltung($lvid);
 			$sg = new studiengang($lv->studiengang_kz);
-			$lektor_adresse = $user."@".DOMAIN;
-			$adressen = $sg->email.", ".$user."@".DOMAIN;
-
+			$lektor_adresse = $user . "@" . DOMAIN;
+			$adressen = $sg->email . ", " . $user . "@" . DOMAIN;
+			
 			$studienplan = new studienplan();
 			$studienplan->getStudienplanLehrveranstaltung($lvid, $stsem);
 			$studienplan_bezeichnung = '';
 			foreach ($studienplan->result as $row)
-				$studienplan_bezeichnung .= $row->bezeichnung.' ';
-
+				$studienplan_bezeichnung .= $row->bezeichnung . ' ';
+			
 			$mit = new mitarbeiter();
 			$mit->load($user);
-
-			$freigeber = "<b>".mb_strtoupper($user)."</b>";
-			$betreff = 'Notenfreigabe '.$lv->bezeichnung.' '.$lv->orgform_kurzbz.' - '.$studienplan_bezeichnung;
-			$mail = new mail($adressen, 'vilesci@'.DOMAIN, $betreff, '');
+			
+			$freigeber = "<b>" . mb_strtoupper($user) . "</b>";
+			$betreff = 'Notenfreigabe ' . $lv->bezeichnung . ' ' . $lv->orgform_kurzbz . ' - ' . $studienplan_bezeichnung;
+			$mail = new mail($adressen, 'vilesci@' . DOMAIN, $betreff, '');
 			$htmlcontent = "<html>
 				<body>
-					<b>".$sg->kuerzel.' '.$lv->semester.'.Semester
-					'.$lv->bezeichnung." ".$lv->orgform_kurzbz." - ".$stsem."</b>
-					(".$lv->semester.". Sem.)
-					<br><br>".$p->t('global/benutzer')." ".$freigeber." (".$mit->kurzbz.")
-					".$p->t('benotungstool/hatDieLvNotenFuerFolgendeStudenten').":
-					<br><br>\n".$studlist."
-					<br>Anzahl der Noten:".$neuenoten."
-					<br>".$p->t('abgabetool/mailVerschicktAn').": ".$adressen."
+					<b>" . $sg->kuerzel . ' ' . $lv->semester . '.Semester
+					' . $lv->bezeichnung . " " . $lv->orgform_kurzbz . " - " . $stsem . "</b>
+					(" . $lv->semester . ". Sem.)
+					<br><br>" . $p->t('global/benutzer') . " " . $freigeber . " (" . $mit->kurzbz . ")
+					" . $p->t('benotungstool/hatDieLvNotenFuerFolgendeStudenten') . ":
+					<br><br>\n" . $studlist . "
+					<br>Anzahl der Noten:" . $neuenoten . "
+					<br>" . $p->t('abgabetool/mailVerschicktAn') . ": " . $adressen . "
 				</body></html>";
 			$mail->setHTMLContent($htmlcontent);
 			$mail->setReplyTo($lektor_adresse);
@@ -872,7 +899,7 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 	}
 	else
 	{
-		echo '<span><font class="error">'.$p->t('gesamtnote/passwortFalsch').'</font></span>';
+		$errormsg = $p->t('gesamtnote/passwortFalsch');
 	}
 }
 
@@ -881,14 +908,21 @@ if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 	$onclickpath = "notenschluessel.php?lehrveranstaltung_id=$lvid&stsem=$stsem";
 	$onclickoptions = "height=200, width=350, left=50, top=50, resizable=yes, status=no,";
 	$onclickoptions .= "scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes";
-
+	
 	echo '<br>
-		<a href="#" onclick="window.open(\''.$onclickpath.'\',\'Grades\',\''.$onclickoptions.'\'); return false;">
-		'.$p->t('gesamtnote/notenschluesselanzeigen').'</a>';
+		<a href="#" onclick="window.open(\'' . $onclickpath . '\',\'Grades\',\'' . $onclickoptions . '\'); return false;">
+		' . $p->t('gesamtnote/notenschluesselanzeigen') . '</a>';
 }
 echo '</td></tr></table><br>';
-echo '<table width="100%" height="10px"><tr><td>';
 
+$htmlstring = '';
+
+$htmlstring .= '<div id="messagesdiv">';
+if ($errormsg != '')
+	$htmlstring .= '<div class="error">' . $errormsg . '</div>';
+
+$htmlstring .= '</div>';
+$htmlstring .= '<table width="100%" height="10px"><tr><td>';
 
 // alle Pruefungen für die LV holen
 $studpruef_arr = array();
@@ -939,62 +973,62 @@ if ($pr_komm->getPruefungenLV($lvid, "kommPruef", $stsem))
 }
 $summe_komm = count($studpruef_komm);
 
-//Studentenliste
+// Studentenliste
 
-echo '<table class="gradetable">';
-echo "
+$htmlstring .= '<table class="gradetable">';
+$htmlstring .= "
 		<tr>
 			<th></th>
-			<th>".$p->t('global/uid')."</th>
-			<th>".$p->t('global/nachname')."</th>
-			<th>".$p->t('global/vorname')."</th>";
+			<th>" . $p->t('global/uid') . "</th>
+			<th>" . $p->t('global/nachname') . "</th>
+			<th>" . $p->t('global/vorname') . "</th>";
 
 if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE)
 {
-	echo "<th>".$p->t('benotungstool/teilnoten')."</th>";
+	$htmlstring .= "<th>" . $p->t('benotungstool/teilnoten') . "</th>";
 }
 
-echo "<th>".$p->t('benotungstool/punkte').' / '.$p->t('benotungstool/note')."</th>
-			<th rowspan=2>".$p->t('benotungstool/lvNote')."<br>
-				<input type='button' onclick='GradeImport()' value='".$p->t('benotungstool/importieren')."'>
+$htmlstring .= "<th>" . $p->t('benotungstool/punkte') . ' / ' . $p->t('benotungstool/note') . "</th>
+			<th rowspan=2>" . $p->t('benotungstool/lvNote') . "<br>
+				<input type='button' onclick='GradeImport()' value='" . $p->t('benotungstool/importieren') . "'>
 			</th>
 			<th align='right' rowspan=2>
 				<form name='freigabeform' method='POST' onsubmit='return OnFreigabeSubmit()'
-					action='".$_SERVER['PHP_SELF']."?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem' >
+					action='" . $_SERVER['PHP_SELF'] . "?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem' >
 				<input type='hidden' name='freigabe' value='1'>
-				<span style='white-space:nowrap;'>".$p->t('global/passwort').":
+				<span style='white-space:nowrap;'>" . $p->t('global/passwort') . ":
 					<input type='password' size='8' id='textbox-freigabe-passwort' name='passwort'>
 				</span>
 				<br>
-				<input type='submit' name='frei' value='Freigabe'>
+				<input type='submit' name='frei' value='" . $p->t('benotungstool/freigabe') . "'>
 				</form>
 			</th>
-			<th>".$p->t('benotungstool/zeugnisnote')."</th>";
+			<th>" . $p->t('benotungstool/zeugnisnote') . "</th>";
 
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 {
-	echo "<th colspan='2'>".$p->t('benotungstool/nachpruefung')."</th>";
+	$htmlstring .= "<th colspan='2'>" . $p->t('benotungstool/nachpruefung') . "</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	echo "<th colspan='2' nowrap>".$p->t('benotungstool/nachpruefung2')."</th>";
+	$htmlstring .= "<th colspan='2' nowrap>" . $p->t('benotungstool/nachpruefung2') . "</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)
 {
-	echo "<th colspan='2'>".$p->t('benotungstool/kommissionellePruefung')."</th>";
+	$htmlstring .= "<th colspan='2'>" . $p->t('benotungstool/kommissionellePruefung') . "</th>";
 }
-echo "
+$htmlstring .= "
 
 		</tr>
 			<tr>
 				<th colspan='9'>&nbsp;</th>";
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 {
-	echo "<th colspan='2'>
+	$htmlstring .= "<th colspan='2'>
 				<table>
 				<tr>
-						<td class='td_datum'>".$p->t('global/datum')."</td>
-						<td class='td_note'>".$p->t('benotungstool/note')."</td>
+						<td class='td_datum'>" . $p->t('global/datum') . "</td>
+						<td class='td_note'>" . $p->t('benotungstool/note') . "</td>
 						<td></td>
 				</tr>
 				</table>
@@ -1003,11 +1037,11 @@ if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN
 
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	echo "<th colspan='2'>
+	$htmlstring .= "<th colspan='2'>
 		<table>
 		<tr>
-			<td class='td_datum'>".$p->t('global/datum')."</td>
-			<td class='td_note'>".$p->t('benotungstool/note')."</td>
+			<td class='td_datum'>" . $p->t('global/datum') . "</td>
+			<td class='td_note'>" . $p->t('benotungstool/note') . "</td>
 			<td></td>
 		</tr>
 		</table>
@@ -1016,18 +1050,18 @@ if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN
 
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)
 {
-		echo "
+	$htmlstring .= "
 		<th colspan='2'>
 				<table>
 				<tr>
-						<td class='td_datum'>".$p->t('global/datum')."</td>
-						<td class='td_note'>".$p->t('benotungstool/note')."</td>
+						<td class='td_datum'>" . $p->t('global/datum') . "</td>
+						<td class='td_note'>" . $p->t('benotungstool/note') . "</td>
 						<td></td>
 				</tr>
 				</table>
 		</th>";
 }
-echo "
+$htmlstring .= "
 </tr>
 ";
 
@@ -1040,10 +1074,10 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 					campus.vw_student_lehrveranstaltung
 					JOIN campus.vw_student USING(uid)
 				WHERE
-					studiensemester_kurzbz = ".$db->db_add_param($stsem)."
-					AND lehrveranstaltung_id = ".$db->db_add_param($lvid)."
+					studiensemester_kurzbz = " . $db->db_add_param($stsem) . "
+					AND lehrveranstaltung_id = " . $db->db_add_param($lvid) . "
 				ORDER BY nachname, vorname ";
-
+	
 	if ($result_stud = $db->db_query($qry_stud))
 	{
 		$i = 1;
@@ -1053,31 +1087,31 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 		{
 			$grades[$row_stud->uid]['vorname'] = $row_stud->vorname;
 			$grades[$row_stud->uid]['nachname'] = $row_stud->nachname;
-
-			//Noten aus Uebungstool
+			
+			// Noten aus Uebungstool
 			$le = new lehreinheit();
 			$le->load_lehreinheiten($lvid, $stsem);
 			foreach ($le->lehreinheiten as $l)
 			{
 				$legesamtnote = new legesamtnote($l->lehreinheit_id);
-
+				
 				if ($legesamtnote->load($row_stud->uid, $l->lehreinheit_id))
 				{
 					$gewicht = $l->gewicht;
 					if ($l->gewicht == '')
 						$gewicht = 1;
-
+					
 					$grades[$row_stud->uid]['grades'][] = array(
 						'grade' => $legesamtnote->note,
 						'points' => null,
 						'weight' => $gewicht,
-						'text' => $legesamtnote->note.' (Uebungstool '.$l->lehreinheit_id.')'
+						'text' => $legesamtnote->note . ' (Uebungstool ' . $l->lehreinheit_id . ')'
 					);
 				}
 			}
 		}
 	}
-
+	
 	// Load Addons to modify grades
 	$addon_obj = new addon();
 	if ($addon_obj->loadAddons())
@@ -1086,20 +1120,21 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 		{
 			foreach ($addon_obj->result as $row)
 			{
-				if (file_exists('../../../../addons/'.$row->kurzbz.'/cis/grades.inc.php'))
-					include('../../../../addons/'.$row->kurzbz.'/cis/grades.inc.php');
+				if (file_exists('../../../../addons/' . $row->kurzbz . '/cis/grades.inc.php'))
+					include ('../../../../addons/' . $row->kurzbz . '/cis/grades.inc.php');
 			}
 		}
 	}
-
+	
+	$anzahlChanged = 0;
 	foreach ($grades as $uid => $data)
 	{
-		echo '<tr class="liste'.($i % 2).'">
-			<td><a href="mailto:'.$uid.'@'.DOMAIN.'"><img src="../../../../skin/images/button_mail.gif"></a></td>
-			<td>'.$db->convert_html_chars($uid).'</td>
-			<td>'.$db->convert_html_chars($data['nachname']).'</td>
-			<td>'.$db->convert_html_chars($data['vorname']).'</td>';
-
+		$htmlstring .= '<tr class="liste' . ($i % 2) . '">
+			<td><a href="mailto:' . $uid . '@' . DOMAIN . '"><img src="../../../../skin/images/button_mail.gif"></a></td>
+			<td>' . $db->convert_html_chars($uid) . '</td>
+			<td>' . $db->convert_html_chars($data['nachname']) . '</td>
+			<td>' . $db->convert_html_chars($data['vorname']) . '</td>';
+		
 		// Bereits eingetragene Note ermitteln
 		if ($lvgesamtnote = new lvgesamtnote($lvid, $uid, $stsem))
 		{
@@ -1111,7 +1146,7 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 			$note_lv = null;
 			$punkte_lv = null;
 		}
-
+		
 		$notensumme = 0;
 		$notensumme_gewichtet = 0;
 		$gewichtsumme = 0;
@@ -1121,15 +1156,13 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 		$negativeteilnote = false;
 		$note_zusatztext = '';
 		$note_zusatztext_tooltip = '';
-
+		
 		if (isset($data['grades']))
 		{
 			// Teilnoten summieren und Notenvorschlag berechnen
 			foreach ($data['grades'] as $kex => $row_grades)
 			{
-				if (is_numeric($row_grades['grade'])
-				   || (is_null($row_grades['grade']) && is_numeric($row_grades['points']))
-				  )
+				if (is_numeric($row_grades['grade']) || (is_null($row_grades['grade']) && is_numeric($row_grades['points'])))
 				{
 					$notensumme += $row_grades['grade'];
 					$punktesumme += $row_grades['points'];
@@ -1138,12 +1171,12 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 					$gewichtsumme += $row_grades['weight'];
 					$anzahlnoten += 1;
 				}
-				$note_zusatztext_tooltip .= $row_grades['text']."\n";
-
-				if (isset($noten_array[$row_grades['grade']]) && !$noten_array[$row_grades['grade']]['positiv'])
+				$note_zusatztext_tooltip .= $row_grades['text'] . "\n";
+				
+				if (isset($noten_array[$row_grades['grade']]) && ! $noten_array[$row_grades['grade']]['positiv'])
 				{
 					$negativeteilnote = true;
-					$note_zusatztext .= '<span class="negative">'.$row_grades['text'].'</span>';
+					$note_zusatztext .= '<span class="negative">' . $row_grades['text'] . '</span>';
 				}
 				else
 				{
@@ -1152,9 +1185,9 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 				$note_zusatztext .= '<br>';
 			}
 		}
-
+		
 		$punkte_vorschlag = '';
-		if (!is_null($note_lv))
+		if (! is_null($note_lv))
 		{
 			$note_vorschlag = $note_lv;
 		}
@@ -1192,119 +1225,128 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 		{
 			$note_vorschlag = null;
 		}
-
+		
 		if ($zeugnisnote = new zeugnisnote($lvid, $uid, $stsem))
 			$znote = $zeugnisnote->note;
 		else
 			$znote = null;
-
+		
 		if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE)
 		{
-			echo '<td style="white-space: nowrap;" title="'.$note_zusatztext_tooltip.'">';
-			echo $note_zusatztext.'&nbsp;</td>';
+			$htmlstring .= '<td style="white-space: nowrap;" title="' . $note_zusatztext_tooltip . '">';
+			$htmlstring .= $note_zusatztext . '&nbsp;</td>';
 		}
-
+		
 		if (key_exists($uid, $studpruef_arr))
 			$hide = "style='display:none;visibility:hidden;'";
 		else
 			$hide = "style='display:block;visibility:visible;'";
-
-		if (!defined('CIS_GESAMTNOTE_UEBERSCHREIBEN')
-			|| CIS_GESAMTNOTE_UEBERSCHREIBEN
-			|| (!CIS_GESAMTNOTE_UEBERSCHREIBEN && is_null($znote)))
+		
+		if (! defined('CIS_GESAMTNOTE_UEBERSCHREIBEN') || CIS_GESAMTNOTE_UEBERSCHREIBEN || (! CIS_GESAMTNOTE_UEBERSCHREIBEN && is_null($znote)))
 		{
-				echo "<td valign='bottom' nowrap>
+			$htmlstring .= "<td valign='bottom' nowrap>
 					<form name='$uid' id='$uid' method='POST'
-						action='".$_SERVER['PHP_SELF']."?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem'>
-						<span id='lvnoteneingabe_".$uid."' ".$hide.">
+						action='" . $_SERVER['PHP_SELF'] . "?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem'>
+						<span id='lvnoteneingabe_" . $uid . "' " . $hide . ">
 						<input type='hidden' name='student_uid' value='$uid'>";
-
+			
 			// Punkte
 			if (CIS_GESAMTNOTE_PUNKTE)
 			{
-				echo '
+				$htmlstring .= '
 				<input type="text"
 					name="punkte"
-					id="textbox-punkte-'.$i.'"
-					value="'.$punkte_vorschlag.'"
+					id="textbox-punkte-' . $i . '"
+					value="' . $punkte_vorschlag . '"
 					size="3"
-					oninput="PunkteEingabe('.$i.')"/>';
+					oninput="PunkteEingabe(' . $i . ')"/>';
 			}
-
+			
 			// Noten DropDown
 			if ($punkte_vorschlag != '' && CIS_GESAMTNOTE_PUNKTE)
 				$disabled = 'disabled="disabled"';
 			else
 				$disabled = '';
-			echo '<select name="note" id="dropdown-note-'.$i.'" '.$disabled.'>';
-			echo '<option value="">-- keine Auswahl --</option>';
+			$htmlstring .= '<select name="note" id="dropdown-note-' . $i . '" ' . $disabled . '>';
+			$htmlstring .= '<option value="">-- keine Auswahl --</option>';
 			foreach ($noten_obj->result as $row_note)
 			{
 				if ($row_note->note == $note_vorschlag)
 					$selected = 'selected';
 				else
 					$selected = '';
-
+				
 				if ($row_note->lehre && $row_note->aktiv)
-					echo '<option value="'.$row_note->note.'" '.$selected.'>'.$row_note->bezeichnung.'</option>';
+					$htmlstring .= '<option value="' . $row_note->note . '" ' . $selected . '>' . $row_note->bezeichnung_mehrsprachig[$sprache] . '</option>';
 			}
-			echo '</select>';
-			echo "
+			$htmlstring .= '</select>';
+			$htmlstring .= "
 					<input type='hidden' name='note_orig' value='$note_lv'>
-					<input type='button' id='button-note-save-".$i."' value='->' onclick=\"saveLVNote('".$uid."');\">
+					<input type='button' id='button-note-save-" . $i . "' value='->' onclick=\"saveLVNote('" . $uid . "');\">
 					</span>
 				</form></td>";
 		}
 		else
 		{
-			echo '<td></td>';
+			$htmlstring .= '<td></td>';
 		}
-
+		
 		if (isset($noten_array[$note_lv]) && $noten_array[$note_lv]['positiv'] == false)
 			$negmarkier = ' class="negative"';
 		else
 			$negmarkier = "";
-
+		
 		// LV Note
-		echo '<td align="center" id="note_'.$uid.'"><span '.$negmarkier.'>';
+		$htmlstring .= '<td align="center" id="note_' . $uid . '"><span ' . $negmarkier . '>';
 		if (isset($noten_array[$note_lv]))
-			echo $noten_array[$note_lv]['bezeichnung'];
+			$htmlstring .= $noten_array[$note_lv]['bezeichnung_mehrsprachig'][$sprache];
 		if ($punkte_lv != '')
-			echo ' ('.number_format($punkte_lv, 2).')';
-		echo '</span></td>';
-
-		//status
-		echo "<td align='center' id='status_$uid'>";
-		if (!$lvgesamtnote->freigabedatum)
-			echo "<img src='../../../../skin/images/offen.png'>";
-		elseif	($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
-			echo "<img src='../../../../skin/images/changed.png'>";
+			$htmlstring .= ' (' . number_format($punkte_lv, 2) . ')';
+		$htmlstring .= '</span></td>';
+		
+		// status
+		$htmlstring .= "<td align='center' id='status_$uid'>";
+		if (! $lvgesamtnote->freigabedatum)
+		{
+			if (key_exists($uid, $studpruef_arr))
+			{
+				$htmlstring .= "<img src='../../../../skin/images/changed.png'>";
+				$anzahlChanged ++;
+			}
+			else 
+				$htmlstring .= "<img src='../../../../skin/images/offen.png'>";
+		}
+		elseif ($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
+		{
+			$htmlstring .= "<img src='../../../../skin/images/changed.png'>";
+			$anzahlChanged ++;
+		}
 		else
-			echo "<img src='../../../../skin/images/ok.png'>";
-
-		echo "</td>";
+			$htmlstring .= "<img src='../../../../skin/images/ok.png'>";
+		
+		$htmlstring .= "</td>";
 		if (($znote) && ($note_lv != $znote))
 			$stylestr = " style='color:red; border-color:red; border-style:solid; border-width:1px;'";
 		else
 			$stylestr = "";
-
+		
 		// Zeugnisnote
-		echo "<td".$stylestr." align='center'>";
-		if(isset($noten_array[$znote]))
-			echo $noten_array[$znote]['bezeichnung'];
-		echo "</td>";
-
+		$htmlstring .= "<td" . $stylestr . " align='center'>";
+		if (isset($noten_array[$znote]))
+			$htmlstring .= $noten_array[$znote]['bezeichnung_mehrsprachig'][$sprache];
+		$htmlstring .= "</td>";
+		
 		if (isset($noten_array[$znote]) && $noten_array[$znote]['positiv'] == false)
-			$summe_ng++;
-
+			$summe_ng ++;
+		
 		if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 		{
 			// Pruefung 2. Termin
 			if (key_exists($uid, $studpruef_arr))
 			{
-				echo "<td colspan='2'>";
-				echo "<span id='span_Termin2_".$uid."'>";
-				echo "<table>";
+				$htmlstring .= "<td colspan='2'>";
+				$htmlstring .= "<span id='span_Termin2_" . $uid . "'>";
+				$htmlstring .= "<table>";
 				$le_id_arr = array();
 				$le_id_arr = array_keys($studpruef_arr[$uid]);
 				foreach ($le_id_arr as $le_id_stud)
@@ -1313,59 +1355,59 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 					$pr_punkte = $studpruef_arr[$uid][$le_id_stud]["punkte"];
 					$pr_datum = $studpruef_arr[$uid][$le_id_stud]["datum"];
 					$pr_le_id = $le_id_stud;
-
+					
 					if ($pr_punkte != '')
 					{
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-						$pr_notenbezeichnung .= ' ('.number_format($pr_punkte, 2).')';
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+						$pr_notenbezeichnung .= ' (' . number_format($pr_punkte, 2) . ')';
 					}
 					else
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-
-					$onclick = "pruefungAnlegen('".$uid."','".$pr_datum."','".$pr_note."',";
-					$onclick .= "'".$pr_le_id."','".$pr_punkte."')";
-
-					echo '<tr>
-							<td class="td_datum">'.$pr_datum.'</td>
-							<td class="td_note">'.$pr_notenbezeichnung.'</td>
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+					
+					$onclick = "pruefungAnlegen('" . $uid . "','" . $pr_datum . "','" . $pr_note . "',";
+					$onclick .= "'" . $pr_le_id . "','" . $pr_punkte . "')";
+					
+					$htmlstring .= '<tr>
+							<td class="td_datum">' . $pr_datum . '</td>
+							<td class="td_note">' . $pr_notenbezeichnung . '</td>
 							<td>
 								<input type="button"
 									name="anlegen"
-									value="'.$p->t('global/aendern').'"
-									onclick="'.$onclick.'">
+									value="' . $p->t('global/aendern') . '"
+									onclick="' . $onclick . '">
 							<td>
 					</tr>';
 				}
-				echo "</table>";
-				echo "</span>";
-				echo "</td>";
+				$htmlstring .= "</table>";
+				$htmlstring .= "</span>";
+				$htmlstring .= "</td>";
 			}
 			else
 			{
-				if (!is_null($note_lv) || !is_null($znote))
+				if (! is_null($note_lv) || ! is_null($znote))
 				{
-					echo "<td colspan='2'><span id='span_Termin2_".$uid."'>
+					$htmlstring .= "<td colspan='2'><span id='span_Termin2_" . $uid . "'>
 						<input type='button'
 							name='anlegen'
-							value='".$p->t('benotungstool/anlegen')."'
-							onclick='pruefungAnlegen(\"".$uid."\",\"\",\"\",\"\",\"\")'>
+							value='" . $p->t('benotungstool/anlegen') . "'
+							onclick='pruefungAnlegen(\"" . $uid . "\",\"\",\"\",\"\",\"\")'>
 						</span></td>";
 				}
 				else
 				{
-					echo "<td colspan='2'></td>";
+					$htmlstring .= "<td colspan='2'></td>";
 				}
 			}
 		}
-
+		
 		if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 		{
 			// Pruefung 3. Termin
 			if (key_exists($uid, $studpruef_arr_t3))
 			{
-				echo "<td colspan='2'>";
-				echo "<span id='span_Termin3_".$uid."'>";
-				echo "<table>";
+				$htmlstring .= "<td colspan='2'>";
+				$htmlstring .= "<span id='span_Termin3_" . $uid . "'>";
+				$htmlstring .= "<table>";
 				$le_id_arr = array();
 				$le_id_arr = array_keys($studpruef_arr_t3[$uid]);
 				foreach ($le_id_arr as $le_id_stud)
@@ -1374,61 +1416,61 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 					$pr_punkte = $studpruef_arr_t3[$uid][$le_id_stud]["punkte"];
 					$pr_datum = $studpruef_arr_t3[$uid][$le_id_stud]["datum"];
 					$pr_le_id = $le_id_stud;
-
+					
 					if ($pr_punkte != '')
 					{
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-						$pr_notenbezeichnung .= ' ('.number_format($pr_punkte, 2).')';
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+						$pr_notenbezeichnung .= ' (' . number_format($pr_punkte, 2) . ')';
 					}
 					else
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-
-					$onclick = "pruefungAnlegen('".$uid."',";
-					$onclick .= "'".$pr_datum."','".$pr_note."','".$pr_le_id."','".$pr_punkte."','Termin3')";
-
-					echo '<tr>
-							<td class="td_datum">'.$pr_datum.'</td>
-							<td class="td_note">'.$pr_notenbezeichnung.'</td>
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+					
+					$onclick = "pruefungAnlegen('" . $uid . "',";
+					$onclick .= "'" . $pr_datum . "','" . $pr_note . "','" . $pr_le_id . "','" . $pr_punkte . "','Termin3')";
+					
+					$htmlstring .= '<tr>
+							<td class="td_datum">' . $pr_datum . '</td>
+							<td class="td_note">' . $pr_notenbezeichnung . '</td>
 							<td>
 								<input type="button"
 									name="anlegen"
-									value="'.$p->t('global/aendern').'"
-									onclick="'.$onclick.'">
+									value="' . $p->t('global/aendern') . '"
+									onclick="' . $onclick . '">
 							<td>
 						</tr>';
 				}
-				echo "</table>";
-				echo "</span>";
-				echo "</td>";
+				$htmlstring .= "</table>";
+				$htmlstring .= "</span>";
+				$htmlstring .= "</td>";
 			}
 			else
 			{
-				if (!is_null($note_lv) || !is_null($znote))
+				if (! is_null($note_lv) || ! is_null($znote))
 				{
-					echo "
+					$htmlstring .= "
 					<td colspan='2'>
-						<span id='span_Termin3_".$uid."'>
+						<span id='span_Termin3_" . $uid . "'>
 							<input
 								type='button'
 								name='anlegen'
-								value='".$p->t('benotungstool/anlegen')."'
-								onclick='pruefungAnlegen(\"".$uid."\",\"\",\"\",\"\",\"\",\"Termin3\")'>
+								value='" . $p->t('benotungstool/anlegen') . "'
+								onclick='pruefungAnlegen(\"" . $uid . "\",\"\",\"\",\"\",\"\",\"Termin3\")'>
 						</span>
 					</td>";
 				}
 				else
-					echo "<td colspan='2'></td>";
+					$htmlstring .= "<td colspan='2'></td>";
 			}
 		}
-
+		
 		if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)
 		{
 			// komm Pruefung
 			if (key_exists($uid, $studpruef_komm))
 			{
-				echo "<td colspan='2'>";
-				echo "<span id='span_".$uid."'>";
-				echo "<table>";
+				$htmlstring .= "<td colspan='2'>";
+				$htmlstring .= "<span id='span_" . $uid . "'>";
+				$htmlstring .= "<table>";
 				$le_id_arr = array();
 				$le_id_arr = array_keys($studpruef_komm[$uid]);
 				foreach ($le_id_arr as $le_id_stud)
@@ -1437,74 +1479,78 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 					$pr_punkte = $studpruef_komm[$uid][$le_id_stud]["punkte"];
 					$pr_datum = $studpruef_komm[$uid][$le_id_stud]["datum"];
 					$pr_le_id = $le_id_stud;
-
+					
 					if ($pr_punkte != '')
 					{
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-						$pr_notenbezeichnung .= ' ('.number_format($pr_punkte, 2).')';
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+						$pr_notenbezeichnung .= ' (' . number_format($pr_punkte, 2) . ')';
 					}
 					else
-						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung'];
-
-					echo '
+						$pr_notenbezeichnung = $noten_array[$pr_note]['bezeichnung_mehrsprachig'][$sprache];
+					
+					$htmlstring .= '
 					<tr>
-							<td class="td_datum">'.$pr_datum.'</td>
-							<td class="td_note">'.$pr_notenbezeichnung.'</td>
+							<td class="td_datum">' . $pr_datum . '</td>
+							<td class="td_note">' . $pr_notenbezeichnung . '</td>
 					</tr>';
 				}
-				echo "</table>";
-				echo "</span>";
-				echo "</td>";
+				$htmlstring .= "</table>";
+				$htmlstring .= "</span>";
+				$htmlstring .= "</td>";
 			}
 			else
 			{
-							echo "<td colspan='2'></td>";
+				$htmlstring .= "<td colspan='2'></td>";
 			}
 		}
-
-		echo "</tr>";
-		$i++;
+		
+		$htmlstring .= "</tr>";
+		$i ++;
 	}
 }
 
 // Fusszeile
-echo "
+$htmlstring .= "
 	<tr style='font-weight:bold;' align='center'>
 		<th style='font-weight:bold;'>&Sigma;</th>
-		<th style='font-weight:bold;' title='".$p->t('benotungstool/anzahlDerStudenten')."'>$summe_stud</th>";
-if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && (!CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE))
+		<th style='font-weight:bold;' title='" . $p->t('benotungstool/anzahlDerStudenten') . "'>$summe_stud</th>";
+if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && (! CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE))
 {
-	echo "<th colspan='5'></td>";
+	$htmlstring .= "<th colspan='5'></td>";
 }
 else
 {
-	echo "<th colspan='6'></td>";
+	$htmlstring .= "<th colspan='6'></td>";
 }
-echo "<th style='color:red; font-weight:bold;' title='".$p->t('benotungstool/anzahlNegativerBeurteilungen')."'>
-	".$summe_ng."</th>";
+$htmlstring .= "<th style='color:red; font-weight:bold;' title='" . $p->t('benotungstool/anzahlNegativerBeurteilungen') . "'>
+	" . $summe_ng . "</th>";
 
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 {
-	echo "<th style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlNachpruefungen')."'>
-	".$summe_t2."</th>";
+	$htmlstring .= "<th style='font-weight:bold;' colspan='2' title='" . $p->t('benotungstool/anzahlNachpruefungen') . "'>
+	" . $summe_t2 . "</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	echo "<th style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlNachpruefungen')."'>
-	".$summe_t3."</th>";
+	$htmlstring .= "<th style='font-weight:bold;' colspan='2' title='" . $p->t('benotungstool/anzahlNachpruefungen') . "'>
+	" . $summe_t3 . "</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)
 {
-	echo "<th style='font-weight:bold;' colspan='2' title='".$p->t('benotungstool/anzahlKommisionellePruefungen')."'>
-	".$summe_komm."</th>";
+	$htmlstring .= "<th style='font-weight:bold;' colspan='2' title='" . $p->t('benotungstool/anzahlKommisionellePruefungen') . "'>
+	" . $summe_komm . "</th>";
 }
-		echo "
+$htmlstring .= "
 	</tr>
 </table>
 </td></tr>
 
 </table>
 ";
+if ($anzahlChanged > 0)
+	echo '<div id="notenWarning" class="warning">' . $p->t('benotungstool/geaenderteNotenVorhanden') . '</div>';
+
+echo $htmlstring;
 ?>
 
 <div id="nachpruefung_div"></div>
diff --git a/include/note.class.php b/include/note.class.php
index b10753beb..9936930db 100644
--- a/include/note.class.php
+++ b/include/note.class.php
@@ -25,6 +25,7 @@
  * @create 2007-06-06
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/sprache.class.php');
 
 class note extends basis_db
 {
@@ -32,14 +33,16 @@ class note extends basis_db
 	public $result=array();
 
 	//Tabellenspalten
-	public $note;			// smallint
-	public $bezeichnung;	// varchar(32)
-	public $anmerkung;		// varchar(256)
-	public $farbe;			// varchar(6)
-	public $positiv=true;	// boolean
-	public $notenwert;		// boolean
-	public $aktiv;			// boolean
-	public $lehre;			// boolean
+	public $note;						// smallint
+	public $bezeichnung;				// varchar(32)
+	public $anmerkung;					// varchar(256)
+	public $farbe;						// varchar(6)
+	public $positiv=true;				// boolean
+	public $notenwert;					// boolean
+	public $aktiv;						// boolean
+	public $lehre;						// boolean
+	public $offiziell;					// boolean
+	public $bezeichnung_mehrsprachig; 	// varchar (64)[]
 
 	/**
 	 * Konstruktor
@@ -65,8 +68,22 @@ class note extends basis_db
 			$this->errormsg = 'Note ist ungueltig';
 			return false;
 		}
-
-		$qry = "SELECT * FROM lehre.tbl_note WHERE note=".$this->db_add_param($note);
+		$sprache = new sprache();
+		$bezeichnung_mehrsprachig = $sprache->getSprachQuery('bezeichnung_mehrsprachig');
+		$qry = "SELECT 	note, 
+						bezeichnung, 
+						anmerkung, 
+						farbe, 
+						positiv, 
+						notenwert, 
+						aktiv, 
+						lehre, 
+						offiziell, 
+						$bezeichnung_mehrsprachig 
+				FROM 
+					lehre.tbl_note 
+				WHERE 
+					note=".$this->db_add_param($note);
 
 		if($this->db_query($qry))
 		{
@@ -80,6 +97,8 @@ class note extends basis_db
 				$this->positiv = $this->db_parse_bool($row->positiv);
 				$this->lehre = $this->db_parse_bool($row->lehre);
 				$this->aktiv = $this->db_parse_bool($row->aktiv);
+				$this->offiziell = $this->db_parse_bool($row->offiziell);
+				$this->bezeichnung_mehrsprachig = $sprache->parseSprachResult('bezeichnung_mehrsprachig',$row);
 				return true;
 			}
 			else
@@ -126,14 +145,27 @@ class note extends basis_db
 		if($new)
 		{
 			//Neuen Datensatz einfuegen
-			$qry='INSERT INTO lehre.tbl_note (note, bezeichnung, anmerkung, positiv, notenwert, aktiv, lehre) VALUES('.
-			     $this->db_add_param($this->note).', '.
-			     $this->db_add_param($this->bezeichnung).', '.
-			     $this->db_add_param($this->anmerkung).', '.
-				 $this->db_add_param($this->positiv, FHC_BOOLEAN).','.
-				 $this->db_add_param($this->notenwert).','.
-				 $this->db_add_param($this->aktiv, FHC_BOOLEAN).','.
-				 $this->db_add_param($this->lehre, FHC_BOOLEAN).');';
+			$qry='INSERT INTO lehre.tbl_note (note, bezeichnung, anmerkung, positiv, notenwert, aktiv, lehre, ';
+			foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+			{
+				$idx = sprache::$index_arr[$key];
+				$qry .= " bezeichnung_mehrsprachig[$idx],";
+			}
+			$qry .= ' offiziell) VALUES('.
+				$this->db_add_param($this->note).', '.
+				$this->db_add_param($this->bezeichnung).', '.
+				$this->db_add_param($this->anmerkung).', '.
+				$this->db_add_param($this->positiv, FHC_BOOLEAN).','.
+				$this->db_add_param($this->notenwert).','.
+				$this->db_add_param($this->aktiv, FHC_BOOLEAN).','.
+				$this->db_add_param($this->lehre, FHC_BOOLEAN).',';
+
+				foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+					$qry .= $this->db_add_param($value).',';
+				
+			$qry .= $this->db_add_param($this->offiziell, FHC_BOOLEAN).');';
+			
+				 
 		}
 		else
 		{
@@ -144,8 +176,18 @@ class note extends basis_db
 				'positiv='.$this->db_add_param($this->positiv, FHC_BOOLEAN).', '.
 				'notenwert='.$this->db_add_param($this->notenwert).', '.
 				'aktiv='.$this->db_add_param($this->aktiv, FHC_BOOLEAN).', '.
-				'lehre='.$this->db_add_param($this->lehre, FHC_BOOLEAN).' '.
+				'lehre='.$this->db_add_param($this->lehre, FHC_BOOLEAN).', ';
+				
+				foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+				{
+					$idx = sprache::$index_arr[$key];
+					$qry .= " bezeichnung_mehrsprachig[$idx]=".$this->db_add_param($value).", ";
+				}
+				
+				$qry .= ' offiziell='.$this->db_add_param($this->offiziell, FHC_BOOLEAN).' '.
 				'WHERE note='.$this->db_add_param($this->note).';';
+			
+			
 		}
 
 		if($this->db_query($qry))
@@ -166,7 +208,20 @@ class note extends basis_db
 	 */
 	public function getAll($offiziell = null)
 	{
-		$qry = "SELECT * FROM lehre.tbl_note";
+		$sprache = new sprache();
+		$bezeichnung_mehrsprachig = $sprache->getSprachQuery('bezeichnung_mehrsprachig');
+		$qry = "SELECT 	note, 
+						bezeichnung, 
+						anmerkung, 
+						farbe, 
+						positiv, 
+						notenwert, 
+						aktiv, 
+						lehre, 
+						offiziell, 
+						$bezeichnung_mehrsprachig 
+				FROM 
+					lehre.tbl_note ";
 
 		if(is_bool($offiziell))
 			$qry .= " WHERE offiziell = ".$this->db_add_param($offiziell, FHC_BOOLEAN);
@@ -187,6 +242,8 @@ class note extends basis_db
 				$n->notenwert = $row->notenwert;
 				$n->aktiv = $this->db_parse_bool($row->aktiv);
 				$n->lehre = $this->db_parse_bool($row->lehre);
+				$n->offiziell = $this->db_parse_bool($row->lehre);
+				$n->bezeichnung_mehrsprachig = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
 
 				$this->result[] = $n;
 			}
@@ -206,8 +263,22 @@ class note extends basis_db
 	 */
 	public function getActive($offiziell = null)
 	{
-		$qry = "SELECT * FROM lehre.tbl_note WHERE aktiv = TRUE";
-
+		$sprache = new sprache();
+		$bezeichnung_mehrsprachig = $sprache->getSprachQuery('bezeichnung_mehrsprachig');
+		$qry = "SELECT 	note, 
+						bezeichnung, 
+						anmerkung, 
+						farbe, 
+						positiv, 
+						notenwert, 
+						aktiv, 
+						lehre, 
+						offiziell, 
+						$bezeichnung_mehrsprachig 
+				FROM 
+					lehre.tbl_note 
+				WHERE 
+					aktiv = TRUE";
 
 		if(is_bool($offiziell))
 			$qry .= " AND offiziell = ".$this->db_add_param($offiziell, FHC_BOOLEAN);
@@ -228,6 +299,8 @@ class note extends basis_db
 				$n->notenwert = $row->notenwert;
 				$n->aktiv = $this->db_parse_bool($row->aktiv);
 				$n->lehre = $this->db_parse_bool($row->lehre);
+				$n->offiziell = $this->db_parse_bool($row->lehre);
+				$n->bezeichnung_mehrsprachig = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
 
 				$this->result[] = $n;
 			}
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
index ebf597933..b8a34b83a 100644
--- a/locale/de-AT/benotungstool.php
+++ b/locale/de-AT/benotungstool.php
@@ -175,4 +175,5 @@ $this->phrasen['benotungstool/notenlisteImport']='Notenliste für den LV-Noten-I
 $this->phrasen['benotungstool/bearbeitetvon']='Bearbeitet von';
 $this->phrasen['benotungstool/teilnoten']='Teilnoten';
 $this->phrasen['benotungstool/hilfeImport']='Zum Importieren der Noten markieren sie die Spalten Kennzeichen und Note im Excel-File und kopieren sie diese in die Zwischenablage. Drücken sie danach diesen Knopf erneut, um die Noten zu importieren';
+$this->phrasen['benotungstool/geaenderteNotenVorhanden']='Es sind geänderte Noten vorhanden. Geben Sie diese frei, um die Assistenz zu informieren';
 ?>
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
index 3e171a1b2..c70524f12 100644
--- a/locale/en-US/benotungstool.php
+++ b/locale/en-US/benotungstool.php
@@ -171,4 +171,5 @@ $this->phrasen['benotungstool/punkte']='Points';
 $this->phrasen['benotungstool/importAnweisung']='Copy the columns "personal identifier" and "grade" from the grade list and insert them in the following field';
 $this->phrasen['benotungstool/pruefung']='Examination';
 $this->phrasen['benotungstool/notenlisteImport']='Grade list for the subject grade import (Excel)';
+$this->phrasen['benotungstool/geaenderteNotenVorhanden']='There are changed grades. Please send the changes to the assistant by clicking "Approval"';
 ?>

From 6cb82ae911a62159d327daf8bb817fad99d37c2c Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:56:24 +0200
Subject: [PATCH 11/44] BugFix Ersthelfer.php

---
 cis/private/info/ersthelfer.php | 66 ++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/cis/private/info/ersthelfer.php b/cis/private/info/ersthelfer.php
index 18c86293b..6441f5439 100644
--- a/cis/private/info/ersthelfer.php
+++ b/cis/private/info/ersthelfer.php
@@ -60,7 +60,7 @@ if(check_lektor($user))
 			{ 
 				$("#t1").tablesorter(
 				{
-					sortList: [[2,0]],
+					sortList: [[0,0],[1,0]],
 					widgets: ["zebra"]
 				});
 				$("#t2").tablesorter(
@@ -103,40 +103,62 @@ if(check_lektor($user))
 				
 				<?php
 					$zeilenzaehl=0;
-					$sql_query = "SELECT vorname, nachname, telefonklappe, ort_kurzbz, beschreibung, standort_id 
-					FROM campus.vw_mitarbeiter 
-					JOIN public.tbl_benutzerfunktion USING (uid) 
-					JOIN public.tbl_funktion USING (funktion_kurzbz) 
-					WHERE funktion_kurzbz='ersthelfer' 
-					AND (datum_bis>='now()' OR datum_bis IS NULL) 
-					AND campus.vw_mitarbeiter.aktiv=TRUE 
-					AND standort_id IS NOT NULL 
-					ORDER BY standort_id, nachname, vorname";
+					$sql_query = "	SELECT uid, 
+										vorname,
+										nachname,
+										COALESCE((
+												SELECT tbl_kontakt.kontakt || ' - ' || telefonklappe
+												FROM PUBLIC.tbl_mitarbeiter
+												LEFT JOIN PUBLIC.tbl_kontakt USING (standort_id)
+												WHERE mitarbeiter_uid = vw_mitarbeiter.uid
+													AND (
+														tbl_kontakt.kontakttyp = 'telefon'
+														OR tbl_kontakt.kontakttyp IS NULL
+														) limit 1
+												), '-') AS telefonklappe,
+										COALESCE((
+												SELECT planbezeichnung
+												FROM PUBLIC.tbl_mitarbeiter
+												LEFT JOIN PUBLIC.tbl_ort USING (ort_kurzbz)
+												WHERE mitarbeiter_uid = vw_mitarbeiter.uid
+												), '-') AS ort_kurzbz,
+										beschreibung
+									FROM campus.vw_mitarbeiter
+									JOIN PUBLIC.tbl_benutzerfunktion USING (uid)
+									JOIN PUBLIC.tbl_funktion USING (funktion_kurzbz)
+									WHERE funktion_kurzbz = 'ersthelfer'
+										AND (
+											datum_von <= 'now()'
+											OR datum_von IS NULL
+											)
+										AND (
+											datum_bis >= 'now()'
+											OR datum_bis IS NULL
+											)
+										AND campus.vw_mitarbeiter.aktiv = TRUE
+									ORDER BY nachname,
+										vorname";
 					$result = $db->db_query($sql_query);
 					if ($db->db_num_rows($result) > 0)
 					{
-						$count = 0;
-						
 						echo '<table class="tablesorter" id="t1">
 						<thead>
 							<tr>
-								<th></th>
-								<th>'.$p->t("global/vorname").'</th>
 								<th>'.$p->t("global/nachname").'</th>
+								<th>'.$p->t("global/vorname").'</th>
 								<th>'.$p->t("lvplan/raum").'</th>				
 								<th>'.$p->t("global/telefonnummer").'</th>
 							</tr>
 						</thead><tbody>';
 						
 						while($row = $db->db_fetch_object($result))		
-						{$count++;
+						{
 							echo '
 							<tr>
-								<td width="10px">'.$count.'</td>
+								<td width="40%"><a href="../profile/index.php?uid='.$row->uid.'">'.$row->nachname.'</a></td>
 								<td width="30%">'.$row->vorname.'</td>
-								<td width="40%">'.$row->nachname.'</td>
 								<td width="15%">'.$row->ort_kurzbz.'</td>
-								<td width="30%"><nobr>01/333 40 77 - <strong>'.$row->telefonklappe.'</strong></nobr></td>
+								<td width="30%"><nobr>'.$row->telefonklappe.'</nobr></td>
 							</tr>';
 						}
 						
@@ -211,7 +233,7 @@ if(check_lektor($user))
 		
 				<?php
 					$zeilenzaehl=0;
-					$sql_query = "SELECT vorname, nachname, telefonklappe, kontakt, ort_kurzbz, beschreibung, vw_mitarbeiter.standort_id 
+					$sql_query = "SELECT uid, vorname, nachname, telefonklappe, kontakt, ort_kurzbz, beschreibung, vw_mitarbeiter.standort_id 
 					FROM campus.vw_mitarbeiter 
 					JOIN public.tbl_benutzerfunktion USING (uid) 
 					JOIN public.tbl_funktion USING (funktion_kurzbz) 
@@ -238,7 +260,7 @@ if(check_lektor($user))
 						{
 								echo '
 									<tr>
-										<td>'.$row->nachname.'</td>
+										<td><a href="../profile/index.php?uid='.$row->uid.'">'.$row->nachname.'</a></td>
 										<td>'.$row->vorname.'</td>
 										<td>('.$row->beschreibung.')</td>
 										<td><nobr>'.$row->kontakt.'</nobr></td>
@@ -253,7 +275,7 @@ if(check_lektor($user))
 		
 				<?php
 					$zeilenzaehl=0;
-					$sql_query = "SELECT vorname, nachname, telefonklappe, ort_kurzbz, beschreibung, standort_id 
+					$sql_query = "SELECT uid, vorname, nachname, telefonklappe, ort_kurzbz, beschreibung, standort_id 
 					FROM campus.vw_mitarbeiter 
 					JOIN public.tbl_benutzerfunktion USING (uid) 
 					JOIN public.tbl_funktion USING (funktion_kurzbz) 
@@ -277,7 +299,7 @@ if(check_lektor($user))
 						{
 								echo '
 									<tr>
-										<td width="40%">'.$row->nachname.'</td>
+										<td width="40%"><a href="../profile/index.php?uid='.$row->uid.'">'.$row->nachname.'</a></td>
 										<td width="30%">'.$row->vorname.'</td>
 									</tr>';
 						}

From 120169ab3739c13fb1b8ae7c82c83bf32b313c7d Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:56:54 +0200
Subject: [PATCH 12/44] =?UTF-8?q?Anzeige=20Vertretung=20in=20Urlaubsfreiga?=
 =?UTF-8?q?be-=C3=9Cbersicht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/urlaubsfreigabe.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cis/private/profile/urlaubsfreigabe.php b/cis/private/profile/urlaubsfreigabe.php
index bb65142d8..f692a5f2d 100644
--- a/cis/private/profile/urlaubsfreigabe.php
+++ b/cis/private/profile/urlaubsfreigabe.php
@@ -187,6 +187,7 @@ function draw_monat($monat)
 	{
 		while($row = $db->db_fetch_object($result))
 		{
+			$vertretung = new benutzer($row->vertretung_uid);
 			$freigabe='';
 			if($row->freigabeamum!='')
 			{
@@ -194,6 +195,8 @@ function draw_monat($monat)
 			}
 			echo "<span title='$freigabe'>";
 			echo $mitarbeiter[$row->mitarbeiter_uid]['nachname'].' '.$datum_obj->formatDatum($row->vondatum,'d.m.Y')." - ".$datum_obj->formatDatum($row->bisdatum,'d.m.Y');
+			if ($vertretung->uid != '')
+				echo ' (Vertretung: '.$vertretung->nachname.')';
 			if($row->freigabeamum=='')
 				echo " <a href='".$_SERVER['PHP_SELF']."?action=freigabe&id=$row->zeitsperre_id&year=$year&uid=$uid' class='Item'>Freigabe</a>";
 			echo "</span>";

From e58c8110cefa7f1e688a55fd7ad13feed4c9ce93 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:57:45 +0200
Subject: [PATCH 13/44] Trim auf Leerzeichen in Addon-Constructor

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

diff --git a/include/addon.class.php b/include/addon.class.php
index 233bef916..a45046356 100644
--- a/include/addon.class.php
+++ b/include/addon.class.php
@@ -37,7 +37,7 @@ class addon extends basis_db
 	public function __construct()
 	{
 		parent::__construct();
-		$this->aktive_addons = array_filter(explode(";", ACTIVE_ADDONS));
+		$this->aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
 		
 	}
 

From ecf17a180b788ad92c58348e1705db77e6f0a57b Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 16:00:12 +0200
Subject: [PATCH 14/44] Neues File system_check_sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wenn im Ordner system/sql .sql-Files vorhanden sind, werden diese Ausgeführt und das Ergebnis per Mail an den Administrator geschickt. Dies soll als Check für systemkritische Abfragen, Checks, Inkonsistenzen, etc. dienen
---
 system/system_check_sql.php | 149 ++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 system/system_check_sql.php

diff --git a/system/system_check_sql.php b/system/system_check_sql.php
new file mode 100644
index 000000000..423d81d97
--- /dev/null
+++ b/system/system_check_sql.php
@@ -0,0 +1,149 @@
+<?php
+/* Copyright (C) 2015 FH Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Manfred kindl <manfred.kindl@technikum-wien.at>
+ */
+
+/*
+ * Dieses Skript durchläuft alle Dateien vom Typ .sql im Ordner system/sql.
+ * Wenn von diesen SQLs Datensätze retourniert werden oder Fehler auftreten, werden diese in ein Mail gepackt und an MAIL_ADMIN geschickt.
+ */
+
+require_once('../config/global.config.inc.php');
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/benutzerberechtigung.class.php');
+require_once('../include/mail.class.php');
+
+// Datenbankverbindung herstellen
+if (! $db = new basis_db ())
+	die ( 'Es konnte keine Verbindung zum Server aufgebaut werden.' );
+
+$slq_import_path = DOC_ROOT.'system/sql';
+$mailcontent = '';
+$mailheader = '
+		<style type="text/css">
+		.error
+		{
+			color: red;
+			font-weight: bold;
+		}
+		.table
+		{
+			font-size: small;
+			cellpadding: 3px;
+		}
+		.table th
+		{
+			background: #DCE4EF;
+			border: 1px solid #FFF;
+			padding: 4px;
+			text-align: left;
+		}
+		.table td
+		{
+			background-color: #EEEEEE;
+			padding: 4px;
+		 	vertical-align: top;
+		}
+		</style>';
+
+// Wenn das Script ueber die Kommandozeile aufgerufen wird, erfolgt keine Authentifizierung
+if (php_sapi_name() != 'cli')
+{
+	$uid = get_uid();
+	$rechte = new benutzerberechtigung();
+	$rechte->getBerechtigungen($uid);
+	
+	if(!$rechte->isBerechtigt('admin'))
+	{
+		exit($rechte->errormsg);
+	}
+}
+$files = glob($slq_import_path.'/*.sql');
+$filename = '';
+$db_row = '';
+
+if (($files = glob($slq_import_path.'/*.sql')) != false)
+{
+	foreach ($files as $file)
+	{
+		$filename = (basename($file));
+		$sql = file_get_contents($file);
+		
+		// Checken, ob letztes Zeichen ; ist, wenn nicht, hinzufügen
+		if (substr($sql, -1, 1) != ';')
+			$sql = $sql .= '; ';
+
+		// Wenn Fehler auftritt, diesen ins Mail schreiben
+		if (! $result = $db->db_query ($sql))
+		{
+			$mailcontent .= '<h3>Die Abfrage der Datei "'.$filename.'" hat folgenden Fehler geliefert:</h3>';
+			$mailcontent .= '<span class="error">'.$db->db_last_error () . '</span><br>';
+			continue;
+		}
+		
+		// Wenn rows vom SQL zurückkommen, diese ins Mail schreiben
+		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)
+			{
+				$mailcontent .= '<th>'.$key.'</th>';
+				continue;
+			}
+			$mailcontent .= '</tr></thead><tbody>';
+			$counter = 0; // Wenn mehr als 1000 Datensätze retourniert werden, abbrechen
+			while($row = $db->db_fetch_object($result))
+			{
+				if ($counter == 1000)
+					break;
+				
+				$mailcontent .= '<tr>';
+				foreach ($row AS $column)
+				{
+					$mailcontent .= '<td>'.($column === 'f' ? 'false' : ($column === 't' ? 'true' : $column)).'</td>';
+				}
+				$mailcontent .= '</tr>';
+				$counter++;
+			}
+			$mailcontent .= '</tr></tbody></table>';
+		}
+	}
+}
+else 
+	$mailcontent = '';
+
+// Wenn Mailcontent nicht leer ist, Mail senden
+if ($mailcontent != '')
+{
+	$mailcontent = $mailheader.$mailcontent; 
+	echo $mailcontent;
+	
+	$mail = new mail(MAIL_ADMIN, 'no-reply', 'Fehler in System Check "addons/bewerbung/cronjobs/system_check.php"', 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Inhalt vollständig darzustellen.');
+	$mail->setHTMLContent($mailcontent);
+	$mail->send();
+}
+else 
+	echo 'Es sind keine Fehler aufgetreten';
+
+

From 72459f1227bbfbce0304b466e85e31544828161a Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 15:37:15 +0200
Subject: [PATCH 15/44] Revert "Coodle Farbcodierung"

This reverts commit 097218884c82a917ac06e6046bd0f24f7f2b01ea.
---
 cis/private/coodle/coodle_worker.php |  42 +---------
 cis/private/coodle/termin.php        | 120 +++++----------------------
 2 files changed, 27 insertions(+), 135 deletions(-)

diff --git a/cis/private/coodle/coodle_worker.php b/cis/private/coodle/coodle_worker.php
index 87c9ffe9d..a16fe553c 100644
--- a/cis/private/coodle/coodle_worker.php
+++ b/cis/private/coodle/coodle_worker.php
@@ -68,8 +68,6 @@ switch($work)
 		$email='';
 		$gruppe_kurzbz='';
 		$name='';
-		$backgroundcolor = '';
-		$textcolor = '';
 		switch($typ)
 		{
 			case 'Ort': $ort = $id; break;
@@ -87,7 +85,7 @@ switch($work)
 			$gruppe = new gruppe();
 			if(!$gruppe->loadUser($gruppe_kurzbz))
 				die('Fehler: '.$gruppe->errormsg);
-
+            	
 			foreach($gruppe->result as $row)
 			{
 				$coodle->coodle_id = $coodle_id;
@@ -110,15 +108,7 @@ switch($work)
 					}
 				}
 			}
-			
-			$data['result'] = 'true';
-			$data['backgroundColor'] = $backgroundcolor;
-			$data['textColor'] = $textcolor;
-
-			if(isset($_POST['format']) && $_POST['format'] == 'json')
-				echo json_encode($data);
-			else
-				echo 'true';
+			echo 'true';
 		}
 		else 
 		{
@@ -143,33 +133,9 @@ switch($work)
 			$coodle->insertvon = $user;
 			$coodle->updateamum = date('Y-m-d H:i:s');
 			$coodle->updatevon = $user;
-
-			if ($uid != '')
-			{
-				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
-				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
-			}
-			elseif ($ort != '')
-			{
-				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 80%)';
-				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 50%)';
-			}
-			elseif ($email != '')
-			{
-				$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
-				$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
-			}
-			$data['result'] = 'true';
-			$data['backgroundColor'] = $backgroundcolor;
-			$data['textColor'] = $textcolor;
-			
+            
 			if($coodle->saveRessource(true))
-			{
-				if(isset($_POST['format']) && $_POST['format'] == 'json')
-					echo json_encode($data);
-				else 
-					echo 'true';
-			}
+				echo 'true';
 			else
 				echo 'Fehler beim Speichern:'.$coodle->errormsg;
 		}
diff --git a/cis/private/coodle/termin.php b/cis/private/coodle/termin.php
index 0454ba660..64619402c 100644
--- a/cis/private/coodle/termin.php
+++ b/cis/private/coodle/termin.php
@@ -286,22 +286,7 @@ echo '<html>
 
 	.ressourceItem
 	{
-		display: table-cell;
 		font-size: 0.8em;
-		padding: 3px;
-		margin-bottom: 3px;
-		border-radius: 10px 0 0 10px;
-		-moz-border-radius: 10px 0 0 10px;
-	}
-
-	.ressourceImage
-	{
-		display: table-cell;
-		vertical-align: top;
-		padding: 3px;
-		margin-bottom: 3px;
-		border-radius: 10px 0 0 10px;
-		-moz-border-radius: 10px 0 0 10px;
 	}
 
 	#fertig
@@ -330,28 +315,6 @@ echo '<html>
 		color: #666;
 	}
 
-	.fc-event-draggable
-	{
-		z-index: 1000 !important;
-	}
-
-	.ui-state-active
-	{
-		border: none !important;
-		background-color: lightgrey !important;
-		background-image: none !important;
-	}
-	
-	.ressourceElement
-	{
-		background-color: lightblue;
-		margin: 3px;
-		padding: 2px 4px;
-		border-radius: 2px;
-		margin-bottom: 3px;
-	}
-
-
 </style>
 <script type="text/javascript">
 
@@ -625,7 +588,7 @@ echo '
 	</div>
 	<div id="ressourcen">
 	<h4>'.$p->t('coodle/ressourcen').'</h4>
-	<div id="ressourcecontainer" style="display: table">
+	<div id="ressourcecontainer">
 	</div>
 	<div id="ressourcenInput">
 	<p>
@@ -669,7 +632,6 @@ echo '
 				type:"POST",
 				url:"coodle_worker.php",
 				data:{
-						"format" : "json",
 						"work": "addressource",
 						"id": id,
 						"typ": typ,
@@ -678,16 +640,15 @@ echo '
 					 },
 				success: function(data)
 					{
-						var data_obj = jQuery.parseJSON(data);
-						if(data_obj.result != "true")
+						if(data!="true")
 							alert("ERROR:"+data)
 						else
 						{
 							// Speichern der Ressource OK
-							if(typ == "Gruppe")
+							if(typ=="Gruppe")
 								location.reload(true);
 							else
-								addRessourceToContent(id, typ, bezeichnung, data_obj.backgroundColor, data_obj.textColor);
+								addRessourceToContent(id, typ, bezeichnung);
 						}
 
 					},
@@ -695,28 +656,21 @@ echo '
 			});
 	}
 	// Zeigt eine Ressource mit deren Events an
-	function addRessourceToContent(id, typ, bezeichnung, backgroundColor, textColor, cr32)
+	function addRessourceToContent(id, typ, bezeichnung)
 	{
 		// HTML Tags aus der Bezeichnung Entfernen, sofern vorhanden
-		var div = document.createElement("ul");
+		var div = document.createElement("div");
 	  	var text = document.createTextNode(bezeichnung);
 	  	div.appendChild(text);
 	  	bezeichnung = div.innerHTML;
-		if (backgroundColor == "")
-			backgroundColor = "lightgrey";
-
-		if (textColor == "")
-			textColor = "white";
 
 		// Anzeige der Ressource mit Loeschen Button
-		var code = \'<div class="ressourceElement" style="background-color: \
-				\'+backgroundColor+\' \
-				"><div class="ressourceImage"> \
+		var code = \'<span class="ressourceItem"> \
 				<a href="#delete" onclick="removeRessource(this, \\\'\'+id+\'\\\',\\\'\'+typ+\'\\\'); return false;"> \
-					<img src="../../../skin/images/delete_x.png" height="13px" title="'.$p->t('coodle/ressourceEntfernen').'"/> \
-				</a></div><div class="ressourceItem"> \
-				\'+bezeichnung+cr32+\' \
-			<br /></div></div>\';
+					<img src="../../../skin/images/delete_round.png" height="13px" title="'.$p->t('coodle/ressourceEntfernen').'"/> \
+				</a> \
+				\'+bezeichnung+\' \
+			<br /></span>\';
 		$("#ressourcecontainer").append(code);
 
 		// Events der Ressource hinzufuegen
@@ -731,8 +685,8 @@ echo '
 				error: function() {
 					alert("Error fetching data for "+typ+" "+id);
 				},
-				color: backgroundColor,
-				textColor: textColor
+				color:"lightgrey"
+				//textColor:"black"
 			});
 
 	}
@@ -782,7 +736,7 @@ echo '
 					alert("Error fetching data for "+typ+" "+id);
 				}
 			});
-		$(item).closest(".ressourceElement").remove();
+		$(item).parent().remove();
 	}';
 
 echo '
@@ -794,64 +748,36 @@ echo '
 if(!$coodle->getRessourcen($coodle_id))
 	die('Fehler:'.$coodle->errormsg);
 
-$backgroundcolor = 0;
-$zahl = 0;
-$textcolor = '';
 foreach($coodle->result as $row)
 {
 	echo "\n\t";
-	$typ = '';
-	$id = '';
-	$bezeichnung = '';
+	$typ='';
+	$id='';
+	$bezeichnung='';
 
 	if($row->uid!='')
 	{
-		$typ = 'Person';
-		$id = $row->uid;
+		$typ='Person';
+		$id=$row->uid;
 		$benutzer = new benutzer();
 		$benutzer->load($row->uid);
 		$bezeichnung = $benutzer->nachname.' '.$benutzer->vorname;
-// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
-		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
 	}
 	elseif($row->ort_kurzbz!='')
 	{
-		$typ = 'Ort';
-		$id = $row->ort_kurzbz;
+		$typ='Ort';
+		$id=$row->ort_kurzbz;
 		$ort = new ort();
 		$ort->load($row->ort_kurzbz);
-		$bezeichnung = $ort->bezeichnung.' '.$row->ort_kurzbz;
-// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 80%)';
-		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 50%)';
+		$bezeichnung = $ort->bezeichnung;
 	}
 	elseif($row->email!='')
 	{
 		$typ = 'Extern';
 		$id = $row->email;
 		$bezeichnung = $row->name;
-// 		$backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)';
-		$textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)';
 	}
-	$zahl = abs(crc32($id));
-	$zahl = strval($zahl);
-// 	$zahl = strrev($zahl);
-	$zahl = substr($zahl, -3, 3);
-	$zahl = intval($zahl);
-	$zahl = abs($zahl % 360);
-	
-// 	$backgroundcolor = crc32($id);
-// 	$backgroundcolor = strval($backgroundcolor);
-// 	$backgroundcolor = strrev($backgroundcolor);
-// 	$backgroundcolor = substr($backgroundcolor, 0, 3);
-// 	$backgroundcolor = intval($backgroundcolor);
-// 	$backgroundcolor = abs($backgroundcolor % 360);
-// 	$backgroundcolor = 'hsl('.$backgroundcolor.', 80%, 90%)';
-	
-	$backgroundcolor = 'hsl('.$zahl.', 80%, 90%)';
-	
-	echo 'addRessourceToContent("'.$db->convert_html_chars($id).'", "'.$db->convert_html_chars($typ).'", "'.$db->convert_html_chars($bezeichnung).'", "'.$backgroundcolor.'", "'.$textcolor.'", "'.$zahl.'");';
-
-	$zahl = $zahl+20;
+	echo 'addRessourceToContent("'.$db->convert_html_chars($id).'", "'.$db->convert_html_chars($typ).'", "'.$db->convert_html_chars($bezeichnung).'");';
 }
 
 // Bereits eingetragene Terminvorschlaege laden

From b3e57e422f9d6363f22925a65bfbe0a130f28449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 27 Apr 2018 16:32:47 +0200
Subject: [PATCH 16/44] Problem behoben wodurch in der CIS Seite Redirect
 Seiten nicht korrekt geoeffnet wurden wenn ein relativer Pfad verwendet wurde

---
 cis/private/tools/suche.php | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php
index 406c8662f..f9452e114 100644
--- a/cis/private/tools/suche.php
+++ b/cis/private/tools/suche.php
@@ -196,10 +196,10 @@ function searchOE($searchItems)
 
 	//Suche nach Studiengaengen mit dem Suchbegriff und merge mit $searchItems
 	$stg_oe_array = array();
-	
+
 	$oe = new organisationseinheit();
-	$oe->search($searchItems); 
-	
+	$oe->search($searchItems);
+
 	$stg = new studiengang();
 	$stg->search($searchItems);
 	foreach($stg->result as $row)
@@ -490,7 +490,7 @@ function searchContent($searchItems)
 					// Jede Content_ID nur einmal ausgeben
 					if (in_array($row->content_id, $content_id_arr))
 						continue;
-					
+
 					// Wenn der Eintrag vom Typ "redirect" ist, checken ob extern verlinkt wird oder nur ein Anker gesetzt ist (erstes Zeichen #)
 					// Externe Links werden so ausgegeben, interne Anker gar nicht
 					if ($row->template_kurzbz == 'redirect')
@@ -499,14 +499,23 @@ function searchContent($searchItems)
 						$dom = new DOMDocument();
 						$dom->loadXML($row->content);
 						$content = $dom->getElementsByTagName('url')->item(0)->nodeValue;
-						
+
 						if (substr($content, 0, 1) == '#')
 							continue;
 						else
 						{
-							echo '<li><div class="suchergebnis">';
-							echo '<a href="'.$content.'" target="blank">',$db->convert_html_chars($row->titel),'</a><br>';
-							echo '</div></li>';
+							if(mb_strpos($content, 'http') === 0)
+							{
+								echo '<li><div class="suchergebnis">';
+								echo '<a href="'.$content.'" target="blank">',$db->convert_html_chars($row->titel),'</a><br>';
+								echo '</div></li>';
+							}
+							else
+							{
+								echo '<li><div class="suchergebnis">';
+								echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
+								echo '</div></li>';
+							}
 						}
 					}
 					else
@@ -514,7 +523,7 @@ function searchContent($searchItems)
 						echo '<li><div class="suchergebnis">';
 						echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
 						$preview = findAndMark($row->content, $searchItems);
-	
+
 						echo $preview;
 						echo '</div></li>';
 					}
@@ -543,7 +552,7 @@ function searchContent($searchItems)
 					// Jede Content_ID nur einmal ausgeben
 					if (in_array($row->content_id, $content_id_arr))
 						continue;
-					
+
 					// Wenn der Eintrag vom Typ "redirect" ist, checken ob extern verlinkt wird oder nur ein Anker gesetzt ist (erstes Zeichen #)
 					// Externe Links werden so ausgegeben, interne Anker gar nicht
 					if ($row->template_kurzbz == 'redirect')
@@ -552,7 +561,7 @@ function searchContent($searchItems)
 						$dom = new DOMDocument();
 						$dom->loadXML($row->content);
 						$content = $dom->getElementsByTagName('url')->item(0)->nodeValue;
-						
+
 						if (substr($content, 0, 1) == '#')
 							continue;
 						else
@@ -567,7 +576,7 @@ function searchContent($searchItems)
 						echo '<li><div class="suchergebnis">';
 						echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
 						$preview = findAndMark($row->content, $searchItems);
-	
+
 						echo $preview;
 						echo '</div></li>';
 					}
@@ -594,7 +603,7 @@ function findAndMark($content, $items)
 	}
 	if($item == '')
 		return '...';
-	
+
 	//CDATA und HTML Tags entfernen
 	$content = mb_str_replace('<[CDATA[', '', $content);
 	$content = mb_str_replace(']]>', '', $content);

From 50fedfb8890b3fece2cc0f88116db5cb91f4a28a Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Fri, 27 Apr 2018 18:59:22 +0200
Subject: [PATCH 17/44] FAS Studentenoverlay

- Columns Prestudent_ID and Person_ID shown as default
- Inactive Students marked grey
---
 content/student/studentenoverlay.xul.php | 92 ++++++++++++------------
 skin/tempus.css                          |  4 ++
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 76c8eed6c..8f311784d 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -288,11 +288,11 @@ 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="true" persist="hidden, width, ordinal"
+	    				<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="true" persist="hidden, width, ordinal"
+	    				<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()"/>
 	    				<splitter class="tree-splitter"/>
@@ -384,11 +384,11 @@ else
 						class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#mentor" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-						<treecol id="student-treecol-aktiv" label="Aktiv" flex="1" hidden="false" persist="hidden, width, ordinal"
+						<treecol id="student-treecol-aktiv" label="Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
 						class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#aktiv" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-						<treecol id="student-treecol-geburtsdatum_iso" label="GeburtsdatumISO" flex="1" hidden="false" persist="hidden, width, ordinal"
+						<treecol id="student-treecol-geburtsdatum_iso" label="GeburtsdatumISO" flex="1" hidden="true" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum_iso" onclick="StudentTreeSort()"/>
 					</treecols>
@@ -398,50 +398,50 @@ else
 	      					<treechildren>
 	       						<treeitem uri="rdf:*">
 	         						<treerow>
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#uid"   />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titelpre" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vorname" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#svnr" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geschlecht" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#semester" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#verband" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studiengang" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#person_id" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#status" />
-										<treecell label="rdf:http://www.technikum-wien.at/student/rdf#status_datum" />
-										<treecell label="rdf:http://www.technikum-wien.at/student/rdf#status_bestaetigung" />
-										<treecell label="rdf:http://www.technikum-wien.at/student/rdf#status_datum_iso" />
-										<treecell label="rdf:http://www.technikum-wien.at/student/rdf#status_bestaetigung_iso" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#mail_privat" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#mail_intern" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungpre" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#uid"   />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#titelpre" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#vorname" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#svnr" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geschlecht" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#semester" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#verband" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
+	           							<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" />
+										<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#status_bestaetigung" />
+										<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#status_datum_iso" />
+										<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#status_bestaetigung_iso" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#mail_privat" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#mail_intern" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungen" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungpre" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
 										<!--
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
+	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
+									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
 									-->
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufnahmegruppe_kurzbz" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#mentor" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aktiv" />
-									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum_iso" />
+									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#aufnahmegruppe_kurzbz" />
+									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" />
+									<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" />
+	           							<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#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" />
 	         						</treerow>
 	       						</treeitem>
 	      					</treechildren>
diff --git a/skin/tempus.css b/skin/tempus.css
index 5286121ed..0618d9af4 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -180,6 +180,10 @@ treechildren::-moz-tree-cell-text(Aktiv_Nein)
 {
   color: grey;
 }
+treechildren::-moz-tree-cell-text(Aktiv_false)
+{
+  color: grey;
+}
 treechildren::-moz-tree-cell(Lektor_inaktiv)
 {
   color: grey;

From ecaaa3cd19243e02024b2e634f9250fda54a28c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 30 Apr 2018 09:44:40 +0200
Subject: [PATCH 18/44] =?UTF-8?q?Cronjob=20f=C3=BCr=20Korrektur=20des=20St?=
 =?UTF-8?q?udienplanes=20korrigiert=20nun=20auch=20den=20Studienplan=20der?=
 =?UTF-8?q?=20Reihungstestanmeldung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/jobs/Prestudentstatus.php     | 65 ++++++++++++++++++-
 .../models/crm/RtStudienplan_model.php        | 15 +++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 application/models/crm/RtStudienplan_model.php

diff --git a/application/controllers/jobs/Prestudentstatus.php b/application/controllers/jobs/Prestudentstatus.php
index 2f3e3aa95..7d9bb60b7 100644
--- a/application/controllers/jobs/Prestudentstatus.php
+++ b/application/controllers/jobs/Prestudentstatus.php
@@ -61,7 +61,8 @@ class Prestudentstatus extends FHC_Controller
 			tbl_prestudentstatus.status_kurzbz,
 			tbl_prestudent.studiengang_kz,
 			tbl_prestudentstatus.studienplan_id,
-			tbl_studienplan.orgform_kurzbz');
+			tbl_studienplan.orgform_kurzbz,
+			tbl_prestudent.person_id');
 		$this->PrestudentstatusModel->addJoin('public.tbl_prestudent', 'prestudent_id');
 		$this->PrestudentstatusModel->addJoin('lehre.tbl_studienplan', 'studienplan_id','LEFT');
 		$this->PrestudentstatusModel->addJoin('lehre.tbl_studienordnung', 'studienordnung_id','LEFT');
@@ -105,6 +106,14 @@ class Prestudentstatus extends FHC_Controller
 							$this->PrestudentstatusModel->update($pk_arr,
 								array('studienplan_id' => $studienplan->retval[0]->studienplan_id));
 							$sum_corrected++;
+
+							if($row_status->status_kurzbz == 'Interessent')
+							{
+								$this->correctReihungstest(
+									$row_status->person_id,
+									$row_status->studienplan_id,
+									$studienplan->retval[0]->studienplan_id);
+							}
 						}
 					}
 					else
@@ -124,4 +133,58 @@ class Prestudentstatus extends FHC_Controller
 		echo "Not Corrected:".$sum_notcorrected."\n";
 		echo "Overall incorrect:".$sum_overall."\n";
 	}
+
+	/**
+	 * Corrects the Assignment to a Placement Test
+	 * Corrects the Studyplan and adds the Studyplan to the Placement test
+	 * @param $person_id ID of the Person
+	 * @param $studienplan_id_old ID of the old Studyplan
+	 * @param $studienplan_id ID of the new Studyplan
+	 */
+	private function correctReihungstest($person_id, $studienplan_id_old, $studienplan_id)
+	{
+		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
+		$this->load->model('crm/RtStudienplan_model', 'RtStudienplanModel');
+
+		$this->RtPersonModel->resetQuery();
+		// Correct also Assignments to Placement test
+		$this->RtPersonModel->addJoin(
+			'public.tbl_reihungstest',
+			'tbl_reihungstest.reihungstest_id = tbl_rt_person.rt_id'
+		);
+
+		$rt = $this->RtPersonModel->loadWhere(array(
+			"person_id" => $person_id,
+			"studienplan_id" => $studienplan_id_old
+			));
+
+		//	"tbl_reihungstest.datum > " => date('Y-m-d H:i:s')
+
+		if(hasData($rt))
+		{
+			foreach($rt->retval as $row_rt)
+			{
+				// Update RTPerson Record
+				$this->RtPersonModel->update($row_rt->rt_person_id, array(
+					'studienplan_id' => $studienplan_id,
+					'updateamum' => date('Y-m-d H:i:s'),
+					'updatevon' => 'cron'
+				));
+
+				// Add new Studyplan to RtStudienplan if missing
+				$rt_studienplan = $this->RtStudienplanModel->loadWhere(array(
+					"reihungstest_id" => $row_rt->reihungstest_id,
+					"studienplan_id" => $studienplan_id
+				));
+
+				if(!hasData($rt_studienplan))
+				{
+					$this->RtStudienplanModel->insert(array(
+						"reihungstest_id" => $row_rt->reihungstest_id,
+						"studienplan_id" => $studienplan_id
+					));
+				}
+			}
+		}
+	}
 }
diff --git a/application/models/crm/RtStudienplan_model.php b/application/models/crm/RtStudienplan_model.php
new file mode 100644
index 000000000..0e6fdeef3
--- /dev/null
+++ b/application/models/crm/RtStudienplan_model.php
@@ -0,0 +1,15 @@
+<?php
+
+class RtStudienplan_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = "public.tbl_rt_studienplan";
+		$this->pk = array("rt_id", "studienplan_id");
+		$this->hasSequence = false;
+	}
+}

From 3b33e52df4cf88f26b5a29e71484ad92c78ef52f Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:32:08 +0200
Subject: [PATCH 19/44] added getChild and getParents methods to CI model

---
 .../Organisationseinheit_model.php            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 37b269f79..75791de1b 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -115,4 +115,49 @@ class Organisationseinheit_model extends DB_Model
 
 		return $this->execQuery($query, array($oe_kurzbz));
 	}
+
+	/**
+	 * Liefert die ChildNodes einer Organisationseinheit
+	 * @param $oe_kurzbz
+	 * @return Array mit den Childs inkl dem Uebergebenen Element
+	 */
+	public function getChilds($oe_kurzbz)
+	{
+		$query = "
+		WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as 
+		(
+			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit 
+			WHERE oe_kurzbz=?
+			UNION ALL
+			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes 
+			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+		)
+		SELECT oe_kurzbz
+		FROM oes
+		GROUP BY oe_kurzbz;";
+
+		return $this->execQuery($query, array($oe_kurzbz));
+	}
+
+	/**
+	 * Liefert die OEs die im Tree ueberhalb der uebergebene OE liegen
+	 * @param $oe_kurzbz
+	 */
+	public function getParents($oe_kurzbz)
+	{
+		$query=
+		"WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as 
+		(
+			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit 
+			WHERE oe_kurzbz=? and aktiv = true 
+			UNION ALL
+			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes 
+			WHERE o.oe_kurzbz=oes.oe_parent_kurzbz and aktiv = true
+		)
+		SELECT oe_kurzbz
+		FROM oes";
+
+		return $this->execQuery($query, array($oe_kurzbz));
+	}
+
 }

From 0f8847593af0e31510fb0f65d9563ccdd9bdaad8 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:56:00 +0200
Subject: [PATCH 20/44] renamed budget tables (permissions)

---
 application/config/fhcomplete.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/config/fhcomplete.php b/application/config/fhcomplete.php
index dfb690278..7d116f927 100644
--- a/application/config/fhcomplete.php
+++ b/application/config/fhcomplete.php
@@ -237,10 +237,10 @@ $config['fhc_acl'] = array
 	'wawi.tbl_zahlungstyp' => 'basis/zahlungstyp',
 
 	// Temporary
-	'extension.tbl_budgetantrag' => 'basis/kostenstelle',
-	'extension.tbl_budgetposition' => 'basis/kostenstelle',
-	'extension.tbl_budgetstatus' => 'basis/kostenstelle',
-	'extension.tbl_budgetantrag_status' => 'basis/kostenstelle',
+	'extension.tbl_budget_antrag' => 'basis/kostenstelle',
+	'extension.tbl_budget_position' => 'basis/kostenstelle',
+	'extension.tbl_budget_status' => 'basis/kostenstelle',
+	'extension.tbl_budget_antrag_status' => 'basis/kostenstelle',
 	'extension.tbl_dsms_anonymisierung' => 'dsms/export',
 
 	DMS_PATH => 'fs/dms',

From 89e724de0e5e35c937637225ac5ca63620e50757 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:57:48 +0200
Subject: [PATCH 21/44] added Kostenstellen retrievers by geschaeftsjahr

---
 .../models/accounting/Kostenstelle_model.php  | 123 ++++++++++++++----
 1 file changed, 97 insertions(+), 26 deletions(-)

diff --git a/application/models/accounting/Kostenstelle_model.php b/application/models/accounting/Kostenstelle_model.php
index 4342327f7..f338b69d5 100644
--- a/application/models/accounting/Kostenstelle_model.php
+++ b/application/models/accounting/Kostenstelle_model.php
@@ -15,39 +15,20 @@ class Kostenstelle_model extends DB_Model
 	/**
 	 * Gets all active Kostenstellen for a geschaeftsjahr, as determined by the geschaeftsjahrvon and bis fields
 	 * Gets Kostenstellen of current Geschaeftsjahr if Geschaeftsjahr not specified
-	 * Only the Kostenstellen for which a permission exists are returned!
 	 * @param $geschaeftsjahr
-	 * @return array|null
+	 * @return array|null Kostenstellen or empty array if no geschaeftsjahr found
 	 */
 	public function getActiveKostenstellenForGeschaeftsjahr($geschaeftsjahr = null)
 	{
 		$this->load->model('organisation/geschaeftsjahr_model', 'GeschaeftsjahrModel');
 
-		if ($geschaeftsjahr === null)
+		$gj = $this->_getGeschaeftsjahr($geschaeftsjahr);
+
+		if (hasData($gj))
 		{
-			$lgj = $this->GeschaeftsjahrModel->getCurrGeschaeftsjahr();
+			$gjstart = $gj->retval[0]->start;
 
-			if ($lgj->error)
-				return error($lgj->retval);
-
-			if (count($lgj->retval) < 1)
-				return success(array());
-
-			$geschaeftsjahr = $lgj->retval[0]->geschaeftsjahr_kurzbz;
-		}
-
-		$this->GeschaeftsjahrModel->addSelect('start, ende');
-		$gj = $this->GeschaeftsjahrModel->load($geschaeftsjahr);
-
-		if ($gj->error)
-			return error($gj->retval);
-
-		if (count($gj->retval) < 1)
-			return success(array());
-
-		$gjstart = $gj->retval[0]->start;
-
-		$query = 'SELECT kostenstelle_id, kurzbz, wawi.tbl_kostenstelle.bezeichnung, wawi.tbl_kostenstelle.aktiv
+			$query = 'SELECT kostenstelle_id, kurzbz, wawi.tbl_kostenstelle.bezeichnung, wawi.tbl_kostenstelle.aktiv, wawi.tbl_kostenstelle.oe_kurzbz
 					FROM wawi.tbl_kostenstelle 
 					LEFT JOIN public.tbl_geschaeftsjahr kgjvon on wawi.tbl_kostenstelle.geschaeftsjahrvon = kgjvon.geschaeftsjahr_kurzbz
 					LEFT JOIN public.tbl_geschaeftsjahr kgjbis on wawi.tbl_kostenstelle.geschaeftsjahrbis = kgjbis.geschaeftsjahr_kurzbz 
@@ -57,6 +38,96 @@ class Kostenstelle_model extends DB_Model
 					(DATE ? < kgjbis.ende OR wawi.tbl_kostenstelle.geschaeftsjahrbis IS NULL)
 					ORDER BY wawi.tbl_kostenstelle.bezeichnung';
 
-		return $this->execQuery($query, array($gjstart, $gjstart));
+			return $this->execQuery($query, array($gjstart, $gjstart));
+		}
+		else
+		{
+			return success(array());
+		}
+	}
+
+	/**
+	 * Gets all active Kostenstellen for a geschaeftsjahr, as determined by the geschaeftsjahrvon and bis fields, together with their oe,
+	 * hierarchally sorted, gets Kostenstellen of current Geschaeftsjahr if Geschaeftsjahr not specified
+	 * @param null $geschaeftsjahr
+	 * @return array|null
+	 */
+	public function getActiveKostenstellenForGeschaeftsjahrWithOe($geschaeftsjahr = null)
+	{
+		$this->load->model('organisation/geschaeftsjahr_model', 'GeschaeftsjahrModel');
+
+		$gj = $this->_getGeschaeftsjahr($geschaeftsjahr);
+
+		if (hasData($gj))
+		{
+			$gjstart = $gj->retval[0]->start;
+
+			$query = "WITH RECURSIVE tree (oe_kurzbz, bezeichnung, path, level, organisationseinheittyp_kurzbz) AS (
+					SELECT oe_kurzbz,
+							bezeichnung || ' (' || organisationseinheittyp_kurzbz || ')' AS bezeichnung,
+							oe_kurzbz || '|' AS path, 0 AS level,
+							organisationseinheittyp_kurzbz
+					  FROM tbl_organisationseinheit
+					 WHERE oe_parent_kurzbz IS NULL
+					   AND aktiv = true
+				 UNION ALL
+					SELECT oe.oe_kurzbz,
+							oe.bezeichnung || ' (' || oe.organisationseinheittyp_kurzbz || ')' AS bezeichnung,
+							tree.path || oe.oe_kurzbz || '|' AS path, tree.level + 1 AS level,
+							oe.organisationseinheittyp_kurzbz
+					  FROM tree JOIN tbl_organisationseinheit oe ON (tree.oe_kurzbz = oe.oe_parent_kurzbz)
+			)
+			SELECT oe_kurzbz,
+					SUBSTRING(REGEXP_REPLACE(path, '[A-z]+\|', '-', 'g') || rec.bezeichnung, 2) AS oe_description, 
+					level,
+					kst.kostenstelle_id as kostenstelle_id,
+					kst.kurzbz as kostenstelle_kurzbz,
+					kst.bezeichnung as kostenstelle_bezeichnung,
+					kst.aktiv as kostenstelle_aktiv
+			  FROM tree rec
+				JOIN (
+					SELECT kostenstelle_id, kurzbz, wawi.tbl_kostenstelle.bezeichnung, wawi.tbl_kostenstelle.aktiv, wawi.tbl_kostenstelle.oe_kurzbz as kstoe
+					FROM wawi.tbl_kostenstelle 
+					LEFT JOIN public.tbl_geschaeftsjahr kgjvon on wawi.tbl_kostenstelle.geschaeftsjahrvon = kgjvon.geschaeftsjahr_kurzbz
+					LEFT JOIN public.tbl_geschaeftsjahr kgjbis on wawi.tbl_kostenstelle.geschaeftsjahrbis = kgjbis.geschaeftsjahr_kurzbz 
+					WHERE
+					(DATE ? >= kgjvon.start OR wawi.tbl_kostenstelle.geschaeftsjahrvon IS NULL)
+					AND
+					(DATE ? < kgjbis.ende OR wawi.tbl_kostenstelle.geschaeftsjahrbis IS NULL)
+					ORDER BY wawi.tbl_kostenstelle.bezeichnung) 
+				kst on kst.kstoe =  rec.oe_kurzbz
+				ORDER BY level";
+
+			return $this->execQuery($query, array($gjstart, $gjstart));
+		}
+		else
+		{
+			return success(array());
+		}
+	}
+
+	/**
+	 * Gets either given Geschaeftsjahr, current Geschaeftsjahr if not given, or chronologically last Geschaeftsjahr if there is no current
+	 * @param $geschaeftsjahr
+	 * @return mixed
+	 */
+	protected function _getGeschaeftsjahr($geschaeftsjahr)
+	{
+		if ($geschaeftsjahr === null)
+		{
+			$gj = $this->GeschaeftsjahrModel->getCurrGeschaeftsjahr();
+			if (!hasData($gj))
+			{
+				$this->GeschaeftsjahrModel->addSelect('geschaeftsjahr_kurzbz, start, ende');
+				$this->GeschaeftsjahrModel->addOrder('start', 'DESC');
+				$gj = $this->GeschaeftsjahrModel->load();
+			}
+		}
+		else
+		{
+			$this->GeschaeftsjahrModel->addSelect('geschaeftsjahr_kurzbz, start, ende');
+			$gj = $this->GeschaeftsjahrModel->load($geschaeftsjahr);
+		}
+		return $gj;
 	}
 }

From ea58df568f32f780f4e60f9fd7882e39f8f7c557 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:58:25 +0200
Subject: [PATCH 22/44] table footer line e.g. for sums

---
 skin/admintemplate.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/skin/admintemplate.css b/skin/admintemplate.css
index 88719b74c..5df64ce30 100644
--- a/skin/admintemplate.css
+++ b/skin/admintemplate.css
@@ -50,4 +50,10 @@
     position: absolute;
     top: 2px;
     font-size: 1.3em;
+}
+
+/*table footer line (e.g. for sums)*/
+.table-bordered > tfoot > tr > td, .table-bordered > tfoot > tr > th
+{
+    border-top-width: 2px;
 }
\ No newline at end of file

From 9e743089c21b872fc14d54c716e7c2fc7bcd2ee1 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:58:48 +0200
Subject: [PATCH 23/44] table footer line e.g. for sums

---
 composer.json | 553 ++++++++++++++++++++++++++------------------------
 composer.lock | 107 +++++-----
 2 files changed, 342 insertions(+), 318 deletions(-)

diff --git a/composer.json b/composer.json
index 8558cbdd5..25d4e3407 100644
--- a/composer.json
+++ b/composer.json
@@ -1,270 +1,283 @@
-{
-	"name": "fh-complete/fhc-core",
-	"type": "app",
-	"description": "FH-Complete Core",
-	"keywords": [
-		"fhc",
-		"fh-complete",
-		"campusmanagement"
-	],
-	"homepage": "https://github.com/FH-Complete/FHC-Core",
-	"license": "GPLv3",
-	"authors": [
-		{
-			"name": "Christian Paminger",
-			"email": "christian.paminger@fhcomplete.org",
-			"homepage": "http://fhcomplete.org"
-		},
-		{
-			"name": "Andreas Österreicher",
-			"email": "oesi@technikum-wien.at",
-			"homepage": "http://fhcomplete.org"
-		}
-	],
-	"support": {
-		"email": "info@fhcomplete.org",
-		"forum": "https://plus.google.com/communities/113278802529782592610",
-		"wiki": "http://wiki.fhcomplete.org/"
-	},
-	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "codeigniter-restserver",
-				"version": "2.6",
-				"dist": {
-					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jsoneditor",
-				"version": "5.5.6",
-				"dist": {
-					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "json-forms",
-				"version": "1.4.0",
-				"dist": {
-					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "borgar/textile-js",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/borgar/textile-js.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "rmariuzzo/jquery-checkboxes",
-				"version": "1.0.7",
-				"source": {
-					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
-					"type": "git",
-					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV1",
-				"version": "1.12.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV2",
-				"version": "2.2.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "fgelinas/timepicker",
-				"version": "0.3.3",
-				"dist": {
-					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "alvaro-prieto/colResizable",
-				"version": "1.6",
-				"dist": {
-					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tapmodo/Jcrop",
-				"version": "2.0.4",
-				"dist": {
-					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery-archive/jquery-metadata",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/jquery-archive/jquery-metadata.git",
-					"type": "git",
-					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tomazdragar/SimpleCropper",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/tomazdragar/SimpleCropper.git",
-					"type": "git",
-					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "joeldbirch/superfish",
-				"version": "1.7.9",
-				"dist": {
-					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/sizzle",
-				"version": "1.0",
-				"dist": {
-					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "nicolaskruchten/pivottable",
-				"version": "2.15.0",
-				"source": {
-					"url": "https://github.com/nicolaskruchten/pivottable.git",
-					"type": "git",
-					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
-				"version": "3.3.7",
-				"source": {
-					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		}
-	],
-	"require": {
-		"php": ">=5.4.0",
-
-		"alvaro-prieto/colResizable": "^1.6",
-		"borgar/textile-js": "1.0",
-		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
-		"christianbach/tablesorter": "^1.0",
-
-		"codeigniter/framework": "3.*",
-		"codeigniter-restserver": "2.6",
-
-		"components/jquery": "^3.2",
-		"components/jqueryui": "^1.12",
-		"components/font-awesome": "^4.7",
-		"components/angular.js": "1.3.16",
-
-		"easyrdf/easyrdf": "0.9.*",
-		"fgelinas/timepicker": "^0.3.3",
-		"fzaninotto/faker": "1.*",
-		"joeldbirch/superfish": "^1.7",
-
-		"jquery/jqueryV1": "^1.12",
-		"jquery/jqueryV2": "^2.2",
-		"jquery/sizzle": "^1.0",
-
-		"jquery-archive/jquery-metadata": "^1.0",
-
-		"json-forms": "1.4.0",
-		"jsoneditor": "5.5.6",
-		"kingsquare/json-schema-form": "*",
-		"michelf/php-markdown": "1.5.0",
-		"ml/json-ld": "1.*",
-		"mottie/tablesorter": "^2.29",
-		"netcarver/textile": "^3.5",
-		"nicolaskruchten/pivottable": "^2.15.0",
-		"rmariuzzo/jquery-checkboxes": "1.0.7",
-
-		"rougin/combustor": "1.1.*",
-		"rougin/refinery": "*",
-
-		"tapmodo/Jcrop": "^2.0",
-		"tinymce/tinymce": "4.*",
-		"tomazdragar/SimpleCropper": "^1.0",
-		"twbs/bootstrap": "^3.3",
-
-		"zetacomponents/workflow": "1.*",
-		"zetacomponents/document": "1.*",
-		"zetacomponents/workflow-database-tiein": "1.*",
-		"zetacomponents/workflow-event-log-tiein": "1.*"
-	},
-	"require-dev": {
-		"squizlabs/php_codesniffer": "2.*"
-	},
-	"config": {
-		"bin-dir": "vendor/bin"
-	}
-}
-
+{
+	"name": "fh-complete/fhc-core",
+	"type": "app",
+	"description": "FH-Complete Core",
+	"keywords": [
+		"fhc",
+		"fh-complete",
+		"campusmanagement"
+	],
+	"homepage": "https://github.com/FH-Complete/FHC-Core",
+	"license": "GPLv3",
+	"authors": [
+		{
+			"name": "Christian Paminger",
+			"email": "christian.paminger@fhcomplete.org",
+			"homepage": "http://fhcomplete.org"
+		},
+		{
+			"name": "Andreas Österreicher",
+			"email": "oesi@technikum-wien.at",
+			"homepage": "http://fhcomplete.org"
+		}
+	],
+	"support": {
+		"email": "info@fhcomplete.org",
+		"forum": "https://plus.google.com/communities/113278802529782592610",
+		"wiki": "http://wiki.fhcomplete.org/"
+	},
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "codeigniter-restserver",
+				"version": "2.6",
+				"dist": {
+					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jsoneditor",
+				"version": "5.5.6",
+				"dist": {
+					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "json-forms",
+				"version": "1.4.0",
+				"dist": {
+					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "borgar/textile-js",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/borgar/textile-js.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "rmariuzzo/jquery-checkboxes",
+				"version": "1.0.7",
+				"source": {
+					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
+					"type": "git",
+					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV1",
+				"version": "1.12.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV2",
+				"version": "2.2.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "fgelinas/timepicker",
+				"version": "0.3.3",
+				"dist": {
+					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "alvaro-prieto/colResizable",
+				"version": "1.6",
+				"dist": {
+					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tapmodo/Jcrop",
+				"version": "2.0.4",
+				"dist": {
+					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery-archive/jquery-metadata",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/jquery-archive/jquery-metadata.git",
+					"type": "git",
+					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tomazdragar/SimpleCropper",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/tomazdragar/SimpleCropper.git",
+					"type": "git",
+					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "joeldbirch/superfish",
+				"version": "1.7.9",
+				"dist": {
+					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/sizzle",
+				"version": "1.0",
+				"dist": {
+					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "nicolaskruchten/pivottable",
+				"version": "2.15.0",
+				"source": {
+					"url": "https://github.com/nicolaskruchten/pivottable.git",
+					"type": "git",
+					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
+				"version": "3.3.7",
+				"source": {
+					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
+					"type": "git",
+					"reference": "e85ee3814ba12b7095024d31424cc9d19d791d05"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "ludo/jquery-treetable",
+				"version": "3.2.0",
+				"source": {
+					"url": "https://github.com/ludo/jquery-treetable.git",
+					"type": "git",
+					"reference": "73690a9df26dbc1a49981f9335df2a9cd9808813"
+				}
+			}
+		}
+	],
+	"require": {
+		"php": ">=5.4.0",
+
+		"alvaro-prieto/colResizable": "^1.6",
+		"borgar/textile-js": "1.0",
+		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
+		"christianbach/tablesorter": "^1.0",
+
+		"codeigniter/framework": "3.*",
+		"codeigniter-restserver": "2.6",
+
+		"components/jquery": "^3.2",
+		"components/jqueryui": "^1.12",
+		"components/font-awesome": "^4.7",
+		"components/angular.js": "1.3.16",
+
+		"easyrdf/easyrdf": "0.9.*",
+		"fgelinas/timepicker": "^0.3.3",
+		"fzaninotto/faker": "1.*",
+		"joeldbirch/superfish": "^1.7",
+
+		"jquery/jqueryV1": "^1.12",
+		"jquery/jqueryV2": "^2.2",
+		"jquery/sizzle": "^1.0",
+
+		"jquery-archive/jquery-metadata": "^1.0",
+
+		"json-forms": "1.4.0",
+		"jsoneditor": "5.5.6",
+		"kingsquare/json-schema-form": "*",
+		"ludo/jquery-treetable": "^3.2",
+		"michelf/php-markdown": "1.5.0",
+		"ml/json-ld": "1.*",
+		"mottie/tablesorter": "^2.29",
+		"netcarver/textile": "^3.5",
+		"nicolaskruchten/pivottable": "^2.15.0",
+		"rmariuzzo/jquery-checkboxes": "1.0.7",
+
+		"rougin/combustor": "1.1.*",
+		"rougin/refinery": "*",
+
+		"tapmodo/Jcrop": "^2.0",
+		"tinymce/tinymce": "4.*",
+		"tomazdragar/SimpleCropper": "^1.0",
+		"twbs/bootstrap": "^3.3",
+
+		"zetacomponents/workflow": "1.*",
+		"zetacomponents/document": "1.*",
+		"zetacomponents/workflow-database-tiein": "1.*",
+		"zetacomponents/workflow-event-log-tiein": "1.*"
+	},
+	"require-dev": {
+		"squizlabs/php_codesniffer": "2.*"
+	},
+	"config": {
+		"bin-dir": "vendor/bin"
+	}
+}
+
diff --git a/composer.lock b/composer.lock
index 9964729cd..506882e61 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "329973fd68eea79f7c67464cbd121d58",
-    "content-hash": "bf03cef0846a79959456abfccf90730e",
+    "hash": "00d176bc89167feef10405c7457b6d6a",
+    "content-hash": "8cd3ddef525145593a8fe885184ef4cc",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -69,16 +69,16 @@
         },
         {
             "name": "codeigniter/framework",
-            "version": "3.1.7",
+            "version": "3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bcit-ci/CodeIgniter.git",
-                "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312"
+                "reference": "71e647782764184e3aab4faffe6d99176758979f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/02a0518e1c56ba3506f370362ac5ebdb8a138312",
-                "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312",
+                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/71e647782764184e3aab4faffe6d99176758979f",
+                "reference": "71e647782764184e3aab4faffe6d99176758979f",
                 "shasum": ""
             },
             "require": {
@@ -98,7 +98,7 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
-            "time": "2018-01-13 11:57:11"
+            "time": "2018-03-22 14:48:55"
         },
         {
             "name": "components/angular.js",
@@ -441,16 +441,16 @@
         },
         {
             "name": "components/jquery",
-            "version": "3.2.1",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/components/jquery.git",
-                "reference": "e5534d4ab8e80c159553d507e358ed20a806d3bf"
+                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/components/jquery/zipball/e5534d4ab8e80c159553d507e358ed20a806d3bf",
-                "reference": "e5534d4ab8e80c159553d507e358ed20a806d3bf",
+                "url": "https://api.github.com/repos/components/jquery/zipball/459648cda77875519c5da3ae1dd0ed5d170aa649",
+                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649",
                 "shasum": ""
             },
             "type": "component",
@@ -479,7 +479,7 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
-            "time": "2017-03-21 07:01:49"
+            "time": "2018-03-04 13:23:48"
         },
         {
             "name": "components/jqueryui",
@@ -916,6 +916,16 @@
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
             "time": "2014-07-10 12:27:19"
         },
+        {
+            "name": "ludo/jquery-treetable",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ludo/jquery-treetable.git",
+                "reference": "73690a9df26dbc1a49981f9335df2a9cd9808813"
+            },
+            "type": "library"
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.5.0",
@@ -1016,17 +1026,17 @@
         },
         {
             "name": "ml/json-ld",
-            "version": "1.0.7",
+            "version": "1.0.8",
             "target-dir": "ML/JsonLD",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91"
+                "reference": "da8efc590273f0420e79cb110778508875690bde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91",
-                "reference": "f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/da8efc590273f0420e79cb110778508875690bde",
+                "reference": "da8efc590273f0420e79cb110778508875690bde",
                 "shasum": ""
             },
             "require": {
@@ -1035,7 +1045,8 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "json-ld/tests": "@dev"
+                "json-ld/tests": "1.0",
+                "phpunit/phpunit": "^4"
             },
             "type": "library",
             "autoload": {
@@ -1061,20 +1072,20 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2016-10-10 08:57:56"
+            "time": "2018-01-28 12:53:52"
         },
         {
             "name": "mottie/tablesorter",
-            "version": "v2.29.4",
+            "version": "v2.30.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Mottie/tablesorter.git",
-                "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8"
+                "reference": "c74a34b070002776133757faa5b8613988b42470"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/bf7339036ce11c91f55281825b1b601d18b67ed8",
-                "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8",
+                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/c74a34b070002776133757faa5b8613988b42470",
+                "reference": "c74a34b070002776133757faa5b8613988b42470",
                 "shasum": ""
             },
             "require": {
@@ -1112,7 +1123,7 @@
                 "sorting",
                 "table"
             ],
-            "time": "2018-01-18 23:30:03"
+            "time": "2018-03-19 12:17:24"
         },
         {
             "name": "netcarver/textile",
@@ -1590,16 +1601,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.33",
+            "version": "v2.8.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe"
+                "reference": "7f78892d900c72a40acd1fe793c856ef0c110f26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
-                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
+                "url": "https://api.github.com/repos/symfony/console/zipball/7f78892d900c72a40acd1fe793c856ef0c110f26",
+                "reference": "7f78892d900c72a40acd1fe793c856ef0c110f26",
                 "shasum": ""
             },
             "require": {
@@ -1647,7 +1658,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03 07:36:31"
+            "time": "2018-04-03 05:20:27"
         },
         {
             "name": "symfony/debug",
@@ -1708,16 +1719,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
                 "shasum": ""
             },
             "require": {
@@ -1729,7 +1740,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -1763,11 +1774,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11 12:05:26"
+            "time": "2018-01-30 19:27:44"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.33",
+            "version": "v2.8.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -1827,16 +1838,16 @@
         },
         {
             "name": "tinymce/tinymce",
-            "version": "4.7.5",
+            "version": "4.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tinymce/tinymce-dist.git",
-                "reference": "256a571d890d4e15da618019994f072cd43209bc"
+                "reference": "a7178e20d6053b92a177900531ffd2cdcb77f77c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/256a571d890d4e15da618019994f072cd43209bc",
-                "reference": "256a571d890d4e15da618019994f072cd43209bc",
+                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/a7178e20d6053b92a177900531ffd2cdcb77f77c",
+                "reference": "a7178e20d6053b92a177900531ffd2cdcb77f77c",
                 "shasum": ""
             },
             "type": "component",
@@ -1857,7 +1868,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-2.1"
+                "LGPL-2.1-only"
             ],
             "description": "Web based JavaScript HTML WYSIWYG editor control.",
             "homepage": "http://www.tinymce.com",
@@ -1869,7 +1880,7 @@
                 "tinymce",
                 "wysiwyg"
             ],
-            "time": "2018-01-22 13:09:23"
+            "time": "2018-04-11 09:26:11"
         },
         {
             "name": "tomazdragar/SimpleCropper",
@@ -1934,16 +1945,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.0",
+            "version": "v1.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
                 "shasum": ""
             },
             "require": {
@@ -1951,8 +1962,8 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~3.3@dev"
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.3"
             },
             "type": "library",
             "extra": {
@@ -1995,7 +2006,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-09-27 18:06:46"
+            "time": "2018-03-20 04:25:58"
         },
         {
             "name": "zetacomponents/base",

From 83a29142b349876ceff5a6edf31890424802573d Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 30 Apr 2018 17:58:48 +0200
Subject: [PATCH 24/44] added jQuery treetable to composer

---
 composer.json | 553 ++++++++++++++++++++++++++------------------------
 composer.lock | 107 +++++-----
 2 files changed, 342 insertions(+), 318 deletions(-)

diff --git a/composer.json b/composer.json
index 8558cbdd5..25d4e3407 100644
--- a/composer.json
+++ b/composer.json
@@ -1,270 +1,283 @@
-{
-	"name": "fh-complete/fhc-core",
-	"type": "app",
-	"description": "FH-Complete Core",
-	"keywords": [
-		"fhc",
-		"fh-complete",
-		"campusmanagement"
-	],
-	"homepage": "https://github.com/FH-Complete/FHC-Core",
-	"license": "GPLv3",
-	"authors": [
-		{
-			"name": "Christian Paminger",
-			"email": "christian.paminger@fhcomplete.org",
-			"homepage": "http://fhcomplete.org"
-		},
-		{
-			"name": "Andreas Österreicher",
-			"email": "oesi@technikum-wien.at",
-			"homepage": "http://fhcomplete.org"
-		}
-	],
-	"support": {
-		"email": "info@fhcomplete.org",
-		"forum": "https://plus.google.com/communities/113278802529782592610",
-		"wiki": "http://wiki.fhcomplete.org/"
-	},
-	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "codeigniter-restserver",
-				"version": "2.6",
-				"dist": {
-					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jsoneditor",
-				"version": "5.5.6",
-				"dist": {
-					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "json-forms",
-				"version": "1.4.0",
-				"dist": {
-					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "borgar/textile-js",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/borgar/textile-js.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "rmariuzzo/jquery-checkboxes",
-				"version": "1.0.7",
-				"source": {
-					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
-					"type": "git",
-					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV1",
-				"version": "1.12.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/jqueryV2",
-				"version": "2.2.4",
-				"dist": {
-					"type": "file",
-					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "fgelinas/timepicker",
-				"version": "0.3.3",
-				"dist": {
-					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "alvaro-prieto/colResizable",
-				"version": "1.6",
-				"dist": {
-					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tapmodo/Jcrop",
-				"version": "2.0.4",
-				"dist": {
-					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery-archive/jquery-metadata",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/jquery-archive/jquery-metadata.git",
-					"type": "git",
-					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tomazdragar/SimpleCropper",
-				"version": "1.0",
-				"source": {
-					"url": "https://github.com/tomazdragar/SimpleCropper.git",
-					"type": "git",
-					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "joeldbirch/superfish",
-				"version": "1.7.9",
-				"dist": {
-					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "jquery/sizzle",
-				"version": "1.0",
-				"dist": {
-					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
-					"type": "zip"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "nicolaskruchten/pivottable",
-				"version": "2.15.0",
-				"source": {
-					"url": "https://github.com/nicolaskruchten/pivottable.git",
-					"type": "git",
-					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
-				"version": "3.3.7",
-				"source": {
-					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		}
-	],
-	"require": {
-		"php": ">=5.4.0",
-
-		"alvaro-prieto/colResizable": "^1.6",
-		"borgar/textile-js": "1.0",
-		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
-		"christianbach/tablesorter": "^1.0",
-
-		"codeigniter/framework": "3.*",
-		"codeigniter-restserver": "2.6",
-
-		"components/jquery": "^3.2",
-		"components/jqueryui": "^1.12",
-		"components/font-awesome": "^4.7",
-		"components/angular.js": "1.3.16",
-
-		"easyrdf/easyrdf": "0.9.*",
-		"fgelinas/timepicker": "^0.3.3",
-		"fzaninotto/faker": "1.*",
-		"joeldbirch/superfish": "^1.7",
-
-		"jquery/jqueryV1": "^1.12",
-		"jquery/jqueryV2": "^2.2",
-		"jquery/sizzle": "^1.0",
-
-		"jquery-archive/jquery-metadata": "^1.0",
-
-		"json-forms": "1.4.0",
-		"jsoneditor": "5.5.6",
-		"kingsquare/json-schema-form": "*",
-		"michelf/php-markdown": "1.5.0",
-		"ml/json-ld": "1.*",
-		"mottie/tablesorter": "^2.29",
-		"netcarver/textile": "^3.5",
-		"nicolaskruchten/pivottable": "^2.15.0",
-		"rmariuzzo/jquery-checkboxes": "1.0.7",
-
-		"rougin/combustor": "1.1.*",
-		"rougin/refinery": "*",
-
-		"tapmodo/Jcrop": "^2.0",
-		"tinymce/tinymce": "4.*",
-		"tomazdragar/SimpleCropper": "^1.0",
-		"twbs/bootstrap": "^3.3",
-
-		"zetacomponents/workflow": "1.*",
-		"zetacomponents/document": "1.*",
-		"zetacomponents/workflow-database-tiein": "1.*",
-		"zetacomponents/workflow-event-log-tiein": "1.*"
-	},
-	"require-dev": {
-		"squizlabs/php_codesniffer": "2.*"
-	},
-	"config": {
-		"bin-dir": "vendor/bin"
-	}
-}
-
+{
+	"name": "fh-complete/fhc-core",
+	"type": "app",
+	"description": "FH-Complete Core",
+	"keywords": [
+		"fhc",
+		"fh-complete",
+		"campusmanagement"
+	],
+	"homepage": "https://github.com/FH-Complete/FHC-Core",
+	"license": "GPLv3",
+	"authors": [
+		{
+			"name": "Christian Paminger",
+			"email": "christian.paminger@fhcomplete.org",
+			"homepage": "http://fhcomplete.org"
+		},
+		{
+			"name": "Andreas Österreicher",
+			"email": "oesi@technikum-wien.at",
+			"homepage": "http://fhcomplete.org"
+		}
+	],
+	"support": {
+		"email": "info@fhcomplete.org",
+		"forum": "https://plus.google.com/communities/113278802529782592610",
+		"wiki": "http://wiki.fhcomplete.org/"
+	},
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "codeigniter-restserver",
+				"version": "2.6",
+				"dist": {
+					"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jsoneditor",
+				"version": "5.5.6",
+				"dist": {
+					"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "json-forms",
+				"version": "1.4.0",
+				"dist": {
+					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "borgar/textile-js",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/borgar/textile-js.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "rmariuzzo/jquery-checkboxes",
+				"version": "1.0.7",
+				"source": {
+					"url": "https://github.com/rmariuzzo/checkboxes.js.git",
+					"type": "git",
+					"reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV1",
+				"version": "1.12.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-1.12.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/jqueryV2",
+				"version": "2.2.4",
+				"dist": {
+					"type": "file",
+					"url": "https://code.jquery.com/jquery-2.2.4.min.js"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "fgelinas/timepicker",
+				"version": "0.3.3",
+				"dist": {
+					"url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "alvaro-prieto/colResizable",
+				"version": "1.6",
+				"dist": {
+					"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tapmodo/Jcrop",
+				"version": "2.0.4",
+				"dist": {
+					"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery-archive/jquery-metadata",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/jquery-archive/jquery-metadata.git",
+					"type": "git",
+					"reference": "e5a9e4315675bf4d68716872ca754e858088f8ab"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "tomazdragar/SimpleCropper",
+				"version": "1.0",
+				"source": {
+					"url": "https://github.com/tomazdragar/SimpleCropper.git",
+					"type": "git",
+					"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "joeldbirch/superfish",
+				"version": "1.7.9",
+				"dist": {
+					"url": "https://github.com/joeldbirch/superfish/archive/v1.7.9.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "jquery/sizzle",
+				"version": "1.0",
+				"dist": {
+					"url": "https://github.com/jquery/sizzle/archive/1.0.0.zip",
+					"type": "zip"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "nicolaskruchten/pivottable",
+				"version": "2.15.0",
+				"source": {
+					"url": "https://github.com/nicolaskruchten/pivottable.git",
+					"type": "git",
+					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
+				"version": "3.3.7",
+				"source": {
+					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
+					"type": "git",
+					"reference": "e85ee3814ba12b7095024d31424cc9d19d791d05"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "ludo/jquery-treetable",
+				"version": "3.2.0",
+				"source": {
+					"url": "https://github.com/ludo/jquery-treetable.git",
+					"type": "git",
+					"reference": "73690a9df26dbc1a49981f9335df2a9cd9808813"
+				}
+			}
+		}
+	],
+	"require": {
+		"php": ">=5.4.0",
+
+		"alvaro-prieto/colResizable": "^1.6",
+		"borgar/textile-js": "1.0",
+		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
+		"christianbach/tablesorter": "^1.0",
+
+		"codeigniter/framework": "3.*",
+		"codeigniter-restserver": "2.6",
+
+		"components/jquery": "^3.2",
+		"components/jqueryui": "^1.12",
+		"components/font-awesome": "^4.7",
+		"components/angular.js": "1.3.16",
+
+		"easyrdf/easyrdf": "0.9.*",
+		"fgelinas/timepicker": "^0.3.3",
+		"fzaninotto/faker": "1.*",
+		"joeldbirch/superfish": "^1.7",
+
+		"jquery/jqueryV1": "^1.12",
+		"jquery/jqueryV2": "^2.2",
+		"jquery/sizzle": "^1.0",
+
+		"jquery-archive/jquery-metadata": "^1.0",
+
+		"json-forms": "1.4.0",
+		"jsoneditor": "5.5.6",
+		"kingsquare/json-schema-form": "*",
+		"ludo/jquery-treetable": "^3.2",
+		"michelf/php-markdown": "1.5.0",
+		"ml/json-ld": "1.*",
+		"mottie/tablesorter": "^2.29",
+		"netcarver/textile": "^3.5",
+		"nicolaskruchten/pivottable": "^2.15.0",
+		"rmariuzzo/jquery-checkboxes": "1.0.7",
+
+		"rougin/combustor": "1.1.*",
+		"rougin/refinery": "*",
+
+		"tapmodo/Jcrop": "^2.0",
+		"tinymce/tinymce": "4.*",
+		"tomazdragar/SimpleCropper": "^1.0",
+		"twbs/bootstrap": "^3.3",
+
+		"zetacomponents/workflow": "1.*",
+		"zetacomponents/document": "1.*",
+		"zetacomponents/workflow-database-tiein": "1.*",
+		"zetacomponents/workflow-event-log-tiein": "1.*"
+	},
+	"require-dev": {
+		"squizlabs/php_codesniffer": "2.*"
+	},
+	"config": {
+		"bin-dir": "vendor/bin"
+	}
+}
+
diff --git a/composer.lock b/composer.lock
index 9964729cd..506882e61 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "329973fd68eea79f7c67464cbd121d58",
-    "content-hash": "bf03cef0846a79959456abfccf90730e",
+    "hash": "00d176bc89167feef10405c7457b6d6a",
+    "content-hash": "8cd3ddef525145593a8fe885184ef4cc",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -69,16 +69,16 @@
         },
         {
             "name": "codeigniter/framework",
-            "version": "3.1.7",
+            "version": "3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bcit-ci/CodeIgniter.git",
-                "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312"
+                "reference": "71e647782764184e3aab4faffe6d99176758979f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/02a0518e1c56ba3506f370362ac5ebdb8a138312",
-                "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312",
+                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/71e647782764184e3aab4faffe6d99176758979f",
+                "reference": "71e647782764184e3aab4faffe6d99176758979f",
                 "shasum": ""
             },
             "require": {
@@ -98,7 +98,7 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
-            "time": "2018-01-13 11:57:11"
+            "time": "2018-03-22 14:48:55"
         },
         {
             "name": "components/angular.js",
@@ -441,16 +441,16 @@
         },
         {
             "name": "components/jquery",
-            "version": "3.2.1",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/components/jquery.git",
-                "reference": "e5534d4ab8e80c159553d507e358ed20a806d3bf"
+                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/components/jquery/zipball/e5534d4ab8e80c159553d507e358ed20a806d3bf",
-                "reference": "e5534d4ab8e80c159553d507e358ed20a806d3bf",
+                "url": "https://api.github.com/repos/components/jquery/zipball/459648cda77875519c5da3ae1dd0ed5d170aa649",
+                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649",
                 "shasum": ""
             },
             "type": "component",
@@ -479,7 +479,7 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
-            "time": "2017-03-21 07:01:49"
+            "time": "2018-03-04 13:23:48"
         },
         {
             "name": "components/jqueryui",
@@ -916,6 +916,16 @@
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
             "time": "2014-07-10 12:27:19"
         },
+        {
+            "name": "ludo/jquery-treetable",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ludo/jquery-treetable.git",
+                "reference": "73690a9df26dbc1a49981f9335df2a9cd9808813"
+            },
+            "type": "library"
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.5.0",
@@ -1016,17 +1026,17 @@
         },
         {
             "name": "ml/json-ld",
-            "version": "1.0.7",
+            "version": "1.0.8",
             "target-dir": "ML/JsonLD",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91"
+                "reference": "da8efc590273f0420e79cb110778508875690bde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91",
-                "reference": "f9dfe184f0da9ce0e0ffdddabf6d93d01787ac91",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/da8efc590273f0420e79cb110778508875690bde",
+                "reference": "da8efc590273f0420e79cb110778508875690bde",
                 "shasum": ""
             },
             "require": {
@@ -1035,7 +1045,8 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "json-ld/tests": "@dev"
+                "json-ld/tests": "1.0",
+                "phpunit/phpunit": "^4"
             },
             "type": "library",
             "autoload": {
@@ -1061,20 +1072,20 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2016-10-10 08:57:56"
+            "time": "2018-01-28 12:53:52"
         },
         {
             "name": "mottie/tablesorter",
-            "version": "v2.29.4",
+            "version": "v2.30.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Mottie/tablesorter.git",
-                "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8"
+                "reference": "c74a34b070002776133757faa5b8613988b42470"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/bf7339036ce11c91f55281825b1b601d18b67ed8",
-                "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8",
+                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/c74a34b070002776133757faa5b8613988b42470",
+                "reference": "c74a34b070002776133757faa5b8613988b42470",
                 "shasum": ""
             },
             "require": {
@@ -1112,7 +1123,7 @@
                 "sorting",
                 "table"
             ],
-            "time": "2018-01-18 23:30:03"
+            "time": "2018-03-19 12:17:24"
         },
         {
             "name": "netcarver/textile",
@@ -1590,16 +1601,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.33",
+            "version": "v2.8.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe"
+                "reference": "7f78892d900c72a40acd1fe793c856ef0c110f26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
-                "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
+                "url": "https://api.github.com/repos/symfony/console/zipball/7f78892d900c72a40acd1fe793c856ef0c110f26",
+                "reference": "7f78892d900c72a40acd1fe793c856ef0c110f26",
                 "shasum": ""
             },
             "require": {
@@ -1647,7 +1658,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03 07:36:31"
+            "time": "2018-04-03 05:20:27"
         },
         {
             "name": "symfony/debug",
@@ -1708,16 +1719,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
                 "shasum": ""
             },
             "require": {
@@ -1729,7 +1740,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -1763,11 +1774,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11 12:05:26"
+            "time": "2018-01-30 19:27:44"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.33",
+            "version": "v2.8.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -1827,16 +1838,16 @@
         },
         {
             "name": "tinymce/tinymce",
-            "version": "4.7.5",
+            "version": "4.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tinymce/tinymce-dist.git",
-                "reference": "256a571d890d4e15da618019994f072cd43209bc"
+                "reference": "a7178e20d6053b92a177900531ffd2cdcb77f77c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/256a571d890d4e15da618019994f072cd43209bc",
-                "reference": "256a571d890d4e15da618019994f072cd43209bc",
+                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/a7178e20d6053b92a177900531ffd2cdcb77f77c",
+                "reference": "a7178e20d6053b92a177900531ffd2cdcb77f77c",
                 "shasum": ""
             },
             "type": "component",
@@ -1857,7 +1868,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-2.1"
+                "LGPL-2.1-only"
             ],
             "description": "Web based JavaScript HTML WYSIWYG editor control.",
             "homepage": "http://www.tinymce.com",
@@ -1869,7 +1880,7 @@
                 "tinymce",
                 "wysiwyg"
             ],
-            "time": "2018-01-22 13:09:23"
+            "time": "2018-04-11 09:26:11"
         },
         {
             "name": "tomazdragar/SimpleCropper",
@@ -1934,16 +1945,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.0",
+            "version": "v1.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
                 "shasum": ""
             },
             "require": {
@@ -1951,8 +1962,8 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~3.3@dev"
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.3"
             },
             "type": "library",
             "extra": {
@@ -1995,7 +2006,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-09-27 18:06:46"
+            "time": "2018-03-20 04:25:58"
         },
         {
             "name": "zetacomponents/base",

From 47e7742b4e00cb2490015d5f09bd515fb0ad01a7 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Wed, 2 May 2018 12:15:28 +0200
Subject: [PATCH 25/44] BugFix

Berechtigungsproblem bei Funktion getAllOe()
---
 include/lehrveranstaltung.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 0baa14a48..4021fab85 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -2378,7 +2378,7 @@ class lehrveranstaltung extends basis_db
 
 		if(!in_array($stg->oe_kurzbz, $oe))
 		{
-			$oe[] = $this->oe_kurzbz;
+			$oe[] = $stg->oe_kurzbz;
 		}
 
 		return $oe;

From c4baa454aa5f101f993a060e39fff0242df8a809 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 3 May 2018 12:26:50 +0200
Subject: [PATCH 26/44] Added comment to application/helpers/fhc_helper.php

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

diff --git a/application/helpers/fhc_helper.php b/application/helpers/fhc_helper.php
index 549247754..0db246441 100644
--- a/application/helpers/fhc_helper.php
+++ b/application/helpers/fhc_helper.php
@@ -69,7 +69,7 @@ function generateToken($length = 64)
 function var_dump_to_error_log($parameter)
 {
 	ob_start();
-	var_dump($parameter);
+	var_dump($parameter); // KEEP IT!!!
 	$ob_get_contents = ob_get_contents();
 	ob_end_clean();
 	error_log(str_replace("\n", '', $ob_get_contents));

From 4e90523cccdb036b2756ade036cccb4714759fef Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 3 May 2018 12:31:56 +0200
Subject: [PATCH 27/44] Removed var_dumps and error_logs where not needed or
 placed a comment where they are needed

---
 application/controllers/DBTools.php     | 1 -
 application/helpers/fhc_helper.php      | 3 +--
 application/widgets/mimetype_widget.php | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/DBTools.php b/application/controllers/DBTools.php
index 8590c2285..ee5d8e363 100644
--- a/application/controllers/DBTools.php
+++ b/application/controllers/DBTools.php
@@ -391,7 +391,6 @@ class DBTools extends FHC_Controller
 			// **** Permission ****
 			// ToDo: Check Persmissions in the bottom of this file
 			case 'permissions':
-				//var_dump($this->config->item('fhc_acl'));
 				echo ' Permissions!';
 				//$this->config->load('roles');
 				foreach ($this->config->item('fhc_acl') as $b)
diff --git a/application/helpers/fhc_helper.php b/application/helpers/fhc_helper.php
index 0db246441..19326e4df 100644
--- a/application/helpers/fhc_helper.php
+++ b/application/helpers/fhc_helper.php
@@ -62,7 +62,6 @@ function generateToken($length = 64)
 }
 
 /**
- * var_dump_to_error_log()
  * Gets the output of the var_dump function and print it out
  * via the error log. It also removes the end line characters
  */
@@ -72,7 +71,7 @@ function var_dump_to_error_log($parameter)
 	var_dump($parameter); // KEEP IT!!!
 	$ob_get_contents = ob_get_contents();
 	ob_end_clean();
-	error_log(str_replace("\n", '', $ob_get_contents));
+	error_log(str_replace("\n", '', $ob_get_contents)); // KEEP IT!!!
 }
 
 /**
diff --git a/application/widgets/mimetype_widget.php b/application/widgets/mimetype_widget.php
index 82fd394fb..fbb69119b 100644
--- a/application/widgets/mimetype_widget.php
+++ b/application/widgets/mimetype_widget.php
@@ -11,7 +11,7 @@ class mimetype_widget extends Widget
 				$data['mimetype'] = '';
 		$this->load->model('system/Vorlage_model');
 		$res = $this->Vorlage_model->getMimeTypes();
-		//var_dump($res);
+
 		foreach ($res->retval as $obj)
 		{
 			$item = array('name' => $obj->mimetype, 'value' => $obj->mimetype);

From dba08d4d9e52cc6a52c616b22a5097ba9d1f749f Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 3 May 2018 12:33:01 +0200
Subject: [PATCH 28/44] - Added the feature to the Infocenter controller to
 generate a unique identifier for each call of itself, and to keep using the
 identifier for the next calls in the same browser/tab - Added the feature to
 the FilterWidget to use this identifier to create a different session for
 each FilterWidget

---
 application/controllers/system/Filters.php    | 182 +++++++++++-------
 .../system/infocenter/InfoCenter.php          |  56 ++++--
 .../views/system/infocenter/infocenter.php    |   2 +-
 .../system/infocenter/infocenterData.php      |   1 +
 .../infocenter/infocenterFreigegeben.php      |  11 +-
 application/views/widgets/filter/filter.php   |   3 +-
 .../views/widgets/filter/saveFilter.php       |   3 +-
 .../views/widgets/filter/selectFields.php     |  13 +-
 .../views/widgets/filter/selectFilters.php    |  13 +-
 .../views/widgets/filter/tableDataset.php     |   4 +-
 application/widgets/FilterWidget.php          |  76 ++++++--
 .../js/infocenter/infocenterPersonDataset.js  |  35 +++-
 12 files changed, 277 insertions(+), 122 deletions(-)

diff --git a/application/controllers/system/Filters.php b/application/controllers/system/Filters.php
index cda080a46..738799747 100644
--- a/application/controllers/system/Filters.php
+++ b/application/controllers/system/Filters.php
@@ -7,7 +7,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Filters extends VileSci_Controller
 {
-	const SESSION_NAME = 'FILTER';
+	const SESSION_NAME = 'FHC_FILTER_WIDGET';
 
 	const SELECTED_FIELDS = 'selectedFields';
 	const SELECTED_FILTERS = 'selectedFilters';
@@ -37,11 +37,13 @@ class Filters extends VileSci_Controller
 	{
 		$json = new stdClass();
 
-		$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
-		$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
-		$json->additionalColumns = $_SESSION[self::SESSION_NAME]['additionalColumns'];
-		$json->checkboxes = $_SESSION[self::SESSION_NAME]['checkboxes'];
-		$json->dataset = $_SESSION[self::SESSION_NAME]['dataset'];
+		$session = $this->_readSession($this->input->get('fhc_controller_id'));
+
+		$json->selectedFields = $session['selectedFields'];
+		$json->columnsAliases = $session['columnsAliases'];
+		$json->additionalColumns = $session['additionalColumns'];
+		$json->checkboxes = $session['checkboxes'];
+		$json->dataset = $session['dataset'];
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
@@ -53,11 +55,13 @@ class Filters extends VileSci_Controller
 	{
 		$json = new stdClass();
 
-		$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
-		$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+		$session = $this->_readSession($this->input->get('fhc_controller_id'));
 
-		$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
-		$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+		$json->allSelectedFields = $session['allSelectedFields'];
+		$json->allColumnsAliases = $session['allColumnsAliases'];
+
+		$json->selectedFields = $session['selectedFields'];
+		$json->columnsAliases = $session['columnsAliases'];
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
@@ -68,14 +72,17 @@ class Filters extends VileSci_Controller
 	public function sortSelectedFields()
 	{
 		$selectedFieldsLst = $this->input->post('selectedFieldsLst');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
 		$json = new stdClass();
 
-		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
-		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+		$session = $this->_readSession($fhc_controller_id);
 
-		$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
-		$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+		$allSelectedFields = $session['allSelectedFields'];
+		$allColumnsAliases = $session['allColumnsAliases'];
+
+		$json->selectedFields = $session['selectedFields'];
+		$json->columnsAliases = $session['columnsAliases'];
 
 		if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
 		{
@@ -98,8 +105,8 @@ class Filters extends VileSci_Controller
 			}
 		}
 
-		$_SESSION[self::SESSION_NAME]['selectedFields'] = $json->selectedFields;
-		$_SESSION[self::SESSION_NAME]['columnsAliases'] = $json->columnsAliases;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $json->selectedFields;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $json->columnsAliases;
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
@@ -111,10 +118,12 @@ class Filters extends VileSci_Controller
 	{
 		$json = new stdClass();
 
-		$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
-		$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+		$session = $this->_readSession($this->input->get('fhc_controller_id'));
 
-		$json->selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
+		$json->allSelectedFields = $session['allSelectedFields'];
+		$json->allColumnsAliases = $session['allColumnsAliases'];
+
+		$json->selectedFilters = $session['selectedFilters'];
 		$json->selectedFiltersAliases = array();
 		$json->selectedFiltersMetaData = array();
 
@@ -122,10 +131,10 @@ class Filters extends VileSci_Controller
 		$json->selectedFiltersActiveFiltersOperation = array();
 		$json->selectedFiltersActiveFiltersOption = array();
 
-		$metaData = $_SESSION[self::SESSION_NAME]['metaData'];
-		$activeFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
-		$activeFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
-		$activeFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
+		$metaData = $session['metaData'];
+		$activeFilters = $session['activeFilters'];
+		$activeFiltersOperation = $session['activeFiltersOperation'];
+		$activeFiltersOption = $session['activeFiltersOption'];
 
 		for ($i = 0; $i < count($json->selectedFilters); $i++)
 		{
@@ -166,7 +175,7 @@ class Filters extends VileSci_Controller
 	 */
 	public function saveFilter()
 	{
-		$this->_saveFilter($this->input->post("customFilterDescription"));
+		$this->_saveFilter($this->input->post("customFilterDescription"), $this->input->post("fhc_controller_id"));
 
 		$this->output->set_content_type('application/json')->set_output(json_encode('Tutto bene!!!'));
 	}
@@ -174,11 +183,11 @@ class Filters extends VileSci_Controller
 	/**
 	 *
 	 */
-	private function _saveFilter($customFilterDescription)
+	private function _saveFilter($customFilterDescription, $fhc_controller_id)
 	{
 		$objToBeSaved = new stdClass();
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession($fhc_controller_id);
 
 		$objToBeSaved->name = $customFilterDescription;
 
@@ -231,8 +240,8 @@ class Filters extends VileSci_Controller
 		$personId = $resultBenutzer->retval[0]->person_id;
 
 		$result = $this->FiltersModel->loadWhere(array(
-			'app' => $_SESSION[self::SESSION_NAME]['app'],
-			'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
+			'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
+			'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
 			'description' => $descPGArray,
 			'person_id' => $personId
 		));
@@ -241,8 +250,8 @@ class Filters extends VileSci_Controller
 		{
 			$this->FiltersModel->update(
 				array(
-					'app' => $_SESSION[self::SESSION_NAME]['app'],
-					'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
+					'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
+					'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
 					'description' => $descPGArray,
 					'person_id' => $personId
 				),
@@ -254,8 +263,8 @@ class Filters extends VileSci_Controller
 		else
 		{
 			$this->FiltersModel->insert(array(
-				'app' => $_SESSION[self::SESSION_NAME]['app'],
-				'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
+				'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
+				'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
 				'filter_kurzbz' => uniqid($personId, true),
 				'person_id' => $personId,
 				'description' => $descPGArray,
@@ -273,12 +282,13 @@ class Filters extends VileSci_Controller
 	public function deleteCustomFilter()
 	{
 		$filter_id = $this->input->post('filter_id');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
 		if (is_numeric($filter_id))
 		{
 			$this->FiltersModel->deleteCustomFilter($filter_id);
 
-			$this->output->set_content_type('application/json')->set_output(json_encode('Tutto bene!!!'));
+			$this->output->set_content_type('application/json')->set_output(json_encode('Removed'));
 		}
 	}
 
@@ -288,12 +298,15 @@ class Filters extends VileSci_Controller
 	public function removeSelectedFields()
 	{
 		$fieldName = $this->input->post('fieldName');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
-		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
-		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+		$session = $this->_readSession($fhc_controller_id);
 
-		$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
-		$columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+		$allSelectedFields = $session['allSelectedFields'];
+		$allColumnsAliases = $session['allColumnsAliases'];
+
+		$selectedFields = $session['selectedFields'];
+		$columnsAliases = $session['columnsAliases'];
 
 		if (($pos = array_search($fieldName, $selectedFields)) !== false)
 		{
@@ -305,8 +318,8 @@ class Filters extends VileSci_Controller
 			}
 		}
 
-		$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;
-		$_SESSION[self::SESSION_NAME]['columnsAliases'] = $columnsAliases;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $selectedFields;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $columnsAliases;
 
 		$json = new stdClass();
 
@@ -324,11 +337,14 @@ class Filters extends VileSci_Controller
 	public function removeSelectedFilters()
 	{
 		$fieldName = $this->input->post('fieldName');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
-		$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
-		$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
-		$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
-		$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
+		$session = $this->_readSession($fhc_controller_id);
+
+		$selectedFilters = $session['selectedFilters'];
+		$selectedFiltersActiveFilters = $session['activeFilters'];
+		$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
+		$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
 
 		if (($pos = array_search($fieldName, $selectedFilters)) !== false)
 		{
@@ -338,10 +354,10 @@ class Filters extends VileSci_Controller
 			array_splice($selectedFiltersActiveFiltersOption, $pos, 1);
 		}
 
-		$_SESSION[self::SESSION_NAME]['selectedFilters'] = $selectedFilters;
-		$_SESSION[self::SESSION_NAME]['activeFilters'] = $selectedFiltersActiveFilters;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFilters'] = $selectedFilters;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $selectedFiltersActiveFilters;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
 
 		$json = new stdClass();
 
@@ -359,12 +375,15 @@ class Filters extends VileSci_Controller
 	public function addSelectedFields()
 	{
 		$fieldName = $this->input->post('fieldName');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
-		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
-		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+		$session = $this->_readSession($fhc_controller_id);
 
-		$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
-		$columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+		$allSelectedFields = $session['allSelectedFields'];
+		$allColumnsAliases = $session['allColumnsAliases'];
+
+		$selectedFields = $session['selectedFields'];
+		$columnsAliases = $session['columnsAliases'];
 
 		if (($pos = array_search($fieldName, $allSelectedFields)) !== false
 			&& array_search($fieldName, $selectedFields) === false)
@@ -377,8 +396,8 @@ class Filters extends VileSci_Controller
 			}
 		}
 
-		$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;
-		$_SESSION[self::SESSION_NAME]['columnsAliases'] = $columnsAliases;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $selectedFields;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $columnsAliases;
 
 		$json = new stdClass();
 
@@ -396,11 +415,14 @@ class Filters extends VileSci_Controller
 	public function addSelectedFilters()
 	{
 		$fieldName = $this->input->post('fieldName');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
 
-		$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
-		$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
-		$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
-		$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
+		$session = $this->_readSession($fhc_controller_id);
+
+		$selectedFilters = $session['selectedFilters'];
+		$selectedFiltersActiveFilters = $session['activeFilters'];
+		$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
+		$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
 
 		if (!in_array($fieldName, $selectedFilters))
 		{
@@ -410,10 +432,10 @@ class Filters extends VileSci_Controller
 			$selectedFiltersActiveFiltersOption[$fieldName] = "";
 		}
 
-		$_SESSION[self::SESSION_NAME]['selectedFilters'] = $selectedFilters;
-		$_SESSION[self::SESSION_NAME]['activeFilters'] = $selectedFiltersActiveFilters;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFilters'] = $selectedFilters;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $selectedFiltersActiveFilters;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
 
 		$json = new stdClass();
 
@@ -434,14 +456,17 @@ class Filters extends VileSci_Controller
 		$filterOperations = $this->input->post('filterOperations');
 		$filterOperationValues = $this->input->post('filterOperationValues');
 		$filterOptions = $this->input->post('filterOptions');
+		$fhc_controller_id = $this->input->post('fhc_controller_id');
+
+		$session = $this->_readSession($fhc_controller_id);
 
 		$activeFilters = array_combine($fieldNames, $filterOperationValues);
 		$activeFiltersOperation = array_combine($fieldNames, $filterOperations);
 		$activeFiltersOption = array_combine($fieldNames, $filterOptions);
 
-		$_SESSION[self::SESSION_NAME]['activeFilters'] = $activeFilters;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $activeFiltersOperation;
-		$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $activeFiltersOption;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $activeFilters;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $activeFiltersOperation;
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $activeFiltersOption;
 
 		$json = new stdClass();
 
@@ -460,7 +485,9 @@ class Filters extends VileSci_Controller
 	{
 		$json = new stdClass();
 
-		$dataset = $_SESSION[self::SESSION_NAME]['dataset'];
+		$session = $this->_readSession($this->input->get('fhc_controller_id'));
+
+		$dataset = $session['dataset'];
 
 		if (is_array($dataset))
 		{
@@ -469,4 +496,29 @@ class Filters extends VileSci_Controller
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
+
+	/**
+	 *
+	 */
+	private function _readSession($fhc_controller_id)
+	{
+		if (isset($_SESSION[self::SESSION_NAME]) && isset($_SESSION[self::SESSION_NAME][$fhc_controller_id]))
+			return $_SESSION[self::SESSION_NAME][$fhc_controller_id];
+
+		return array();
+	}
+
+	/**
+	 *
+	 */
+	private function _writeSession($data, $fhc_controller_id)
+	{
+		if (!isset($_SESSION[self::SESSION_NAME])
+			|| (isset($_SESSION[self::SESSION_NAME]) && !is_array($_SESSION[self::SESSION_NAME])))
+		{
+			$_SESSION[self::SESSION_NAME] = array();
+		}
+
+		$_SESSION[self::SESSION_NAME][$fhc_controller_id] = $data;
+	}
 }
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 86b5d1e8b..7d81cc021 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -80,6 +80,8 @@ class InfoCenter extends VileSci_Controller
 		if(!$this->permissionlib->isBerechtigt('basis/person'))
 			show_error('You have no Permission! You need Infocenter Role');
 
+		$this->_setControllerId(); // sets the controller id
+
 		$this->setNavigationMenuArray(); // sets property navigationMenuArray
     }
 
@@ -91,14 +93,14 @@ class InfoCenter extends VileSci_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('system/infocenter/infocenter.php');
+		$this->load->view('system/infocenter/infocenter.php', array('fhc_controller_id' => $this->fhc_controller_id));
 	}
-	
+
 	public function infocenterFreigegeben()
 	{
-		$this->load->view('system/infocenter/infocenterFreigegeben.php');
+		$this->load->view('system/infocenter/infocenterFreigegeben.php', array('fhc_controller_id' => $this->fhc_controller_id));
 	}
-	
+
 	/**
 	 * Initialization function, gets person and prestudent data and loads the view with the data
 	 * @param $person_id
@@ -132,7 +134,7 @@ class InfoCenter extends VileSci_Controller
 			)
 		);
 	}
-	
+
 	/**
 	 * unlocks page from edit by a person, redirects to overview filter page
 	 * @param $person_id
@@ -362,7 +364,7 @@ class InfoCenter extends VileSci_Controller
 
 		$this->_redirectToStart($prestudent_id, 'ZgvPruef');
 	}
-	
+
 	/**
 	 * Saves a new Notiz for a person
 	 * @param $person_id
@@ -386,7 +388,7 @@ class InfoCenter extends VileSci_Controller
 			->set_content_type('application/json')
 			->set_output(json_encode($result->retval));
 	}
-	
+
 	/**
 	 * Updates a new Notiz for a person
 	 * @param int $notiz_id
@@ -394,7 +396,7 @@ class InfoCenter extends VileSci_Controller
 	 * @return bool true if success
 	 */
 	public function updateNotiz($notiz_id, $person_id)
-	{	
+	{
 		$titel = $this->input->post('notiztitel');
 		$text = $this->input->post('notiz');
 
@@ -408,18 +410,18 @@ class InfoCenter extends VileSci_Controller
 				"updatevon" => $this->uid
 			)
 		);
-		
-		
+
+
 		$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));
@@ -547,7 +549,7 @@ class InfoCenter extends VileSci_Controller
 				'children' => array()
 			)
 		);
-				
+
 		$this->_fillFilters($listFiltersSent, $filtersarray['abgeschickt']);
 		$this->_fillFilters($listFiltersNotSent, $filtersarray['nichtabgeschickt']);
 
@@ -593,9 +595,10 @@ class InfoCenter extends VileSci_Controller
 	{
 		foreach ($filters as $filterId => $description)
 		{
-			$toPrint = "%s=%s";
+			$toPrint = "%s?%s=%s&%s=%s";
+
 			$tofill['children'][] = array(
-				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
+				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId, 'fhc_controller_id', $this->fhc_controller_id),
 				'description' => $description
 			);
 		}
@@ -605,10 +608,10 @@ class InfoCenter extends VileSci_Controller
 	{
 		foreach ($filters as $filterId => $description)
 		{
-			$toPrint = "%s=%s";
+			$toPrint = "%s?%s=%s&%s=%s";
 
 			$tofill['children'][] = array(
-				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
+				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId, 'fhc_controller_id', $this->fhc_controller_id),
 				'description' => $description,
 				'subscriptDescription' => 'Remove',
 				'subscriptLinkClass' => 'remove-filter',
@@ -956,4 +959,21 @@ class InfoCenter extends VileSci_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;
+	}
 }
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 5963f77ca..1ecfe31f7 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -29,7 +29,7 @@
 				</div>
 				<div>
 					<?php
-						$this->load->view('system/infocenter/infocenterData.php');
+						$this->load->view('system/infocenter/infocenterData.php', array('fhc_controller_id' => $fhc_controller_id));
 					?>
 				</div>
 			</div>
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 311dd647b..2d9d30cf2 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -186,6 +186,7 @@
 				)
 			ORDER BY "LastAction" ASC
 		',
+		'fhc_controller_id' => $fhc_controller_id,
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
 		'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation', 'Letzte Aktion','Letzter Bearbeiter',
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
index bc9d9f305..66e5b5c8b 100644
--- a/application/views/system/infocenter/infocenterFreigegeben.php
+++ b/application/views/system/infocenter/infocenterFreigegeben.php
@@ -146,7 +146,7 @@
 											JOIN public.tbl_studiengang USING(studiengang_kz)
 										WHERE
 											person_id=p.person_id
-											AND tbl_studiengang.typ in(\'b\')  
+											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
@@ -170,8 +170,7 @@
 									)
 								ORDER BY "LastAction" ASC
 							',
-							'hideHeader' => false,
-							'hideSave' => false,
+							'fhc_controller_id' => $fhc_controller_id,
 							'checkboxes' => 'PersonId',
 							'additionalColumns' => array('Details'),
 							'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation','Letzte Aktion','Letzter Bearbeiter',
@@ -238,9 +237,9 @@
 							}
 						);
 
-					
+
 						$filterId = isset($_GET[InfoCenter::FILTER_ID]) ? $_GET[InfoCenter::FILTER_ID] : null;
-						
+
 						if (isset($filterId) && is_numeric($filterId))
 						{
 							$filterWidgetArray[InfoCenter::FILTER_ID] = $filterId;
@@ -251,7 +250,7 @@
 							$filterWidgetArray['datasetName'] = 'PersonActions';
 							$filterWidgetArray['filterKurzbz'] = 'InfoCenterNotSentApplicationAll';
 						}
-						
+
 						echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
 					?>
 
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index d368cc6e1..5fbff4953 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -119,7 +119,8 @@
 				url: "<?php echo site_url('system/Filters/deleteCustomFilter'); ?>",
 				method: "POST",
 				data: {
-					filter_id: $(this).attr('value')
+					filter_id: $(this).attr('value'),
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
index f6b7dc529..ce2d454ca 100644
--- a/application/views/widgets/filter/saveFilter.php
+++ b/application/views/widgets/filter/saveFilter.php
@@ -9,7 +9,8 @@
 					url: "<?php echo site_url('system/Filters/saveFilter'); ?>",
 					method: "POST",
 					data: {
-						customFilterDescription: $("#customFilterDescription").val()
+						customFilterDescription: $("#customFilterDescription").val(),
+						fhc_controller_id: getUrlParameter("fhc_controller_id")
 					}
 				})
 				.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 7613639ff..a011e5555 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -77,7 +77,8 @@
 					url: "<?php echo site_url('system/Filters/sortSelectedFields'); ?>",
 					method: "POST",
 					data: {
-						selectedFieldsLst: arrayDndId
+						selectedFieldsLst: arrayDndId,
+						fhc_controller_id: getUrlParameter("fhc_controller_id")
 					}
 				})
 				.done(function(data, textStatus, jqXHR) {
@@ -109,7 +110,8 @@
 				url: "<?php echo site_url('system/Filters/addSelectedFields'); ?>",
 				method: "POST",
 				data: {
-					fieldName: $(this).val()
+					fieldName: $(this).val(),
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
@@ -131,7 +133,8 @@
 				url: "<?php echo site_url('system/Filters/removeSelectedFields'); ?>",
 				method: "POST",
 				data: {
-					fieldName: $(this).attr('fieldToRemove')
+					fieldName: $(this).attr('fieldToRemove'),
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
@@ -153,7 +156,9 @@
 		$.ajax({
 			url: "<?php echo site_url('system/Filters/selectFields'); ?>",
 			method: "GET",
-			data: {},
+			data: {
+				fhc_controller_id: getUrlParameter("fhc_controller_id")
+			},
 		    dataType: "json"
 		})
 		.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index bca975b13..cf5443069 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -13,7 +13,8 @@
 				url: "<?php echo site_url('system/Filters/addSelectedFilters'); ?>",
 				method: "POST",
 				data: {
-					fieldName: $(this).val()
+					fieldName: $(this).val(),
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
@@ -76,7 +77,8 @@
 					filterNames: selectFilterName,
 					filterOperations: selectFilterOperation,
 					filterOperationValues: selectFilterOperationValue,
-					filterOptions: selectFilterOption
+					filterOptions: selectFilterOption,
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
@@ -100,7 +102,8 @@
 				url: "<?php echo site_url('system/Filters/removeSelectedFilters'); ?>",
 				method: "POST",
 				data: {
-					fieldName: $(this).attr('filterToRemove')
+					fieldName: $(this).attr('filterToRemove'),
+					fhc_controller_id: getUrlParameter("fhc_controller_id")
 				}
 			})
 			.done(function(data, textStatus, jqXHR) {
@@ -199,7 +202,9 @@
 		$.ajax({
 			url: "<?php echo site_url('system/Filters/selectFilters'); ?>",
 			method: "GET",
-			data: {},
+			data: {
+				fhc_controller_id: getUrlParameter("fhc_controller_id")
+			},
 			dataType: "json"
 		})
 		.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/tableDataset.php b/application/views/widgets/filter/tableDataset.php
index f0a3efa27..1a19876f4 100644
--- a/application/views/widgets/filter/tableDataset.php
+++ b/application/views/widgets/filter/tableDataset.php
@@ -21,7 +21,9 @@
 		$.ajax({
 			url: "<?php echo site_url('system/Filters/tableDataset'); ?>",
 			method: "GET",
-			data: {},
+			data: {
+				fhc_controller_id: getUrlParameter("fhc_controller_id")
+			},
 		    dataType: "json"
 		})
 		.done(function(data, textStatus, jqXHR) {
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index 925126a43..1e18b594a 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -29,7 +29,7 @@ class FilterWidget extends Widget
 	const WIDGET_URL_SELECT_FILTERS = 'widgets/filter/selectFilters';
 	const WIDGET_URL_SAVE_FILTER = 'widgets/filter/saveFilter';
 
-	const SESSION_NAME = 'FILTER';
+	const SESSION_NAME = 'FHC_FILTER_WIDGET';
 
 	const ALL_SELECTED_FIELDS = 'allSelectedFields';
 	const ALL_COLUMNS_ALIASES = 'allColumnsAliases';
@@ -109,7 +109,7 @@ class FilterWidget extends Widget
 	public function display($widgetData)
 	{
 		//
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 
 		//
 		if ($this->filterId == null && isset($filterSessionArray[self::FILTER_ID]))
@@ -144,7 +144,7 @@ class FilterWidget extends Widget
 
 		//
 		$selectedFields = array();
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 		if (isset($filterSessionArray[self::SELECTED_FIELDS]))
 		{
 			$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
@@ -195,6 +195,7 @@ class FilterWidget extends Widget
 				$tmpDataset[] = $formattedResult;
 			}
 		}
+
 		$filterSessionArray[self::DATASET_PARAMETER] = $tmpDataset;
 
 		/* ------------------------------------------------------------ */
@@ -204,7 +205,7 @@ class FilterWidget extends Widget
 
 		$filterSessionArray[self::METADATA_PARAMETER] = $this->metaData;
 
-		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+		$this->_writeSession($filterSessionArray);
 
 		//
 		$this->loadViewFilters();
@@ -422,9 +423,11 @@ class FilterWidget extends Widget
 	{
 		$filterSessionArray = array();
 
-		if (isset($_SESSION[self::SESSION_NAME]))
+		$session = $this->_readSession();
+
+		if (count($session) > 0)
 		{
-			$filterSessionArray = $_SESSION[self::SESSION_NAME];
+			$filterSessionArray = $session;
 		}
 
 		if (!isset($filterSessionArray[self::SELECTED_FIELDS]))
@@ -482,7 +485,7 @@ class FilterWidget extends Widget
 			$filterSessionArray[self::DATASET_NAME_PARAMETER] = null;
 		}
 
-		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+		$this->_writeSession($filterSessionArray);
 	}
 
 	/**
@@ -503,6 +506,7 @@ class FilterWidget extends Widget
 		$this->hideSave = false;
 		$this->columnsAliases = null;
 		$this->filterName = null;
+		$this->fhc_controller_id = null;
 
 		if (!is_array($args) || (is_array($args) && count($args) == 0))
 		{
@@ -510,6 +514,15 @@ class FilterWidget extends Widget
 		}
 		else
 		{
+			if (!isset($args['fhc_controller_id']))
+			{
+				show_error('Dude you forgot the fhc_controller_id');
+			}
+			else
+			{
+				$this->fhc_controller_id = $args['fhc_controller_id'];
+			}
+
 			if ((
 					!isset($args[self::APP_PARAMETER])
 					&& !isset($args[self::DATASET_NAME_PARAMETER])
@@ -704,7 +717,7 @@ class FilterWidget extends Widget
 				self::DATASET_NAME_PARAMETER => $filter->retval[0]->dataset_name
 			);
 
-			$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+			$this->_writeSession($filterSessionArray);
 		}
 		else
 		{
@@ -719,7 +732,7 @@ class FilterWidget extends Widget
 				self::DATASET_NAME_PARAMETER => null
 			);
 
-			$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+			$this->_writeSession($filterSessionArray);
 		}
 	}
 
@@ -732,7 +745,7 @@ class FilterWidget extends Widget
 		{
 			$objToBeSaved = new stdClass();
 
-			$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+			$filterSessionArray = $this->_readSession();
 
 			if (isset($filterSessionArray[self::SELECTED_FIELDS]))
 			{
@@ -828,7 +841,7 @@ class FilterWidget extends Widget
 		// Selected fields
 		$selectedFields = array();
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 		if (isset($filterSessionArray[self::SELECTED_FIELDS]))
 		{
 			$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
@@ -844,7 +857,7 @@ class FilterWidget extends Widget
 	{
 		$app = $this->app;
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 		if (isset($filterSessionArray[self::APP_PARAMETER]))
 		{
 			$app = $filterSessionArray[self::APP_PARAMETER];
@@ -860,7 +873,7 @@ class FilterWidget extends Widget
 	{
 		$datasetName = $this->datasetName;
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 		if (isset($filterSessionArray[self::DATASET_NAME_PARAMETER]))
 		{
 			$datasetName = $filterSessionArray[self::DATASET_NAME_PARAMETER];
@@ -877,7 +890,7 @@ class FilterWidget extends Widget
 		$columnsAliases = $this->columnsAliases;
 		$selectedFields = array();
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 
 		if (isset($filterSessionArray[self::SELECTED_FIELDS]))
 		{
@@ -908,7 +921,7 @@ class FilterWidget extends Widget
 		// Selected filters
 		$selectedFilters = array();
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 		if (isset($filterSessionArray[self::SELECTED_FILTERS]))
 		{
 			$selectedFilters = $filterSessionArray[self::SELECTED_FILTERS];
@@ -923,7 +936,7 @@ class FilterWidget extends Widget
 	private function _setActiveFiltersFromPost(&$activeFilters, &$activeFiltersOperation, &$activeFiltersOption)
 	{
 		$selectedFilters = array();
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 
 		if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
 		{
@@ -994,6 +1007,8 @@ class FilterWidget extends Widget
 	 */
 	private function _setSessionFilterData()
 	{
+		$session = $this->_readSession();
+
 		$filterSessionArray = array(
 			self::SELECTED_FIELDS => $this->_getSelectedFieldsFromPost(),
 			self::SELECTED_FILTERS => $this->_getSelectedFiltersFromPost(),
@@ -1016,7 +1031,7 @@ class FilterWidget extends Widget
 		$filterSessionArray[self::FILTER_ID] = $this->filterId;
 		$filterSessionArray[self::FILTER_NAME] = $this->filterName;
 
-		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+		$this->_writeSession(array_merge($session, $filterSessionArray));
 	}
 
 	/**
@@ -1030,7 +1045,7 @@ class FilterWidget extends Widget
 		$activeFiltersOperation = array();
 		$activeFiltersOption = array();
 
-		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		$filterSessionArray = $this->_readSession();
 
 		if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
 		{
@@ -1143,4 +1158,29 @@ class FilterWidget extends Widget
 
 		return $query;
 	}
+
+	/**
+	 *
+	 */
+	private function _readSession()
+	{
+		if (isset($_SESSION[self::SESSION_NAME]) && isset($_SESSION[self::SESSION_NAME][$this->fhc_controller_id]))
+			return $_SESSION[self::SESSION_NAME][$this->fhc_controller_id];
+
+		return array();
+	}
+
+	/**
+	 *
+	 */
+	private function _writeSession($data)
+	{
+		if (!isset($_SESSION[self::SESSION_NAME])
+			|| (isset($_SESSION[self::SESSION_NAME]) && !is_array($_SESSION[self::SESSION_NAME])))
+		{
+			$_SESSION[self::SESSION_NAME] = array();
+		}
+
+		$_SESSION[self::SESSION_NAME][$this->fhc_controller_id] = $data;
+	}
 }
diff --git a/include/js/infocenter/infocenterPersonDataset.js b/include/js/infocenter/infocenterPersonDataset.js
index 8ee342d0a..5cac8933a 100644
--- a/include/js/infocenter/infocenterPersonDataset.js
+++ b/include/js/infocenter/infocenterPersonDataset.js
@@ -48,7 +48,11 @@ function appendTableActionsHtml()
 
 	$.ajax({
 		url: window.location.pathname.replace('infocenter/InfoCenter', 'Filters/rowNumber'),
-		method: "GET"
+		method: "GET",
+		data: {
+			fhc_controller_id: getUrlParameter("fhc_controller_id")
+		},
+		dataType: "json"
 	})
 	.done(function(data, textStatus, jqXHR) {
 
@@ -72,7 +76,9 @@ function appendTableActionsHtml()
 			setTableActions();
 		}
 
-	}).fail(function(jqXHR, textStatus, errorThrown) {});
+	}).fail(function(jqXHR, textStatus, errorThrown) {
+		alert(textStatus);
+	});
 
 }
 
@@ -112,6 +118,27 @@ function setTableActions()
 	);
 }
 
+/**
+ *
+ */
+function getUrlParameter(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];
+        }
+    }
+}
+
 /**
  * Refreshes the side menu
  */
@@ -120,7 +147,9 @@ function refreshSideMenu()
 	$.ajax({
 		url: window.location.pathname+"/setNavigationMenuArray",
 		method: "GET",
-		data: {}
+		data: {
+			fhc_controller_id: getUrlParameter("fhc_controller_id")
+		}
 	})
 	.done(function(data, textStatus, jqXHR) {
 

From a2e109a1eb41537d2f94426e9398e376ae008871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 3 May 2018 13:04:56 +0200
Subject: [PATCH 29/44] Reactivated Freigegeben Page

---
 application/config/navigation.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 6ef2fb803..64397f681 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -5,11 +5,6 @@ $config['navigation_header'] = array(
 		'FH-Complete' => site_url(''),
 		'Vilesci' => base_url('/vilesci'),
 		'CIS' => CIS_ROOT
-	),
-	'system/infocenter/InfoCenter/infocenterFreigegeben' => array(
-		'FH-Complete' => base_url('index.ci.php/'),
-		'Vilesci' => base_url('/vilesci'),
-		'CIS' => CIS_ROOT
 	)
 );
 
@@ -63,13 +58,13 @@ $config['navigation_menu']['Vilesci/index'] = array(
 	)
 );
 
-//HIDDEN as long as filter is revised
-//$config['navigation_menu']['system/infocenter/InfoCenter/index'] = array(
-//	'Freigegeben' => array(
-//		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
-//		'description' => 'Freigegeben',
-//		'icon' => 'thumbs-up'
-//	));
+
+$config['navigation_menu']['system/infocenter/InfoCenter/index'] = array(
+	'Freigegeben' => array(
+		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
+		'description' => 'Freigegeben',
+		'icon' => 'thumbs-up'
+	));
 
 $config['navigation_menu']['system/infocenter/InfoCenter/showDetails'] = array(
 	'Freigegeben' => array(
@@ -84,5 +79,3 @@ $config['navigation_menu']['system/infocenter/InfoCenter/infocenterFreigegeben']
 		'description' => 'Zurück',
 		'icon' => 'angle-left'
 	));
-
-

From 060e6fa8e9bda98d58d72a31c0e227621d3f0d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 3 May 2018 13:05:24 +0200
Subject: [PATCH 30/44] Changed length of Column oe_kurzbz in system.tbl_filter

---
 system/dbupdate_3.3.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 5b5cfe5cb..54b8f6211 100755
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -2218,6 +2218,20 @@ if($result = $db->db_query("SELECT view_definition FROM information_schema.views
 	}
 }
 
+// OE_KURZBZ in system.tbl_filters auf 32 Zeichen verlängert
+if($result = $db->db_query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='system' AND TABLE_NAME='tbl_filters' AND COLUMN_NAME = 'oe_kurzbz' AND character_maximum_length=16"))
+{
+	if($db->db_num_rows($result)>0)
+	{
+		$qry = " ALTER TABLE system.tbl_filters ALTER COLUMN oe_kurzbz TYPE varchar(32)";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_filters '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Spalte oe_kurzbz in system.tbl_filters von varchar(16) auf varchar(32) geändert<br>';
+	}
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 

From e4cdac1acb7a6c4fc5c3bd774932d42184f6ea1b Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Thu, 3 May 2018 13:33:08 +0200
Subject: [PATCH 31/44] moved infocenter and sb admin js and css from include
 to public, get inactive parents/children oe is possible

---
 .../Organisationseinheit_model.php            | 17 ++++++++++-------
 .../views/system/infocenter/infocenter.php    |  4 ++--
 .../system/infocenter/infocenterDetails.php   | 10 +++++-----
 .../infocenter/infocenterFreigegeben.php      |  4 ++--
 application/views/system/messageWrite.php     |  4 ++--
 .../css/sbadmin2}/admintemplate.css           |  1 -
 .../sbadmin2}/admintemplate_contentonly.css   |  0
 .../css/sbadmin2}/tablesort_bootstrap.css     |  0
 {include => public}/js/bootstrapper.js        |  0
 .../js/infocenter/infocenterDetails.js        | 14 --------------
 .../js/infocenter/infocenterPersonDataset.js  | 15 ---------------
 {include => public}/js/tablesort/tablesort.js | 19 -------------------
 12 files changed, 21 insertions(+), 67 deletions(-)
 rename {skin => public/css/sbadmin2}/admintemplate.css (99%)
 rename {skin => public/css/sbadmin2}/admintemplate_contentonly.css (100%)
 rename {skin => public/css/sbadmin2}/tablesort_bootstrap.css (100%)
 rename {include => public}/js/bootstrapper.js (100%)
 rename {include => public}/js/infocenter/infocenterDetails.js (92%)
 rename {include => public}/js/infocenter/infocenterPersonDataset.js (85%)
 rename {include => public}/js/tablesort/tablesort.js (69%)

diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 75791de1b..272204e7e 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -119,15 +119,16 @@ class Organisationseinheit_model extends DB_Model
 	/**
 	 * Liefert die ChildNodes einer Organisationseinheit
 	 * @param $oe_kurzbz
-	 * @return Array mit den Childs inkl dem Uebergebenen Element
+	 * @param bool $includeinactive - wether to include inactive parent oes
+	 * @return array mit den Childs inkl dem Uebergebenen Element
 	 */
-	public function getChilds($oe_kurzbz)
+	public function getChilds($oe_kurzbz, $includeinactive = false)
 	{
 		$query = "
 		WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as 
 		(
 			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit 
-			WHERE oe_kurzbz=?
+			WHERE oe_kurzbz=? %s
 			UNION ALL
 			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes 
 			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
@@ -136,20 +137,22 @@ class Organisationseinheit_model extends DB_Model
 		FROM oes
 		GROUP BY oe_kurzbz;";
 
-		return $this->execQuery($query, array($oe_kurzbz));
+		return $this->execQuery(sprintf($query, $includeinactive === true ? "" :  "AND aktiv = true"), array($oe_kurzbz));
 	}
 
 	/**
 	 * Liefert die OEs die im Tree ueberhalb der uebergebene OE liegen
 	 * @param $oe_kurzbz
+	 * @param bool $includeinactive - wether to include inactive parent oes
+	 * @return array|null
 	 */
-	public function getParents($oe_kurzbz)
+	public function getParents($oe_kurzbz, $includeinactive = false)
 	{
 		$query=
 		"WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as 
 		(
 			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit 
-			WHERE oe_kurzbz=? and aktiv = true 
+			WHERE oe_kurzbz=? %s
 			UNION ALL
 			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes 
 			WHERE o.oe_kurzbz=oes.oe_parent_kurzbz and aktiv = true
@@ -157,7 +160,7 @@ class Organisationseinheit_model extends DB_Model
 		SELECT oe_kurzbz
 		FROM oes";
 
-		return $this->execQuery($query, array($oe_kurzbz));
+		return $this->execQuery(sprintf($query, $includeinactive === true ? "" :  "AND aktiv = true"), array($oe_kurzbz));
 	}
 
 }
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 1ecfe31f7..ab9746a8e 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -9,8 +9,8 @@
 			'fontawesome' => true,
 			'sbadmintemplate' => true,
 			'tablesorter' => true,
-			'customCSSs' => 'skin/tablesort_bootstrap.css',
-			'customJSs' => array('include/js/bootstrapper.js', 'include/js/infocenter/infocenterPersonDataset.js')
+			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);
 ?>
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 147f5d981..7038031a0 100755
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -13,14 +13,14 @@
 			'addons' => true,
 			'customCSSs' =>
 				array(
-					'skin/admintemplate.css',
-					'skin/tablesort_bootstrap.css'
+					'public/css/sbadmin2/admintemplate.css',
+					'public/css/sbadmin2/tablesort_bootstrap.css'
 				),
 			'customJSs' =>
 				array(
-					'include/js/bootstrapper.js',
-					'include/js/tablesort/tablesort.js',
-					'include/js/infocenter/infocenterDetails.js')
+					'public/js/bootstrapper.js',
+					'public/js/tablesort/tablesort.js',
+					'public/js/infocenter/infocenterDetails.js')
 				)
 	);
 ?>
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
index 66e5b5c8b..03da9b718 100644
--- a/application/views/system/infocenter/infocenterFreigegeben.php
+++ b/application/views/system/infocenter/infocenterFreigegeben.php
@@ -9,8 +9,8 @@
 			'fontawesome' => true,
 			'sbadmintemplate' => true,
 			'tablesorter' => true,
-			'customCSSs' => 'skin/tablesort_bootstrap.css',
-			'customJSs' => array('include/js/bootstrapper.js', 'include/js/infocenter/infocenterPersonDataset.js')
+			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);
 ?>
diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php
index 2b15cc12d..3f9ed5254 100644
--- a/application/views/system/messageWrite.php
+++ b/application/views/system/messageWrite.php
@@ -8,8 +8,8 @@ $this->load->view(
 		'fontawesome' => true,
 		'tinymce' => true,
 		'sbadmintemplate' => true,
-		'customCSSs' => 'skin/admintemplate_contentonly.css',
-		'customJSs' => 'include/js/bootstrapper.js'
+		'customCSSs' => 'public/css/sbadmin2/admintemplate_contentonly.css',
+		'customJSs' => 'public/js/bootstrapper.js'
 	)
 );
 ?>
diff --git a/skin/admintemplate.css b/public/css/sbadmin2/admintemplate.css
similarity index 99%
rename from skin/admintemplate.css
rename to public/css/sbadmin2/admintemplate.css
index 5df64ce30..e47fdd3b2 100644
--- a/skin/admintemplate.css
+++ b/public/css/sbadmin2/admintemplate.css
@@ -30,7 +30,6 @@
     /*float: right; */       /* adjust as needed */
     margin: 15px;
     color: grey;         /* adjust as needed */
-
 }
 
 .panel-heading .accordion-toggle.collapsed:before{
diff --git a/skin/admintemplate_contentonly.css b/public/css/sbadmin2/admintemplate_contentonly.css
similarity index 100%
rename from skin/admintemplate_contentonly.css
rename to public/css/sbadmin2/admintemplate_contentonly.css
diff --git a/skin/tablesort_bootstrap.css b/public/css/sbadmin2/tablesort_bootstrap.css
similarity index 100%
rename from skin/tablesort_bootstrap.css
rename to public/css/sbadmin2/tablesort_bootstrap.css
diff --git a/include/js/bootstrapper.js b/public/js/bootstrapper.js
similarity index 100%
rename from include/js/bootstrapper.js
rename to public/js/bootstrapper.js
diff --git a/include/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
similarity index 92%
rename from include/js/infocenter/infocenterDetails.js
rename to public/js/infocenter/infocenterDetails.js
index 0d409fe13..8373c7d4e 100644
--- a/include/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -1,17 +1,3 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 /**
  * javascript file for infocenterDetails page
  */
diff --git a/include/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
similarity index 85%
rename from include/js/infocenter/infocenterPersonDataset.js
rename to public/js/infocenter/infocenterPersonDataset.js
index 5cac8933a..7f99b6fc6 100644
--- a/include/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -1,18 +1,3 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 /**
  * Javascript file for infocenter overview page
  */
diff --git a/include/js/tablesort/tablesort.js b/public/js/tablesort/tablesort.js
similarity index 69%
rename from include/js/tablesort/tablesort.js
rename to public/js/tablesort/tablesort.js
index c1c171959..7ee70a002 100644
--- a/include/js/tablesort/tablesort.js
+++ b/public/js/tablesort/tablesort.js
@@ -1,22 +1,3 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * provides helper functions for adding mottie tablesorter
- * enables easier configuration of the tablesorter by providing a common default configuration
- */
-
 /**
  * adds tablesorter to specified tableid, german date format, default theme
  * @param tableid

From 1550c856f4c7303e454ab609386f65b93cbdb91f Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 3 May 2018 17:25:36 +0200
Subject: [PATCH 32/44] Bugfix: fixed Infocenter details page to be compatible
 with the fhc_controller_id parameter

---
 public/js/infocenter/infocenterDetails.js | 48 +++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
index 8373c7d4e..bb67380af 100644
--- a/public/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -1,7 +1,29 @@
+/**
+ *
+ */
+function getUrlParameter(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];
+        }
+    }
+}
+
+var fhc_controller_id = getUrlParameter("fhc_controller_id");
+
 /**
  * javascript file for infocenterDetails page
  */
-
 $(document).ready(
 	function ()
 	{
@@ -85,7 +107,7 @@ $(document).ready(
 				var personId = $("#hiddenpersonid").val();
 				var notizId = $("#notizform :input[name='hiddenNotizId']").val();
 				var data = $(this).serializeArray();
-				
+
 				if (notizId !== '')
 				{
 					updateNotiz(notizId, personId, data);
@@ -93,24 +115,24 @@ $(document).ready(
 				else
 				{
 					saveNotiz(personId, data);
-				}			
+				}
 			}
 		);
 
-		
+
 		//update notiz - autofill notizform
 		$(document).on("click", "#notiztable tbody tr", function ()
 			{
 				var notizId = $(this).find("td:eq(3)").html();
 				var notizTitle = $(this).find("td:eq(1)").text();
 				var notizContent = this.title;
-				
+
 				$("#notizform label:first").text("Notiz ändern").css("color", "red");
 				$("#notizform :input[type='reset']").css("display", "inline-block");
-				
+
 				$("#notizform :input[name='hiddenNotizId']").val(notizId);
 				$("#notizform :input[name='notiztitel']").val(notizTitle);
-				$("#notizform :input[name='notiz']").val(notizContent);				
+				$("#notizform :input[name='notiz']").val(notizContent);
 			}
 		);
 
@@ -131,7 +153,7 @@ function saveFormalGeprueft(personid, akteid, checked)
 	$.ajax({
 		type: "POST",
 		dataType: "json",
-		url: "../saveFormalGeprueft/" + personid,
+		url: "../saveFormalGeprueft/" + personid + '?fhc_controller_id=' + fhc_controller_id,
 		data: {"akte_id": akteid, "formal_geprueft": checked},
 		success: function (data, textStatus, jqXHR)
 		{
@@ -161,7 +183,7 @@ function zgvUebernehmen(personid, prestudentid, btn)
 	$.ajax({
 		type: "POST",
 		dataType: "json",
-		url: "../getLastPrestudentWithZgvJson/" + personid,
+		url: "../getLastPrestudentWithZgvJson/" + personid + '?fhc_controller_id=' + fhc_controller_id,
 		success: function (data, textStatus, jqXHR)
 		{
 			if (data !== null)
@@ -201,7 +223,7 @@ function saveZgv(data)
 		type: "POST",
 		dataType: "json",
 		data: data,
-		url: "../saveZgvPruefung/" + prestudentid,
+		url: "../saveZgvPruefung/" + prestudentid + '?fhc_controller_id=' + fhc_controller_id,
 		success: function (data, textStatus, jqXHR)
 		{
 			if (data === prestudentid)
@@ -227,7 +249,7 @@ function saveNotiz(personid, data)
 		type: "POST",
 		dataType: "json",
 		data: data,
-		url: "../saveNotiz/" + personid,
+		url: "../saveNotiz/" + personid + '?fhc_controller_id=' + fhc_controller_id,
 		success: function (data, textStatus, jqXHR)
 		{
 			refreshNotizen();
@@ -246,7 +268,7 @@ function updateNotiz(notizId, personId, data)
 		type: "POST",
 		dataType: "json",
 		data: data,
-		url: "../updateNotiz/" + notizId + "/" + personId,
+		url: "../updateNotiz/" + notizId + "/" + personId + '?fhc_controller_id=' + fhc_controller_id,
 		success: function (data, textStatus, jqXHR)
 		{
 			if (data)
@@ -295,7 +317,7 @@ function refreshNotizen()
 			//readd tablesorter
 			formatNotizTable()
 		}
-	);	
+	);
 }
 
 function formatNotizTable()

From c4e83ccc0292fd53dae6e46dd7441bc05be73080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 7 May 2018 15:23:18 +0200
Subject: [PATCH 33/44] Fehler behoben wodurch nicht alle Projekte geladen
 wurden wenn auf den Filter alle geklickt wird

---
 rdf/projekt.rdf.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rdf/projekt.rdf.php b/rdf/projekt.rdf.php
index 8af5bf541..386b50fe5 100644
--- a/rdf/projekt.rdf.php
+++ b/rdf/projekt.rdf.php
@@ -34,7 +34,7 @@ else
 $projekt_obj = new projekt();
 if(isset($_REQUEST['filter']))
 {
-    if($_REQUEST['filter']=='')
+    if($_REQUEST['filter']=='' || $_REQUEST['filter']=='alle')
         $projekt_obj->getProjekte($oe);
     if($_REQUEST['filter']=='aktuell')
         $projekt_obj->getProjekteAktuell(false, $oe);
@@ -68,8 +68,8 @@ for ($i=0;$i<count($projekt_obj->result);$i++)
 		<PROJEKT:ende_iso>'.$projekt->ende.'</PROJEKT:ende_iso>
 		<PROJEKT:ende>'.$datum_obj->formatDatum($projekt->ende,'d.m.Y').'</PROJEKT:ende>
 		<PROJEKT:budget>'.$projekt->budget.'</PROJEKT:budget>
-      <PROJEKT:farbe>'.$projekt->farbe.'</PROJEKT:farbe>
-      <PROJEKT:anzahl_ma>'.$projekt->anzahl_ma.'</PROJEKT:anzahl_ma>
+      <PROJEKT:farbe>'.$projekt->farbe.'</PROJEKT:farbe>
+      <PROJEKT:anzahl_ma>'.$projekt->anzahl_ma.'</PROJEKT:anzahl_ma>
       <PROJEKT:aufwand_pt>'.$projekt->aufwand_pt.'</PROJEKT:aufwand_pt>
       <PROJEKT:aufwandstyp_kurzbz>'.$projekt->aufwandstyp_kurzbz.'</PROJEKT:aufwandstyp_kurzbz>
 	</RDF:Description>'."\n";

From 81473929a32255f910640fc3b5d58f519fb9f06f Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Mon, 7 May 2018 15:52:35 +0200
Subject: [PATCH 34/44] Added primary key to system.tbl_extensions using column
 extension_id

---
 system/dbupdate_3.3.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 54b8f6211..c618b3535 100755
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -795,6 +795,7 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
 	else
 		echo '<br>Created table system.tbl_extensions';
 
+
 	// GRANT SELECT ON TABLE system.tbl_extensions TO web;
 	$qry = 'GRANT SELECT ON TABLE system.tbl_extensions TO web;';
 	if (!$db->db_query($qry))
@@ -845,6 +846,20 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
 		echo '<br>Altered sequence system.tbl_extensions_id_seq';
 }
 
+// Adds primary key to system.tbl_extensions using column extension_id
+if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'pk_extensions_extension_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "ALTER TABLE system.tbl_extensions ADD CONSTRAINT pk_extensions_extension_id PRIMARY KEY (extension_id);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>system.tbl_extensions '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>system.tbl_extensions: added primary key on column extension_id';
+	}
+}
+
 // UNIQUE INDEX uidx_extensions_name_version
 if ($result = $db->db_query("SELECT 0 FROM pg_class WHERE relname = 'uidx_extensions_name_version'"))
 {

From aa278e89f0106948649cde02d1a3f70997b9adc2 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Tue, 8 May 2018 14:13:47 +0200
Subject: [PATCH 35/44] Infocenter details changes: popup for ZGV info, show
 Bewerbungsfriste(n), optimized mobile responsiveness, set dokumente to
 "akzeptiert" when freigegeben

---
 .../system/infocenter/InfoCenter.php          | 62 +++++++++++++++++--
 application/models/crm/Prestudent_model.php   | 24 +++++++
 .../models/crm/Prestudentstatus_model.php     | 36 +++++++++++
 .../views/system/infocenter/stammdaten.php    |  4 +-
 .../system/infocenter/studiengangZgvInfo.php  | 37 +++++++++++
 .../views/system/infocenter/zgvpruefungen.php | 48 ++++++++++----
 public/js/infocenter/infocenterDetails.js     | 18 +++++-
 7 files changed, 210 insertions(+), 19 deletions(-)
 create mode 100644 application/views/system/infocenter/studiengangZgvInfo.php

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 7d81cc021..4bafe591b 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -111,10 +111,11 @@ class InfoCenter extends VileSci_Controller
 			show_error('person id is not numeric!');
 
 		$personexists = $this->PersonModel->load($person_id);
+
 		if(isError($personexists))
 			show_error($personexists->retval);
 
-		if (empty($personexists->retval[0]))
+		if (empty($personexists->retval))
 			show_error('person does not exist!');
 
 		//mark person as locked for editing
@@ -211,6 +212,29 @@ class InfoCenter extends VileSci_Controller
 			->set_output(json_encode($jsonoutput));
 	}
 
+	/**
+	 * Gets Zugangsvoraussetzungen for a prestudents as a description text
+	 * @param $prestudent_id
+	 */
+	public function getZgvInfoForPrestudent($prestudent_id)
+	{
+		$studienordnung = $this->PrestudentstatusModel->getStudienordnungWithZgvText($prestudent_id);
+
+		$prestudentdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+		$studiengangbezeichnung = $prestudentdata['studiengang_bezeichnung'];
+
+		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'data' => null);
+
+		if (hasData($studienordnung))
+		{
+			$data['data'] = $studienordnung->retval[0]->data;
+		}
+
+		$this->load->view('system/infocenter/studiengangZgvInfo.php',
+			$data
+		);
+	}
+
 	/**
 	 * Saves a zgv for a prestudent. includes Ort, Datum, Nation for bachelor and master.
 	 * @param $prestudent_id
@@ -279,7 +303,7 @@ class InfoCenter extends VileSci_Controller
 		}
 
 		//check if still Interessent and not freigegeben yet
-		if ($lastStatus->retval[0]->status_kurzbz === 'Interessent' && !isset($lastStatus->retval[0]->bestaetigtam))
+		if (count($lastStatus->retval) > 0 && $lastStatus->retval[0]->status_kurzbz === 'Interessent' && !isset($lastStatus->retval[0]->bestaetigtam))
 		{
 			$result = $this->PrestudentstatusModel->insert(
 				array(
@@ -327,6 +351,11 @@ class InfoCenter extends VileSci_Controller
 	{
 		$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
+		if (isError($lastStatus))
+		{
+			show_error($lastStatus->retval);
+		}
+
 		if (count($lastStatus->retval) > 0)
 		{
 			$lastStatus = $lastStatus->retval[0];
@@ -354,10 +383,34 @@ class InfoCenter extends VileSci_Controller
 					show_error($result->retval);
 				}
 
-				$this->_sendFreigabeMail($prestudent_id);
+				$this->load->model('crm/dokumentprestudent_model', 'DokumentprestudentModel');
 
 				$logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
 
+				//set documents which have been formal geprüft to accepted
+				$result = $this->AkteModel->loadWhere(array('person_id' => $logdata['person_id'], 'formal_geprueft_amum !=' => NULL));
+
+				if (isError($result))
+				{
+					show_error($result->retval);
+				}
+
+				$dokument_kurzbzs = array();
+
+				foreach ($result->retval as $akte)
+				{
+					$dokument_kurzbzs[] = $akte->dokument_kurzbz;
+				}
+
+				$result = $this->DokumentprestudentModel->setAcceptedDocuments($prestudent_id, $dokument_kurzbzs);
+
+				if (isError($result))
+				{
+					show_error($result->retval);
+				}
+
+				$this->_sendFreigabeMail($prestudent_id);
+
 				$this->_log($logdata['person_id'], 'freigegeben', array($prestudent_id, $logdata['studiengang_kurzbz']));
 			}
 		}
@@ -821,8 +874,9 @@ class InfoCenter extends VileSci_Controller
 
 		$person_id = $prestudent->retval[0]->person_id;
 		$studiengang_kurzbz = $prestudent->retval[0]->studiengang;
+		$studiengang_bezeichnung = $prestudent->retval[0]->studiengangbezeichnung;
 
-		return array('person_id' => $person_id, 'studiengang_kurzbz' => $studiengang_kurzbz);
+		return array('person_id' => $person_id, 'studiengang_kurzbz' => $studiengang_kurzbz, 'studiengang_bezeichnung' => $studiengang_bezeichnung);
 	}
 
 	/**
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 2051c1666..2473099eb 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -229,10 +229,34 @@ class Prestudent_model extends DB_Model
 		{
 			$this->load->model('system/sprache_model', 'SpracheModel');
 			$language = $this->SpracheModel->load($lastStatus->retval[0]->sprache);
+
 			if ($language->error)
 				return error($language->retval);
+
 			if (count($language->retval) > 0)
 				$lastStatus->retval[0]->sprachedetails = $language->retval[0];
+
+			//get Bewerbungsfrist
+			$this->load->model('crm/bewerbungstermine_model', 'BewerbungstermineModel');
+			$this->BewerbungstermineModel->addSelect('ende, nachfrist_ende');
+			$this->BewerbungstermineModel->addOrder('ende', 'DESC');
+			$this->BewerbungstermineModel->addLimit(1);
+			$bewerbungstermin = $this->BewerbungstermineModel->loadWhere(
+				array(
+					'studienplan_id' => $lastStatus->retval[0]->studienplan_id,
+					'studiensemester_kurzbz' => $lastStatus->retval[0]->studiensemester_kurzbz,
+					'studiengang_kz' => $prestudent->retval[0]->studiengang_kz
+				)
+			);
+			if ($bewerbungstermin->error)
+				return error($bewerbungstermin->retval);
+
+			if (count($bewerbungstermin->retval) > 0)
+			{
+				$lastStatus->retval[0]->bewerbungstermin = $bewerbungstermin->retval[0]->ende;
+				$lastStatus->retval[0]->bewerbungsnachfrist = $bewerbungstermin->retval[0]->nachfrist_ende;
+			}
+
 			$prestudent->retval[0]->prestudentstatus = $lastStatus->retval[0];
 		}
 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 27f09289a..f2ba9ee0a 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -119,4 +119,40 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this->execQuery($query, $parametersArray);
 	}
+
+	/**
+	 * Gets Studienordnung for last status of Prestudent
+	 * @param $prestudent_id
+	 * @return array
+	 */
+	public function getStudienordnungWithZgvText($prestudent_id)
+	{
+		$lastStatus = $this->getLastStatus($prestudent_id);
+
+		if ($lastStatus->error)
+		{
+			return error($lastStatus->retval);
+		}
+
+		if (count($lastStatus->retval) > 0)
+		{
+			$lastStatus = $lastStatus->retval[0];
+
+			$this->addJoin('lehre.tbl_studienplan', 'studienplan_id');
+			$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id');
+			$this->addJoin('addon.tbl_stgv_zugangsvoraussetzung', 'studienordnung_id');
+			return $this->loadWhere(
+				array(
+					'public.tbl_prestudentstatus.prestudent_id' => $lastStatus->prestudent_id,
+					'public.tbl_prestudentstatus.status_kurzbz' => $lastStatus->status_kurzbz,
+					'public.tbl_prestudentstatus.studiensemester_kurzbz' => $lastStatus->studiensemester_kurzbz,
+					'public.tbl_prestudentstatus.ausbildungssemester' => $lastStatus->ausbildungssemester
+				)
+			);
+		}
+		else
+		{
+			return sucess(array());
+		}
+	}
 }
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index c3b14bd3e..daf0b7d24 100755
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -91,7 +91,7 @@
 			</tbody>
 		</table>
 		<div class="row">
-			<div class="col-lg-6">
+			<div class="col-xs-6">
 				<form id="sendmsgform" method="post" action="<?php echo $messagelink ?>"
 					  target="_blank">
 					<input type="hidden" name="person_id"
@@ -101,7 +101,7 @@
 				</form>
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
-				<div class="col-lg-6 text-right">
+				<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;Zugang Bewerbung</a>
 				</div>
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
new file mode 100644
index 000000000..92f9d08e1
--- /dev/null
+++ b/application/views/system/infocenter/studiengangZgvInfo.php
@@ -0,0 +1,37 @@
+<?php
+$this->load->view(
+	'templates/FHC-Header',
+	array(
+		'title' => 'ZGV Info',
+		'jquery' => true,
+		'bootstrap' => true,
+		'fontawesome' => true,
+		'sbadmintemplate' => true,
+		'customCSSs' => 'public/css/sbadmin2/admintemplate_contentonly.css'
+	)
+);
+?>
+<body>
+	<div id="wrapper">
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">Zugangsvoraussetzungen <?php echo $studiengang_bezeichnung; ?></h3>
+					</div>
+				</div>
+				<div id="data">
+					<?php if (empty($data)): ?>
+						Keine Zugangsvoraussetzungen für den Studiengang definiert
+						<?php
+					else:
+						echo json_decode($data);
+					endif;
+					?>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 2e98005b8..c8091a5dc 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -9,18 +9,29 @@
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<div class="row">
-					<div class="col-lg-8">
+					<div class="col-xs-7">
 						<h4 class="panel-title">
 							<a data-toggle="collapse"
 							   href="#collapse<?php echo $zgvpruefung->prestudent_id ?>"><?php echo $zgvpruefung->studiengang.' - '.$zgvpruefung->studiengangbezeichnung.' | '.(isset($zgvpruefung->prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : '');
 								?></a>
 						</h4>
 					</div>
-					<?php if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent' && !$infoonly): ?>
-						<div class="col-lg-4 text-right">
+					<?php if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent'/* && !$infoonly*/): ?>
+						<?php if ($infoonly): ?>
+							<?php if (isset($zgvpruefung->prestudentstatus->bestaetigtam)): ?>
+							<div class="col-xs-5 text-right">
+								<i class="fa fa-check" style="color: green"></i>
+								An Studiengang freigegeben
+							</div>
+							<?php endif; ?>
+						<?php else: ?>
+						<div class="col-xs-5 text-right">
 							<?php echo 'Bewerbung abgeschickt: '.(isset($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum) ? '<i class="fa fa-check" style="color:green"></i>' : '<i class="fa fa-times" style="color:red"></i>'); ?>
+							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungsnachfrist) ? ' | Nachfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungsnachfrist), 'd.m.Y') : ''); ?>
+							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungstermin) ? ' | Bewerbungsfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungstermin), 'd.m.Y') : ''); ?>
 						</div>
-					<?php endif ?>
+						<?php endif; ?>
+					<?php endif; ?>
 				</div>
 			</div>
 			<div id="collapse<?php echo $zgvpruefung->prestudent_id ?>"
@@ -70,10 +81,24 @@
 						<div class="row">
 							<div class="col-lg-<?php echo $columns[0] ?>">
 								<div class="form-group">
-									<label>ZGV: </label>
-									<?php if ($infoonly)
-										echo $zgvpruefung->zgv_bez;
-									else
+									<div class="row">
+										<?php if ($infoonly): ?>
+										<div class="col-xs-8">
+										<label>ZGV:</label>
+											<?php echo $zgvpruefung->zgv_bez; ?>
+										</div>
+										<?php else: ?>
+										<div class="col-xs-3">
+											<label>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> ZGV <?php echo $zgvpruefung->studiengang; ?></a>
+										</div>
+									</div>
+									<?php if (!$infoonly)
 										echo $this->widgetlib->widget(
 											'Zgv_widget',
 											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code),
@@ -188,12 +213,12 @@
 						<?php endif; ?>
 						<?php if (!$infoonly): ?>
 							<div class="row">
-								<div class="col-lg-6 text-left">
+								<div class="col-xs-6 text-left">
 									<button type="button" class="btn btn-default zgvUebernehmen" id="zgvUebernehmen_<?php echo $zgvpruefung->prestudent_id ?>">
 										Letzte ZGV &uuml;bernehmen
 									</button>
 								</div>
-								<div class="col-lg-6 text-right">
+								<div class="col-xs-6 text-right">
 									<button type="submit" class="btn btn-default saveZgv" id="zgvSpeichern_<?php echo $zgvpruefung->prestudent_id ?>">
 										Speichern
 									</button>
@@ -331,8 +356,7 @@
 											Interessentenstatus bestätigt und<br/>deren
 											Zgvdaten
 											können im
-											Infocenter nicht mehr bearbeitet oder
-											freigegeben
+											Infocenter nicht mehr bearbeitet
 											werden.
 											<br/>Alle nicht gespeicherten Zgvdaten gehen
 											verloren.
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
index bb67380af..e5c966f7b 100644
--- a/public/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -79,6 +79,14 @@ $(document).ready(
 			}
 		);
 
+		//show popup with zgvinfo
+		$(".zgvinfo").click(function ()
+			{
+				var prestudentid = this.id.substr(this.id.indexOf("_") + 1);
+				openZgvInfoForPrestudent(prestudentid);
+			}
+		);
+
 		//prevent opening modal when Statusgrund not chosen
 		$(".absageModal").on('show.bs.modal', function (e)
 			{
@@ -119,7 +127,6 @@ $(document).ready(
 			}
 		);
 
-
 		//update notiz - autofill notizform
 		$(document).on("click", "#notiztable tbody tr", function ()
 			{
@@ -145,6 +152,15 @@ $(document).ready(
 
 	});
 
+function openZgvInfoForPrestudent(prestudent_id)
+{
+	var screenwidth = screen.width;
+	var popupwidth = 760;
+	var marginleft = screenwidth - popupwidth;
+	console.log(marginleft);
+	window.open("../getZgvInfoForPrestudent/" + prestudent_id, "_blank","resizable=yes,scrollbars=yes,width="+popupwidth+",height="+screen.height+",left="+marginleft);
+}
+
 // -----------------------------------------------------------------------------------------------------------------
 // ajax calls
 

From 8c00fb7be5891537b8a426e99b08c2131faaa670 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Wed, 9 May 2018 12:02:31 +0200
Subject: [PATCH 36/44] Improved the code in fhcauth_helper

---
 application/helpers/fhcauth_helper.php | 39 ++------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

diff --git a/application/helpers/fhcauth_helper.php b/application/helpers/fhcauth_helper.php
index 42fe5889f..da01d62ba 100644
--- a/application/helpers/fhcauth_helper.php
+++ b/application/helpers/fhcauth_helper.php
@@ -60,41 +60,8 @@ if ( ! function_exists('auth'))
 */
 function getAuthUID()
 {
-	$uid = false;
 	$ci =& get_instance(); // get CI instance
-	$ci->load->library('session'); // load session library
+	$ci->load->library('AuthLib'); // load session library
 
-	// If uid hasn't never been set and is present in CI session
-	if ($uid === false && isset($ci->session->uid))
-	{
-		$uid = $ci->session->uid;
-	}
-	else
-	{
-		// Try to check if uid is stored elsewhere
-		if (isset($_SERVER['PHP_AUTH_USER']))
-		{
-			$uid = $_SERVER['PHP_AUTH_USER'];
-		}
-		else if (isset($_SESSION['uid']))
-		{
-			$uid = $_SESSION['uid'];
-		}
-		// Workaround for a strange behavior
-		// Sometimes $_SERVER['PHP_AUTH_USER'] is not set here, but is set when
-		// used by authentication object
-		else
-		{
-			$auth = new authentication();
-			$uid = $auth->getUser();
-		}
-	}
-
-	// If uid is set and uid in CI session is not set
-	if ($uid !== false && !isset($ci->session->uid))
-	{
-		$ci->session->uid = $uid;
-	}
-	
-	return $uid;
-}
\ No newline at end of file
+	return $ci->authlib->getUser();
+}

From 26600dac056ca05cf656c0d2aa0d6a7167db92ed Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Fri, 11 May 2018 14:14:16 +0200
Subject: [PATCH 37/44] added kurzbz to zgv info, optimized responsiveness of
 panel headers, whole notizenrow clickable

---
 .../controllers/system/infocenter/InfoCenter.php   |  3 ++-
 application/views/system/infocenter/notizen.php    |  4 ++--
 .../views/system/infocenter/studiengangZgvInfo.php |  2 +-
 .../views/system/infocenter/zgvpruefungen.php      | 14 ++++++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 4bafe591b..1973b84c5 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -221,9 +221,10 @@ class InfoCenter extends VileSci_Controller
 		$studienordnung = $this->PrestudentstatusModel->getStudienordnungWithZgvText($prestudent_id);
 
 		$prestudentdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+		$studiengangkurzbz = $prestudentdata['studiengang_kurzbz'];
 		$studiengangbezeichnung = $prestudentdata['studiengang_bezeichnung'];
 
-		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'data' => null);
+		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'studiengang_kurzbz' => $studiengangkurzbz, 'data' => null);
 
 		if (hasData($studienordnung))
 		{
diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
index 683a9b3d9..646645ae3 100644
--- a/application/views/system/infocenter/notizen.php
+++ b/application/views/system/infocenter/notizen.php
@@ -9,9 +9,9 @@
 	<tbody>
 	<?php foreach ($notizen as $notiz): ?>	
 		<tr data-toggle="tooltip"
-			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>">		
+			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>" style="cursor: pointer">
 			<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
-			<td style="cursor: pointer"><?php echo html_escape($notiz->titel) ?></td>
+			<td><?php echo html_escape($notiz->titel) ?></td>
 			<td><?php echo $notiz->verfasser_uid ?></td>
 			<td style="display: none"><?php echo $notiz->notiz_id ?></td>
 		</tr>
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
index 92f9d08e1..6242d0db6 100644
--- a/application/views/system/infocenter/studiengangZgvInfo.php
+++ b/application/views/system/infocenter/studiengangZgvInfo.php
@@ -17,7 +17,7 @@ $this->load->view(
 			<div class="container-fluid">
 				<div class="row">
 					<div class="col-lg-12">
-						<h3 class="page-header">Zugangsvoraussetzungen <?php echo $studiengang_bezeichnung; ?></h3>
+						<h3 class="page-header">Zugangsvoraussetzungen <?php echo $studiengang_kurzbz; ?> - <?php echo $studiengang_bezeichnung; ?></h3>
 					</div>
 				</div>
 				<div id="data">
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index c8091a5dc..1a31fc643 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -2,14 +2,20 @@
 	<?php
 	foreach ($zgvpruefungen as $zgvpruefung):
 		$infoonly = $zgvpruefung->infoonly;
-		//set bootstrap columns
+		//set bootstrap columns for zgv form
 		$columns = array(4, 3, 2, 3);
+		$headercolumns = array(7, 5);
+		if (!$infoonly && isset($zgvpruefung->prestudentstatus->bewerbungsnachfrist) && isset($zgvpruefung->prestudentstatus->bewerbungstermin))
+		{
+			$headercolumns[0] = 5;
+			$headercolumns[1] = 7;
+		}
 		?>
 		<br/>
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<div class="row">
-					<div class="col-xs-7">
+					<div class="col-xs-<?php echo $headercolumns[0]; ?>">
 						<h4 class="panel-title">
 							<a data-toggle="collapse"
 							   href="#collapse<?php echo $zgvpruefung->prestudent_id ?>"><?php echo $zgvpruefung->studiengang.' - '.$zgvpruefung->studiengangbezeichnung.' | '.(isset($zgvpruefung->prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : '');
@@ -19,13 +25,13 @@
 					<?php if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent'/* && !$infoonly*/): ?>
 						<?php if ($infoonly): ?>
 							<?php if (isset($zgvpruefung->prestudentstatus->bestaetigtam)): ?>
-							<div class="col-xs-5 text-right">
+							<div class="col-xs-<?php echo $headercolumns[1]; ?> text-right">
 								<i class="fa fa-check" style="color: green"></i>
 								An Studiengang freigegeben
 							</div>
 							<?php endif; ?>
 						<?php else: ?>
-						<div class="col-xs-5 text-right">
+						<div class="col-xs-<?php echo $headercolumns[1]; ?> text-right">
 							<?php echo 'Bewerbung abgeschickt: '.(isset($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum) ? '<i class="fa fa-check" style="color:green"></i>' : '<i class="fa fa-times" style="color:red"></i>'); ?>
 							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungsnachfrist) ? ' | Nachfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungsnachfrist), 'd.m.Y') : ''); ?>
 							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungstermin) ? ' | Bewerbungsfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungstermin), 'd.m.Y') : ''); ?>

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 38/44] 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 39/44] 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 40/44] '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 41/44] 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 42/44] 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 43/44] 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 44/44] 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>';
 		}
 	}
 }