diff --git a/.gitignore b/.gitignore
index f2e4d7bdb..bd98c9b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,40 @@
-.htaccess
-.htaccessbak
-bin
-/nbproject/
-/vendor/*
-!/vendor/FHC-vendor
-/.idea/
 documents/
+vendor/
+
+/nbproject/
+/.idea/
 .settings
 .project
 .buildpath
+.ptp-sync*
+
+.htaccess
+.htaccessbak
+
 application/config/development/
-application/config/testing/
-application/config/production
-application/extensions/
-application/controllers/extensions/
 application/config/extensions/
+application/config/production
+application/config/testing/
+application/controllers/extensions/
+application/extensions/
 application/helpers/extensions/
 application/hooks/extensions/
 application/libraries/extensions/
+application/logs/
 application/models/extensions/
 application/views/extensions/
 application/widgets/extensions/
-application/logs/
+
 public/extensions/
+
 tests/codeception/_output/*
 !/tests/codeception/_output/.placeholder
 tests/codeception/codeception.yml
+tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/api.suite.yml
 tests/codeception/tests/functional.suite.yml
-tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/unit.suite.yml
+
 /sparks/*
 /webdav/google.php
 system/sql/
-.ptp-sync*
\ No newline at end of file
diff --git a/vendor/FHC-vendor/angular-tablesort/.gitignore b/FHC-vendor/angular-tablesort/.gitignore
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/.gitignore
rename to FHC-vendor/angular-tablesort/.gitignore
diff --git a/vendor/FHC-vendor/angular-tablesort/LICENSE b/FHC-vendor/angular-tablesort/LICENSE
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/LICENSE
rename to FHC-vendor/angular-tablesort/LICENSE
diff --git a/vendor/FHC-vendor/angular-tablesort/README.md b/FHC-vendor/angular-tablesort/README.md
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/README.md
rename to FHC-vendor/angular-tablesort/README.md
diff --git a/vendor/FHC-vendor/angular-tablesort/bower.json b/FHC-vendor/angular-tablesort/bower.json
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/bower.json
rename to FHC-vendor/angular-tablesort/bower.json
diff --git a/vendor/FHC-vendor/angular-tablesort/example.html b/FHC-vendor/angular-tablesort/example.html
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/example.html
rename to FHC-vendor/angular-tablesort/example.html
diff --git a/vendor/FHC-vendor/angular-tablesort/index.js b/FHC-vendor/angular-tablesort/index.js
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/index.js
rename to FHC-vendor/angular-tablesort/index.js
diff --git a/vendor/FHC-vendor/angular-tablesort/js/angular-tablesort.js b/FHC-vendor/angular-tablesort/js/angular-tablesort.js
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/js/angular-tablesort.js
rename to FHC-vendor/angular-tablesort/js/angular-tablesort.js
diff --git a/vendor/FHC-vendor/angular-tablesort/package.json b/FHC-vendor/angular-tablesort/package.json
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/package.json
rename to FHC-vendor/angular-tablesort/package.json
diff --git a/vendor/FHC-vendor/angular-tablesort/tablesort.css b/FHC-vendor/angular-tablesort/tablesort.css
similarity index 100%
rename from vendor/FHC-vendor/angular-tablesort/tablesort.css
rename to FHC-vendor/angular-tablesort/tablesort.css
diff --git a/vendor/FHC-vendor/easyui/changelog.txt b/FHC-vendor/easyui/changelog.txt
similarity index 100%
rename from vendor/FHC-vendor/easyui/changelog.txt
rename to FHC-vendor/easyui/changelog.txt
diff --git a/vendor/FHC-vendor/easyui/easyloader.js b/FHC-vendor/easyui/easyloader.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/easyloader.js
rename to FHC-vendor/easyui/easyloader.js
diff --git a/vendor/FHC-vendor/easyui/jquery.easyui.min.js b/FHC-vendor/easyui/jquery.easyui.min.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/jquery.easyui.min.js
rename to FHC-vendor/easyui/jquery.easyui.min.js
diff --git a/vendor/FHC-vendor/easyui/jquery.easyui.mobile.js b/FHC-vendor/easyui/jquery.easyui.mobile.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/jquery.easyui.mobile.js
rename to FHC-vendor/easyui/jquery.easyui.mobile.js
diff --git a/vendor/FHC-vendor/easyui/jquery.min.js b/FHC-vendor/easyui/jquery.min.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/jquery.min.js
rename to FHC-vendor/easyui/jquery.min.js
diff --git a/vendor/FHC-vendor/easyui/license_freeware.txt b/FHC-vendor/easyui/license_freeware.txt
similarity index 100%
rename from vendor/FHC-vendor/easyui/license_freeware.txt
rename to FHC-vendor/easyui/license_freeware.txt
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-af.js b/FHC-vendor/easyui/locale/easyui-lang-af.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-af.js
rename to FHC-vendor/easyui/locale/easyui-lang-af.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-am.js b/FHC-vendor/easyui/locale/easyui-lang-am.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-am.js
rename to FHC-vendor/easyui/locale/easyui-lang-am.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-ar.js b/FHC-vendor/easyui/locale/easyui-lang-ar.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-ar.js
rename to FHC-vendor/easyui/locale/easyui-lang-ar.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-bg.js b/FHC-vendor/easyui/locale/easyui-lang-bg.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-bg.js
rename to FHC-vendor/easyui/locale/easyui-lang-bg.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-ca.js b/FHC-vendor/easyui/locale/easyui-lang-ca.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-ca.js
rename to FHC-vendor/easyui/locale/easyui-lang-ca.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-cs.js b/FHC-vendor/easyui/locale/easyui-lang-cs.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-cs.js
rename to FHC-vendor/easyui/locale/easyui-lang-cs.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-cz.js b/FHC-vendor/easyui/locale/easyui-lang-cz.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-cz.js
rename to FHC-vendor/easyui/locale/easyui-lang-cz.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-da.js b/FHC-vendor/easyui/locale/easyui-lang-da.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-da.js
rename to FHC-vendor/easyui/locale/easyui-lang-da.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-de.js b/FHC-vendor/easyui/locale/easyui-lang-de.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-de.js
rename to FHC-vendor/easyui/locale/easyui-lang-de.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-el.js b/FHC-vendor/easyui/locale/easyui-lang-el.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-el.js
rename to FHC-vendor/easyui/locale/easyui-lang-el.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-en.js b/FHC-vendor/easyui/locale/easyui-lang-en.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-en.js
rename to FHC-vendor/easyui/locale/easyui-lang-en.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-es.js b/FHC-vendor/easyui/locale/easyui-lang-es.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-es.js
rename to FHC-vendor/easyui/locale/easyui-lang-es.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-fr.js b/FHC-vendor/easyui/locale/easyui-lang-fr.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-fr.js
rename to FHC-vendor/easyui/locale/easyui-lang-fr.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-it.js b/FHC-vendor/easyui/locale/easyui-lang-it.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-it.js
rename to FHC-vendor/easyui/locale/easyui-lang-it.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-jp.js b/FHC-vendor/easyui/locale/easyui-lang-jp.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-jp.js
rename to FHC-vendor/easyui/locale/easyui-lang-jp.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-nl.js b/FHC-vendor/easyui/locale/easyui-lang-nl.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-nl.js
rename to FHC-vendor/easyui/locale/easyui-lang-nl.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-pl.js b/FHC-vendor/easyui/locale/easyui-lang-pl.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-pl.js
rename to FHC-vendor/easyui/locale/easyui-lang-pl.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js b/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
rename to FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-ru.js b/FHC-vendor/easyui/locale/easyui-lang-ru.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-ru.js
rename to FHC-vendor/easyui/locale/easyui-lang-ru.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js b/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
rename to FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-tr.js b/FHC-vendor/easyui/locale/easyui-lang-tr.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-tr.js
rename to FHC-vendor/easyui/locale/easyui-lang-tr.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js b/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
rename to FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
diff --git a/vendor/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js b/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
rename to FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.accordion.js b/FHC-vendor/easyui/plugins/jquery.accordion.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.accordion.js
rename to FHC-vendor/easyui/plugins/jquery.accordion.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.calendar.js b/FHC-vendor/easyui/plugins/jquery.calendar.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.calendar.js
rename to FHC-vendor/easyui/plugins/jquery.calendar.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.combo.js b/FHC-vendor/easyui/plugins/jquery.combo.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.combo.js
rename to FHC-vendor/easyui/plugins/jquery.combo.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.combobox.js b/FHC-vendor/easyui/plugins/jquery.combobox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.combobox.js
rename to FHC-vendor/easyui/plugins/jquery.combobox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.combogrid.js b/FHC-vendor/easyui/plugins/jquery.combogrid.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.combogrid.js
rename to FHC-vendor/easyui/plugins/jquery.combogrid.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.combotree.js b/FHC-vendor/easyui/plugins/jquery.combotree.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.combotree.js
rename to FHC-vendor/easyui/plugins/jquery.combotree.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.datagrid.js b/FHC-vendor/easyui/plugins/jquery.datagrid.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.datagrid.js
rename to FHC-vendor/easyui/plugins/jquery.datagrid.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.datalist.js b/FHC-vendor/easyui/plugins/jquery.datalist.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.datalist.js
rename to FHC-vendor/easyui/plugins/jquery.datalist.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.datebox.js b/FHC-vendor/easyui/plugins/jquery.datebox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.datebox.js
rename to FHC-vendor/easyui/plugins/jquery.datebox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.datetimebox.js b/FHC-vendor/easyui/plugins/jquery.datetimebox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.datetimebox.js
rename to FHC-vendor/easyui/plugins/jquery.datetimebox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.datetimespinner.js b/FHC-vendor/easyui/plugins/jquery.datetimespinner.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.datetimespinner.js
rename to FHC-vendor/easyui/plugins/jquery.datetimespinner.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.dialog.js b/FHC-vendor/easyui/plugins/jquery.dialog.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.dialog.js
rename to FHC-vendor/easyui/plugins/jquery.dialog.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.draggable.js b/FHC-vendor/easyui/plugins/jquery.draggable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.draggable.js
rename to FHC-vendor/easyui/plugins/jquery.draggable.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.droppable.js b/FHC-vendor/easyui/plugins/jquery.droppable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.droppable.js
rename to FHC-vendor/easyui/plugins/jquery.droppable.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.filebox.js b/FHC-vendor/easyui/plugins/jquery.filebox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.filebox.js
rename to FHC-vendor/easyui/plugins/jquery.filebox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.form.js b/FHC-vendor/easyui/plugins/jquery.form.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.form.js
rename to FHC-vendor/easyui/plugins/jquery.form.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.layout.js b/FHC-vendor/easyui/plugins/jquery.layout.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.layout.js
rename to FHC-vendor/easyui/plugins/jquery.layout.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.linkbutton.js b/FHC-vendor/easyui/plugins/jquery.linkbutton.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.linkbutton.js
rename to FHC-vendor/easyui/plugins/jquery.linkbutton.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.menu.js b/FHC-vendor/easyui/plugins/jquery.menu.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.menu.js
rename to FHC-vendor/easyui/plugins/jquery.menu.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.menubutton.js b/FHC-vendor/easyui/plugins/jquery.menubutton.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.menubutton.js
rename to FHC-vendor/easyui/plugins/jquery.menubutton.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.messager.js b/FHC-vendor/easyui/plugins/jquery.messager.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.messager.js
rename to FHC-vendor/easyui/plugins/jquery.messager.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.mobile.js b/FHC-vendor/easyui/plugins/jquery.mobile.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.mobile.js
rename to FHC-vendor/easyui/plugins/jquery.mobile.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.numberbox.js b/FHC-vendor/easyui/plugins/jquery.numberbox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.numberbox.js
rename to FHC-vendor/easyui/plugins/jquery.numberbox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.numberspinner.js b/FHC-vendor/easyui/plugins/jquery.numberspinner.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.numberspinner.js
rename to FHC-vendor/easyui/plugins/jquery.numberspinner.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.pagination.js b/FHC-vendor/easyui/plugins/jquery.pagination.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.pagination.js
rename to FHC-vendor/easyui/plugins/jquery.pagination.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.panel.js b/FHC-vendor/easyui/plugins/jquery.panel.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.panel.js
rename to FHC-vendor/easyui/plugins/jquery.panel.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.parser.js b/FHC-vendor/easyui/plugins/jquery.parser.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.parser.js
rename to FHC-vendor/easyui/plugins/jquery.parser.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.progressbar.js b/FHC-vendor/easyui/plugins/jquery.progressbar.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.progressbar.js
rename to FHC-vendor/easyui/plugins/jquery.progressbar.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.propertygrid.js b/FHC-vendor/easyui/plugins/jquery.propertygrid.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.propertygrid.js
rename to FHC-vendor/easyui/plugins/jquery.propertygrid.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.resizable.js b/FHC-vendor/easyui/plugins/jquery.resizable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.resizable.js
rename to FHC-vendor/easyui/plugins/jquery.resizable.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.searchbox.js b/FHC-vendor/easyui/plugins/jquery.searchbox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.searchbox.js
rename to FHC-vendor/easyui/plugins/jquery.searchbox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.slider.js b/FHC-vendor/easyui/plugins/jquery.slider.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.slider.js
rename to FHC-vendor/easyui/plugins/jquery.slider.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.spinner.js b/FHC-vendor/easyui/plugins/jquery.spinner.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.spinner.js
rename to FHC-vendor/easyui/plugins/jquery.spinner.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.splitbutton.js b/FHC-vendor/easyui/plugins/jquery.splitbutton.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.splitbutton.js
rename to FHC-vendor/easyui/plugins/jquery.splitbutton.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.switchbutton.js b/FHC-vendor/easyui/plugins/jquery.switchbutton.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.switchbutton.js
rename to FHC-vendor/easyui/plugins/jquery.switchbutton.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.tabs.js b/FHC-vendor/easyui/plugins/jquery.tabs.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.tabs.js
rename to FHC-vendor/easyui/plugins/jquery.tabs.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.textbox.js b/FHC-vendor/easyui/plugins/jquery.textbox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.textbox.js
rename to FHC-vendor/easyui/plugins/jquery.textbox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.timespinner.js b/FHC-vendor/easyui/plugins/jquery.timespinner.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.timespinner.js
rename to FHC-vendor/easyui/plugins/jquery.timespinner.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.tooltip.js b/FHC-vendor/easyui/plugins/jquery.tooltip.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.tooltip.js
rename to FHC-vendor/easyui/plugins/jquery.tooltip.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.tree.js b/FHC-vendor/easyui/plugins/jquery.tree.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.tree.js
rename to FHC-vendor/easyui/plugins/jquery.tree.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.treegrid.js b/FHC-vendor/easyui/plugins/jquery.treegrid.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.treegrid.js
rename to FHC-vendor/easyui/plugins/jquery.treegrid.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.validatebox.js b/FHC-vendor/easyui/plugins/jquery.validatebox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.validatebox.js
rename to FHC-vendor/easyui/plugins/jquery.validatebox.js
diff --git a/vendor/FHC-vendor/easyui/plugins/jquery.window.js b/FHC-vendor/easyui/plugins/jquery.window.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/plugins/jquery.window.js
rename to FHC-vendor/easyui/plugins/jquery.window.js
diff --git a/vendor/FHC-vendor/easyui/readme.txt b/FHC-vendor/easyui/readme.txt
similarity index 100%
rename from vendor/FHC-vendor/easyui/readme.txt
rename to FHC-vendor/easyui/readme.txt
diff --git a/vendor/FHC-vendor/easyui/src/easyloader.js b/FHC-vendor/easyui/src/easyloader.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/easyloader.js
rename to FHC-vendor/easyui/src/easyloader.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.accordion.js b/FHC-vendor/easyui/src/jquery.accordion.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.accordion.js
rename to FHC-vendor/easyui/src/jquery.accordion.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.calendar.js b/FHC-vendor/easyui/src/jquery.calendar.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.calendar.js
rename to FHC-vendor/easyui/src/jquery.calendar.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.combobox.js b/FHC-vendor/easyui/src/jquery.combobox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.combobox.js
rename to FHC-vendor/easyui/src/jquery.combobox.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.datebox.js b/FHC-vendor/easyui/src/jquery.datebox.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.datebox.js
rename to FHC-vendor/easyui/src/jquery.datebox.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.draggable.js b/FHC-vendor/easyui/src/jquery.draggable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.draggable.js
rename to FHC-vendor/easyui/src/jquery.draggable.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.droppable.js b/FHC-vendor/easyui/src/jquery.droppable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.droppable.js
rename to FHC-vendor/easyui/src/jquery.droppable.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.form.js b/FHC-vendor/easyui/src/jquery.form.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.form.js
rename to FHC-vendor/easyui/src/jquery.form.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.linkbutton.js b/FHC-vendor/easyui/src/jquery.linkbutton.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.linkbutton.js
rename to FHC-vendor/easyui/src/jquery.linkbutton.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.menu.js b/FHC-vendor/easyui/src/jquery.menu.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.menu.js
rename to FHC-vendor/easyui/src/jquery.menu.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.parser.js b/FHC-vendor/easyui/src/jquery.parser.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.parser.js
rename to FHC-vendor/easyui/src/jquery.parser.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.progressbar.js b/FHC-vendor/easyui/src/jquery.progressbar.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.progressbar.js
rename to FHC-vendor/easyui/src/jquery.progressbar.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.propertygrid.js b/FHC-vendor/easyui/src/jquery.propertygrid.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.propertygrid.js
rename to FHC-vendor/easyui/src/jquery.propertygrid.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.resizable.js b/FHC-vendor/easyui/src/jquery.resizable.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.resizable.js
rename to FHC-vendor/easyui/src/jquery.resizable.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.slider.js b/FHC-vendor/easyui/src/jquery.slider.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.slider.js
rename to FHC-vendor/easyui/src/jquery.slider.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.tabs.js b/FHC-vendor/easyui/src/jquery.tabs.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.tabs.js
rename to FHC-vendor/easyui/src/jquery.tabs.js
diff --git a/vendor/FHC-vendor/easyui/src/jquery.window.js b/FHC-vendor/easyui/src/jquery.window.js
similarity index 100%
rename from vendor/FHC-vendor/easyui/src/jquery.window.js
rename to FHC-vendor/easyui/src/jquery.window.js
diff --git a/vendor/FHC-vendor/easyui/themes/black/accordion.css b/FHC-vendor/easyui/themes/black/accordion.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/accordion.css
rename to FHC-vendor/easyui/themes/black/accordion.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/calendar.css b/FHC-vendor/easyui/themes/black/calendar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/calendar.css
rename to FHC-vendor/easyui/themes/black/calendar.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/combo.css b/FHC-vendor/easyui/themes/black/combo.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/combo.css
rename to FHC-vendor/easyui/themes/black/combo.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/combobox.css b/FHC-vendor/easyui/themes/black/combobox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/combobox.css
rename to FHC-vendor/easyui/themes/black/combobox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/datagrid.css b/FHC-vendor/easyui/themes/black/datagrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/datagrid.css
rename to FHC-vendor/easyui/themes/black/datagrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/datalist.css b/FHC-vendor/easyui/themes/black/datalist.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/datalist.css
rename to FHC-vendor/easyui/themes/black/datalist.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/datebox.css b/FHC-vendor/easyui/themes/black/datebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/datebox.css
rename to FHC-vendor/easyui/themes/black/datebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/dialog.css b/FHC-vendor/easyui/themes/black/dialog.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/dialog.css
rename to FHC-vendor/easyui/themes/black/dialog.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/easyui.css b/FHC-vendor/easyui/themes/black/easyui.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/easyui.css
rename to FHC-vendor/easyui/themes/black/easyui.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/filebox.css b/FHC-vendor/easyui/themes/black/filebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/filebox.css
rename to FHC-vendor/easyui/themes/black/filebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/accordion_arrows.png b/FHC-vendor/easyui/themes/black/images/accordion_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/accordion_arrows.png
rename to FHC-vendor/easyui/themes/black/images/accordion_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/blank.gif b/FHC-vendor/easyui/themes/black/images/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/blank.gif
rename to FHC-vendor/easyui/themes/black/images/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/calendar_arrows.png b/FHC-vendor/easyui/themes/black/images/calendar_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/calendar_arrows.png
rename to FHC-vendor/easyui/themes/black/images/calendar_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/combo_arrow.png b/FHC-vendor/easyui/themes/black/images/combo_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/combo_arrow.png
rename to FHC-vendor/easyui/themes/black/images/combo_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/datagrid_icons.png b/FHC-vendor/easyui/themes/black/images/datagrid_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/datagrid_icons.png
rename to FHC-vendor/easyui/themes/black/images/datagrid_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/datebox_arrow.png b/FHC-vendor/easyui/themes/black/images/datebox_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/datebox_arrow.png
rename to FHC-vendor/easyui/themes/black/images/datebox_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/layout_arrows.png b/FHC-vendor/easyui/themes/black/images/layout_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/layout_arrows.png
rename to FHC-vendor/easyui/themes/black/images/layout_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
rename to FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/loading.gif b/FHC-vendor/easyui/themes/black/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/loading.gif
rename to FHC-vendor/easyui/themes/black/images/loading.gif
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/menu_arrows.png b/FHC-vendor/easyui/themes/black/images/menu_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/menu_arrows.png
rename to FHC-vendor/easyui/themes/black/images/menu_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/messager_icons.png b/FHC-vendor/easyui/themes/black/images/messager_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/messager_icons.png
rename to FHC-vendor/easyui/themes/black/images/messager_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/pagination_icons.png b/FHC-vendor/easyui/themes/black/images/pagination_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/pagination_icons.png
rename to FHC-vendor/easyui/themes/black/images/pagination_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/panel_tools.png b/FHC-vendor/easyui/themes/black/images/panel_tools.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/panel_tools.png
rename to FHC-vendor/easyui/themes/black/images/panel_tools.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/searchbox_button.png b/FHC-vendor/easyui/themes/black/images/searchbox_button.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/searchbox_button.png
rename to FHC-vendor/easyui/themes/black/images/searchbox_button.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/slider_handle.png b/FHC-vendor/easyui/themes/black/images/slider_handle.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/slider_handle.png
rename to FHC-vendor/easyui/themes/black/images/slider_handle.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/spinner_arrows.png b/FHC-vendor/easyui/themes/black/images/spinner_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/spinner_arrows.png
rename to FHC-vendor/easyui/themes/black/images/spinner_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/tabs_icons.png b/FHC-vendor/easyui/themes/black/images/tabs_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/tabs_icons.png
rename to FHC-vendor/easyui/themes/black/images/tabs_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/tree_icons.png b/FHC-vendor/easyui/themes/black/images/tree_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/tree_icons.png
rename to FHC-vendor/easyui/themes/black/images/tree_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/images/validatebox_warning.png b/FHC-vendor/easyui/themes/black/images/validatebox_warning.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/images/validatebox_warning.png
rename to FHC-vendor/easyui/themes/black/images/validatebox_warning.png
diff --git a/vendor/FHC-vendor/easyui/themes/black/layout.css b/FHC-vendor/easyui/themes/black/layout.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/layout.css
rename to FHC-vendor/easyui/themes/black/layout.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/linkbutton.css b/FHC-vendor/easyui/themes/black/linkbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/linkbutton.css
rename to FHC-vendor/easyui/themes/black/linkbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/menu.css b/FHC-vendor/easyui/themes/black/menu.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/menu.css
rename to FHC-vendor/easyui/themes/black/menu.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/menubutton.css b/FHC-vendor/easyui/themes/black/menubutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/menubutton.css
rename to FHC-vendor/easyui/themes/black/menubutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/messager.css b/FHC-vendor/easyui/themes/black/messager.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/messager.css
rename to FHC-vendor/easyui/themes/black/messager.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/numberbox.css b/FHC-vendor/easyui/themes/black/numberbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/numberbox.css
rename to FHC-vendor/easyui/themes/black/numberbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/pagination.css b/FHC-vendor/easyui/themes/black/pagination.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/pagination.css
rename to FHC-vendor/easyui/themes/black/pagination.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/panel.css b/FHC-vendor/easyui/themes/black/panel.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/panel.css
rename to FHC-vendor/easyui/themes/black/panel.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/progressbar.css b/FHC-vendor/easyui/themes/black/progressbar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/progressbar.css
rename to FHC-vendor/easyui/themes/black/progressbar.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/propertygrid.css b/FHC-vendor/easyui/themes/black/propertygrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/propertygrid.css
rename to FHC-vendor/easyui/themes/black/propertygrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/searchbox.css b/FHC-vendor/easyui/themes/black/searchbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/searchbox.css
rename to FHC-vendor/easyui/themes/black/searchbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/slider.css b/FHC-vendor/easyui/themes/black/slider.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/slider.css
rename to FHC-vendor/easyui/themes/black/slider.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/spinner.css b/FHC-vendor/easyui/themes/black/spinner.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/spinner.css
rename to FHC-vendor/easyui/themes/black/spinner.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/splitbutton.css b/FHC-vendor/easyui/themes/black/splitbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/splitbutton.css
rename to FHC-vendor/easyui/themes/black/splitbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/switchbutton.css b/FHC-vendor/easyui/themes/black/switchbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/switchbutton.css
rename to FHC-vendor/easyui/themes/black/switchbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/tabs.css b/FHC-vendor/easyui/themes/black/tabs.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/tabs.css
rename to FHC-vendor/easyui/themes/black/tabs.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/textbox.css b/FHC-vendor/easyui/themes/black/textbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/textbox.css
rename to FHC-vendor/easyui/themes/black/textbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/tooltip.css b/FHC-vendor/easyui/themes/black/tooltip.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/tooltip.css
rename to FHC-vendor/easyui/themes/black/tooltip.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/tree.css b/FHC-vendor/easyui/themes/black/tree.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/tree.css
rename to FHC-vendor/easyui/themes/black/tree.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/validatebox.css b/FHC-vendor/easyui/themes/black/validatebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/validatebox.css
rename to FHC-vendor/easyui/themes/black/validatebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/black/window.css b/FHC-vendor/easyui/themes/black/window.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/black/window.css
rename to FHC-vendor/easyui/themes/black/window.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/accordion.css b/FHC-vendor/easyui/themes/bootstrap/accordion.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/accordion.css
rename to FHC-vendor/easyui/themes/bootstrap/accordion.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/calendar.css b/FHC-vendor/easyui/themes/bootstrap/calendar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/calendar.css
rename to FHC-vendor/easyui/themes/bootstrap/calendar.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/combo.css b/FHC-vendor/easyui/themes/bootstrap/combo.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/combo.css
rename to FHC-vendor/easyui/themes/bootstrap/combo.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/combobox.css b/FHC-vendor/easyui/themes/bootstrap/combobox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/combobox.css
rename to FHC-vendor/easyui/themes/bootstrap/combobox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/datagrid.css b/FHC-vendor/easyui/themes/bootstrap/datagrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/datagrid.css
rename to FHC-vendor/easyui/themes/bootstrap/datagrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/datebox.css b/FHC-vendor/easyui/themes/bootstrap/datebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/datebox.css
rename to FHC-vendor/easyui/themes/bootstrap/datebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/dialog.css b/FHC-vendor/easyui/themes/bootstrap/dialog.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/dialog.css
rename to FHC-vendor/easyui/themes/bootstrap/dialog.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/easyui.css b/FHC-vendor/easyui/themes/bootstrap/easyui.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/easyui.css
rename to FHC-vendor/easyui/themes/bootstrap/easyui.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/filebox.css b/FHC-vendor/easyui/themes/bootstrap/filebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/filebox.css
rename to FHC-vendor/easyui/themes/bootstrap/filebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
rename to FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/blank.gif b/FHC-vendor/easyui/themes/bootstrap/images/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/blank.gif
rename to FHC-vendor/easyui/themes/bootstrap/images/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
rename to FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
rename to FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
rename to FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
rename to FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
rename to FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
rename to FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/loading.gif b/FHC-vendor/easyui/themes/bootstrap/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/loading.gif
rename to FHC-vendor/easyui/themes/bootstrap/images/loading.gif
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
rename to FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
rename to FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
rename to FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png b/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
rename to FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png b/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
rename to FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png b/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
rename to FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
rename to FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
rename to FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
rename to FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png b/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
rename to FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/layout.css b/FHC-vendor/easyui/themes/bootstrap/layout.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/layout.css
rename to FHC-vendor/easyui/themes/bootstrap/layout.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/linkbutton.css b/FHC-vendor/easyui/themes/bootstrap/linkbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/linkbutton.css
rename to FHC-vendor/easyui/themes/bootstrap/linkbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/menu.css b/FHC-vendor/easyui/themes/bootstrap/menu.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/menu.css
rename to FHC-vendor/easyui/themes/bootstrap/menu.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/menubutton.css b/FHC-vendor/easyui/themes/bootstrap/menubutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/menubutton.css
rename to FHC-vendor/easyui/themes/bootstrap/menubutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/messager.css b/FHC-vendor/easyui/themes/bootstrap/messager.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/messager.css
rename to FHC-vendor/easyui/themes/bootstrap/messager.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/numberbox.css b/FHC-vendor/easyui/themes/bootstrap/numberbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/numberbox.css
rename to FHC-vendor/easyui/themes/bootstrap/numberbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/pagination.css b/FHC-vendor/easyui/themes/bootstrap/pagination.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/pagination.css
rename to FHC-vendor/easyui/themes/bootstrap/pagination.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/panel.css b/FHC-vendor/easyui/themes/bootstrap/panel.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/panel.css
rename to FHC-vendor/easyui/themes/bootstrap/panel.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/progressbar.css b/FHC-vendor/easyui/themes/bootstrap/progressbar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/progressbar.css
rename to FHC-vendor/easyui/themes/bootstrap/progressbar.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/propertygrid.css b/FHC-vendor/easyui/themes/bootstrap/propertygrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/propertygrid.css
rename to FHC-vendor/easyui/themes/bootstrap/propertygrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/searchbox.css b/FHC-vendor/easyui/themes/bootstrap/searchbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/searchbox.css
rename to FHC-vendor/easyui/themes/bootstrap/searchbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/slider.css b/FHC-vendor/easyui/themes/bootstrap/slider.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/slider.css
rename to FHC-vendor/easyui/themes/bootstrap/slider.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/spinner.css b/FHC-vendor/easyui/themes/bootstrap/spinner.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/spinner.css
rename to FHC-vendor/easyui/themes/bootstrap/spinner.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/splitbutton.css b/FHC-vendor/easyui/themes/bootstrap/splitbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/splitbutton.css
rename to FHC-vendor/easyui/themes/bootstrap/splitbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/switchbutton.css b/FHC-vendor/easyui/themes/bootstrap/switchbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/switchbutton.css
rename to FHC-vendor/easyui/themes/bootstrap/switchbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/tabs.css b/FHC-vendor/easyui/themes/bootstrap/tabs.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/tabs.css
rename to FHC-vendor/easyui/themes/bootstrap/tabs.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/textbox.css b/FHC-vendor/easyui/themes/bootstrap/textbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/textbox.css
rename to FHC-vendor/easyui/themes/bootstrap/textbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/tooltip.css b/FHC-vendor/easyui/themes/bootstrap/tooltip.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/tooltip.css
rename to FHC-vendor/easyui/themes/bootstrap/tooltip.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/tree.css b/FHC-vendor/easyui/themes/bootstrap/tree.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/tree.css
rename to FHC-vendor/easyui/themes/bootstrap/tree.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/validatebox.css b/FHC-vendor/easyui/themes/bootstrap/validatebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/validatebox.css
rename to FHC-vendor/easyui/themes/bootstrap/validatebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/bootstrap/window.css b/FHC-vendor/easyui/themes/bootstrap/window.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/bootstrap/window.css
rename to FHC-vendor/easyui/themes/bootstrap/window.css
diff --git a/vendor/FHC-vendor/easyui/themes/color.css b/FHC-vendor/easyui/themes/color.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/color.css
rename to FHC-vendor/easyui/themes/color.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/accordion.css b/FHC-vendor/easyui/themes/default/accordion.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/accordion.css
rename to FHC-vendor/easyui/themes/default/accordion.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/calendar.css b/FHC-vendor/easyui/themes/default/calendar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/calendar.css
rename to FHC-vendor/easyui/themes/default/calendar.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/combo.css b/FHC-vendor/easyui/themes/default/combo.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/combo.css
rename to FHC-vendor/easyui/themes/default/combo.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/combobox.css b/FHC-vendor/easyui/themes/default/combobox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/combobox.css
rename to FHC-vendor/easyui/themes/default/combobox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/datagrid.css b/FHC-vendor/easyui/themes/default/datagrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/datagrid.css
rename to FHC-vendor/easyui/themes/default/datagrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/datalist.css b/FHC-vendor/easyui/themes/default/datalist.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/datalist.css
rename to FHC-vendor/easyui/themes/default/datalist.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/datebox.css b/FHC-vendor/easyui/themes/default/datebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/datebox.css
rename to FHC-vendor/easyui/themes/default/datebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/dialog.css b/FHC-vendor/easyui/themes/default/dialog.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/dialog.css
rename to FHC-vendor/easyui/themes/default/dialog.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/easyui.css b/FHC-vendor/easyui/themes/default/easyui.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/easyui.css
rename to FHC-vendor/easyui/themes/default/easyui.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/filebox.css b/FHC-vendor/easyui/themes/default/filebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/filebox.css
rename to FHC-vendor/easyui/themes/default/filebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/accordion_arrows.png b/FHC-vendor/easyui/themes/default/images/accordion_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/accordion_arrows.png
rename to FHC-vendor/easyui/themes/default/images/accordion_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/blank.gif b/FHC-vendor/easyui/themes/default/images/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/blank.gif
rename to FHC-vendor/easyui/themes/default/images/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/calendar_arrows.png b/FHC-vendor/easyui/themes/default/images/calendar_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/calendar_arrows.png
rename to FHC-vendor/easyui/themes/default/images/calendar_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/combo_arrow.png b/FHC-vendor/easyui/themes/default/images/combo_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/combo_arrow.png
rename to FHC-vendor/easyui/themes/default/images/combo_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/datagrid_icons.png b/FHC-vendor/easyui/themes/default/images/datagrid_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/datagrid_icons.png
rename to FHC-vendor/easyui/themes/default/images/datagrid_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/datebox_arrow.png b/FHC-vendor/easyui/themes/default/images/datebox_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/datebox_arrow.png
rename to FHC-vendor/easyui/themes/default/images/datebox_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/layout_arrows.png b/FHC-vendor/easyui/themes/default/images/layout_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/layout_arrows.png
rename to FHC-vendor/easyui/themes/default/images/layout_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
rename to FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/loading.gif b/FHC-vendor/easyui/themes/default/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/loading.gif
rename to FHC-vendor/easyui/themes/default/images/loading.gif
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/menu_arrows.png b/FHC-vendor/easyui/themes/default/images/menu_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/menu_arrows.png
rename to FHC-vendor/easyui/themes/default/images/menu_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/messager_icons.png b/FHC-vendor/easyui/themes/default/images/messager_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/messager_icons.png
rename to FHC-vendor/easyui/themes/default/images/messager_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/pagination_icons.png b/FHC-vendor/easyui/themes/default/images/pagination_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/pagination_icons.png
rename to FHC-vendor/easyui/themes/default/images/pagination_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/panel_tools.png b/FHC-vendor/easyui/themes/default/images/panel_tools.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/panel_tools.png
rename to FHC-vendor/easyui/themes/default/images/panel_tools.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/searchbox_button.png b/FHC-vendor/easyui/themes/default/images/searchbox_button.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/searchbox_button.png
rename to FHC-vendor/easyui/themes/default/images/searchbox_button.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/slider_handle.png b/FHC-vendor/easyui/themes/default/images/slider_handle.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/slider_handle.png
rename to FHC-vendor/easyui/themes/default/images/slider_handle.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/spinner_arrows.png b/FHC-vendor/easyui/themes/default/images/spinner_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/spinner_arrows.png
rename to FHC-vendor/easyui/themes/default/images/spinner_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/tabs_icons.png b/FHC-vendor/easyui/themes/default/images/tabs_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/tabs_icons.png
rename to FHC-vendor/easyui/themes/default/images/tabs_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/tree_icons.png b/FHC-vendor/easyui/themes/default/images/tree_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/tree_icons.png
rename to FHC-vendor/easyui/themes/default/images/tree_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/images/validatebox_warning.png b/FHC-vendor/easyui/themes/default/images/validatebox_warning.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/images/validatebox_warning.png
rename to FHC-vendor/easyui/themes/default/images/validatebox_warning.png
diff --git a/vendor/FHC-vendor/easyui/themes/default/layout.css b/FHC-vendor/easyui/themes/default/layout.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/layout.css
rename to FHC-vendor/easyui/themes/default/layout.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/linkbutton.css b/FHC-vendor/easyui/themes/default/linkbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/linkbutton.css
rename to FHC-vendor/easyui/themes/default/linkbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/menu.css b/FHC-vendor/easyui/themes/default/menu.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/menu.css
rename to FHC-vendor/easyui/themes/default/menu.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/menubutton.css b/FHC-vendor/easyui/themes/default/menubutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/menubutton.css
rename to FHC-vendor/easyui/themes/default/menubutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/messager.css b/FHC-vendor/easyui/themes/default/messager.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/messager.css
rename to FHC-vendor/easyui/themes/default/messager.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/numberbox.css b/FHC-vendor/easyui/themes/default/numberbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/numberbox.css
rename to FHC-vendor/easyui/themes/default/numberbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/pagination.css b/FHC-vendor/easyui/themes/default/pagination.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/pagination.css
rename to FHC-vendor/easyui/themes/default/pagination.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/panel.css b/FHC-vendor/easyui/themes/default/panel.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/panel.css
rename to FHC-vendor/easyui/themes/default/panel.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/progressbar.css b/FHC-vendor/easyui/themes/default/progressbar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/progressbar.css
rename to FHC-vendor/easyui/themes/default/progressbar.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/propertygrid.css b/FHC-vendor/easyui/themes/default/propertygrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/propertygrid.css
rename to FHC-vendor/easyui/themes/default/propertygrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/searchbox.css b/FHC-vendor/easyui/themes/default/searchbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/searchbox.css
rename to FHC-vendor/easyui/themes/default/searchbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/slider.css b/FHC-vendor/easyui/themes/default/slider.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/slider.css
rename to FHC-vendor/easyui/themes/default/slider.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/spinner.css b/FHC-vendor/easyui/themes/default/spinner.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/spinner.css
rename to FHC-vendor/easyui/themes/default/spinner.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/splitbutton.css b/FHC-vendor/easyui/themes/default/splitbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/splitbutton.css
rename to FHC-vendor/easyui/themes/default/splitbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/switchbutton.css b/FHC-vendor/easyui/themes/default/switchbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/switchbutton.css
rename to FHC-vendor/easyui/themes/default/switchbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/tabs.css b/FHC-vendor/easyui/themes/default/tabs.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/tabs.css
rename to FHC-vendor/easyui/themes/default/tabs.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/textbox.css b/FHC-vendor/easyui/themes/default/textbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/textbox.css
rename to FHC-vendor/easyui/themes/default/textbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/tooltip.css b/FHC-vendor/easyui/themes/default/tooltip.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/tooltip.css
rename to FHC-vendor/easyui/themes/default/tooltip.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/tree.css b/FHC-vendor/easyui/themes/default/tree.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/tree.css
rename to FHC-vendor/easyui/themes/default/tree.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/validatebox.css b/FHC-vendor/easyui/themes/default/validatebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/validatebox.css
rename to FHC-vendor/easyui/themes/default/validatebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/default/window.css b/FHC-vendor/easyui/themes/default/window.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/default/window.css
rename to FHC-vendor/easyui/themes/default/window.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/accordion.css b/FHC-vendor/easyui/themes/gray/accordion.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/accordion.css
rename to FHC-vendor/easyui/themes/gray/accordion.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/calendar.css b/FHC-vendor/easyui/themes/gray/calendar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/calendar.css
rename to FHC-vendor/easyui/themes/gray/calendar.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/combo.css b/FHC-vendor/easyui/themes/gray/combo.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/combo.css
rename to FHC-vendor/easyui/themes/gray/combo.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/combobox.css b/FHC-vendor/easyui/themes/gray/combobox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/combobox.css
rename to FHC-vendor/easyui/themes/gray/combobox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/datagrid.css b/FHC-vendor/easyui/themes/gray/datagrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/datagrid.css
rename to FHC-vendor/easyui/themes/gray/datagrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/datalist.css b/FHC-vendor/easyui/themes/gray/datalist.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/datalist.css
rename to FHC-vendor/easyui/themes/gray/datalist.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/datebox.css b/FHC-vendor/easyui/themes/gray/datebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/datebox.css
rename to FHC-vendor/easyui/themes/gray/datebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/dialog.css b/FHC-vendor/easyui/themes/gray/dialog.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/dialog.css
rename to FHC-vendor/easyui/themes/gray/dialog.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/easyui.css b/FHC-vendor/easyui/themes/gray/easyui.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/easyui.css
rename to FHC-vendor/easyui/themes/gray/easyui.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/filebox.css b/FHC-vendor/easyui/themes/gray/filebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/filebox.css
rename to FHC-vendor/easyui/themes/gray/filebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png b/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
rename to FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/blank.gif b/FHC-vendor/easyui/themes/gray/images/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/blank.gif
rename to FHC-vendor/easyui/themes/gray/images/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png b/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
rename to FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/combo_arrow.png b/FHC-vendor/easyui/themes/gray/images/combo_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/combo_arrow.png
rename to FHC-vendor/easyui/themes/gray/images/combo_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png b/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
rename to FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png b/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
rename to FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/layout_arrows.png b/FHC-vendor/easyui/themes/gray/images/layout_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/layout_arrows.png
rename to FHC-vendor/easyui/themes/gray/images/layout_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
rename to FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/loading.gif b/FHC-vendor/easyui/themes/gray/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/loading.gif
rename to FHC-vendor/easyui/themes/gray/images/loading.gif
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/menu_arrows.png b/FHC-vendor/easyui/themes/gray/images/menu_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/menu_arrows.png
rename to FHC-vendor/easyui/themes/gray/images/menu_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/messager_icons.png b/FHC-vendor/easyui/themes/gray/images/messager_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/messager_icons.png
rename to FHC-vendor/easyui/themes/gray/images/messager_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/pagination_icons.png b/FHC-vendor/easyui/themes/gray/images/pagination_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/pagination_icons.png
rename to FHC-vendor/easyui/themes/gray/images/pagination_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/panel_tools.png b/FHC-vendor/easyui/themes/gray/images/panel_tools.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/panel_tools.png
rename to FHC-vendor/easyui/themes/gray/images/panel_tools.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/searchbox_button.png b/FHC-vendor/easyui/themes/gray/images/searchbox_button.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/searchbox_button.png
rename to FHC-vendor/easyui/themes/gray/images/searchbox_button.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/slider_handle.png b/FHC-vendor/easyui/themes/gray/images/slider_handle.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/slider_handle.png
rename to FHC-vendor/easyui/themes/gray/images/slider_handle.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png b/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
rename to FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/tabs_icons.png b/FHC-vendor/easyui/themes/gray/images/tabs_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/tabs_icons.png
rename to FHC-vendor/easyui/themes/gray/images/tabs_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/tree_icons.png b/FHC-vendor/easyui/themes/gray/images/tree_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/tree_icons.png
rename to FHC-vendor/easyui/themes/gray/images/tree_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png b/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
rename to FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
diff --git a/vendor/FHC-vendor/easyui/themes/gray/layout.css b/FHC-vendor/easyui/themes/gray/layout.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/layout.css
rename to FHC-vendor/easyui/themes/gray/layout.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/linkbutton.css b/FHC-vendor/easyui/themes/gray/linkbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/linkbutton.css
rename to FHC-vendor/easyui/themes/gray/linkbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/menu.css b/FHC-vendor/easyui/themes/gray/menu.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/menu.css
rename to FHC-vendor/easyui/themes/gray/menu.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/menubutton.css b/FHC-vendor/easyui/themes/gray/menubutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/menubutton.css
rename to FHC-vendor/easyui/themes/gray/menubutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/messager.css b/FHC-vendor/easyui/themes/gray/messager.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/messager.css
rename to FHC-vendor/easyui/themes/gray/messager.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/numberbox.css b/FHC-vendor/easyui/themes/gray/numberbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/numberbox.css
rename to FHC-vendor/easyui/themes/gray/numberbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/pagination.css b/FHC-vendor/easyui/themes/gray/pagination.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/pagination.css
rename to FHC-vendor/easyui/themes/gray/pagination.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/panel.css b/FHC-vendor/easyui/themes/gray/panel.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/panel.css
rename to FHC-vendor/easyui/themes/gray/panel.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/progressbar.css b/FHC-vendor/easyui/themes/gray/progressbar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/progressbar.css
rename to FHC-vendor/easyui/themes/gray/progressbar.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/propertygrid.css b/FHC-vendor/easyui/themes/gray/propertygrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/propertygrid.css
rename to FHC-vendor/easyui/themes/gray/propertygrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/searchbox.css b/FHC-vendor/easyui/themes/gray/searchbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/searchbox.css
rename to FHC-vendor/easyui/themes/gray/searchbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/slider.css b/FHC-vendor/easyui/themes/gray/slider.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/slider.css
rename to FHC-vendor/easyui/themes/gray/slider.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/spinner.css b/FHC-vendor/easyui/themes/gray/spinner.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/spinner.css
rename to FHC-vendor/easyui/themes/gray/spinner.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/splitbutton.css b/FHC-vendor/easyui/themes/gray/splitbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/splitbutton.css
rename to FHC-vendor/easyui/themes/gray/splitbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/switchbutton.css b/FHC-vendor/easyui/themes/gray/switchbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/switchbutton.css
rename to FHC-vendor/easyui/themes/gray/switchbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/tabs.css b/FHC-vendor/easyui/themes/gray/tabs.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/tabs.css
rename to FHC-vendor/easyui/themes/gray/tabs.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/textbox.css b/FHC-vendor/easyui/themes/gray/textbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/textbox.css
rename to FHC-vendor/easyui/themes/gray/textbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/tooltip.css b/FHC-vendor/easyui/themes/gray/tooltip.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/tooltip.css
rename to FHC-vendor/easyui/themes/gray/tooltip.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/tree.css b/FHC-vendor/easyui/themes/gray/tree.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/tree.css
rename to FHC-vendor/easyui/themes/gray/tree.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/validatebox.css b/FHC-vendor/easyui/themes/gray/validatebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/validatebox.css
rename to FHC-vendor/easyui/themes/gray/validatebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/gray/window.css b/FHC-vendor/easyui/themes/gray/window.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/gray/window.css
rename to FHC-vendor/easyui/themes/gray/window.css
diff --git a/vendor/FHC-vendor/easyui/themes/icon.css b/FHC-vendor/easyui/themes/icon.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icon.css
rename to FHC-vendor/easyui/themes/icon.css
diff --git a/vendor/FHC-vendor/easyui/themes/icons/back.png b/FHC-vendor/easyui/themes/icons/back.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/back.png
rename to FHC-vendor/easyui/themes/icons/back.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/blank.gif b/FHC-vendor/easyui/themes/icons/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/blank.gif
rename to FHC-vendor/easyui/themes/icons/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/icons/cancel.png b/FHC-vendor/easyui/themes/icons/cancel.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/cancel.png
rename to FHC-vendor/easyui/themes/icons/cancel.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/clear.png b/FHC-vendor/easyui/themes/icons/clear.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/clear.png
rename to FHC-vendor/easyui/themes/icons/clear.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/cut.png b/FHC-vendor/easyui/themes/icons/cut.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/cut.png
rename to FHC-vendor/easyui/themes/icons/cut.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/edit_add.png b/FHC-vendor/easyui/themes/icons/edit_add.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/edit_add.png
rename to FHC-vendor/easyui/themes/icons/edit_add.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/edit_remove.png b/FHC-vendor/easyui/themes/icons/edit_remove.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/edit_remove.png
rename to FHC-vendor/easyui/themes/icons/edit_remove.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/filesave.png b/FHC-vendor/easyui/themes/icons/filesave.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/filesave.png
rename to FHC-vendor/easyui/themes/icons/filesave.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/filter.png b/FHC-vendor/easyui/themes/icons/filter.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/filter.png
rename to FHC-vendor/easyui/themes/icons/filter.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/help.png b/FHC-vendor/easyui/themes/icons/help.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/help.png
rename to FHC-vendor/easyui/themes/icons/help.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/large_chart.png b/FHC-vendor/easyui/themes/icons/large_chart.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/large_chart.png
rename to FHC-vendor/easyui/themes/icons/large_chart.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/large_clipart.png b/FHC-vendor/easyui/themes/icons/large_clipart.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/large_clipart.png
rename to FHC-vendor/easyui/themes/icons/large_clipart.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/large_picture.png b/FHC-vendor/easyui/themes/icons/large_picture.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/large_picture.png
rename to FHC-vendor/easyui/themes/icons/large_picture.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/large_shapes.png b/FHC-vendor/easyui/themes/icons/large_shapes.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/large_shapes.png
rename to FHC-vendor/easyui/themes/icons/large_shapes.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/large_smartart.png b/FHC-vendor/easyui/themes/icons/large_smartart.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/large_smartart.png
rename to FHC-vendor/easyui/themes/icons/large_smartart.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/lock.png b/FHC-vendor/easyui/themes/icons/lock.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/lock.png
rename to FHC-vendor/easyui/themes/icons/lock.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/man.png b/FHC-vendor/easyui/themes/icons/man.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/man.png
rename to FHC-vendor/easyui/themes/icons/man.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/mini_add.png b/FHC-vendor/easyui/themes/icons/mini_add.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/mini_add.png
rename to FHC-vendor/easyui/themes/icons/mini_add.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/mini_edit.png b/FHC-vendor/easyui/themes/icons/mini_edit.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/mini_edit.png
rename to FHC-vendor/easyui/themes/icons/mini_edit.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/mini_refresh.png b/FHC-vendor/easyui/themes/icons/mini_refresh.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/mini_refresh.png
rename to FHC-vendor/easyui/themes/icons/mini_refresh.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/more.png b/FHC-vendor/easyui/themes/icons/more.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/more.png
rename to FHC-vendor/easyui/themes/icons/more.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/no.png b/FHC-vendor/easyui/themes/icons/no.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/no.png
rename to FHC-vendor/easyui/themes/icons/no.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/ok.png b/FHC-vendor/easyui/themes/icons/ok.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/ok.png
rename to FHC-vendor/easyui/themes/icons/ok.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/pencil.png b/FHC-vendor/easyui/themes/icons/pencil.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/pencil.png
rename to FHC-vendor/easyui/themes/icons/pencil.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/print.png b/FHC-vendor/easyui/themes/icons/print.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/print.png
rename to FHC-vendor/easyui/themes/icons/print.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/redo.png b/FHC-vendor/easyui/themes/icons/redo.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/redo.png
rename to FHC-vendor/easyui/themes/icons/redo.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/reload.png b/FHC-vendor/easyui/themes/icons/reload.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/reload.png
rename to FHC-vendor/easyui/themes/icons/reload.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/search.png b/FHC-vendor/easyui/themes/icons/search.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/search.png
rename to FHC-vendor/easyui/themes/icons/search.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/sum.png b/FHC-vendor/easyui/themes/icons/sum.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/sum.png
rename to FHC-vendor/easyui/themes/icons/sum.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/tip.png b/FHC-vendor/easyui/themes/icons/tip.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/tip.png
rename to FHC-vendor/easyui/themes/icons/tip.png
diff --git a/vendor/FHC-vendor/easyui/themes/icons/undo.png b/FHC-vendor/easyui/themes/icons/undo.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/icons/undo.png
rename to FHC-vendor/easyui/themes/icons/undo.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/accordion.css b/FHC-vendor/easyui/themes/metro/accordion.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/accordion.css
rename to FHC-vendor/easyui/themes/metro/accordion.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/calendar.css b/FHC-vendor/easyui/themes/metro/calendar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/calendar.css
rename to FHC-vendor/easyui/themes/metro/calendar.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/combo.css b/FHC-vendor/easyui/themes/metro/combo.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/combo.css
rename to FHC-vendor/easyui/themes/metro/combo.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/combobox.css b/FHC-vendor/easyui/themes/metro/combobox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/combobox.css
rename to FHC-vendor/easyui/themes/metro/combobox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/datagrid.css b/FHC-vendor/easyui/themes/metro/datagrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/datagrid.css
rename to FHC-vendor/easyui/themes/metro/datagrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/datalist.css b/FHC-vendor/easyui/themes/metro/datalist.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/datalist.css
rename to FHC-vendor/easyui/themes/metro/datalist.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/datebox.css b/FHC-vendor/easyui/themes/metro/datebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/datebox.css
rename to FHC-vendor/easyui/themes/metro/datebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/dialog.css b/FHC-vendor/easyui/themes/metro/dialog.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/dialog.css
rename to FHC-vendor/easyui/themes/metro/dialog.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/easyui.css b/FHC-vendor/easyui/themes/metro/easyui.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/easyui.css
rename to FHC-vendor/easyui/themes/metro/easyui.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/filebox.css b/FHC-vendor/easyui/themes/metro/filebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/filebox.css
rename to FHC-vendor/easyui/themes/metro/filebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png b/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
rename to FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/blank.gif b/FHC-vendor/easyui/themes/metro/images/blank.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/blank.gif
rename to FHC-vendor/easyui/themes/metro/images/blank.gif
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png b/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
rename to FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/combo_arrow.png b/FHC-vendor/easyui/themes/metro/images/combo_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/combo_arrow.png
rename to FHC-vendor/easyui/themes/metro/images/combo_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png b/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
rename to FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png b/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
rename to FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/layout_arrows.png b/FHC-vendor/easyui/themes/metro/images/layout_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/layout_arrows.png
rename to FHC-vendor/easyui/themes/metro/images/layout_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
rename to FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/loading.gif b/FHC-vendor/easyui/themes/metro/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/loading.gif
rename to FHC-vendor/easyui/themes/metro/images/loading.gif
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/menu_arrows.png b/FHC-vendor/easyui/themes/metro/images/menu_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/menu_arrows.png
rename to FHC-vendor/easyui/themes/metro/images/menu_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/messager_icons.png b/FHC-vendor/easyui/themes/metro/images/messager_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/messager_icons.png
rename to FHC-vendor/easyui/themes/metro/images/messager_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/pagination_icons.png b/FHC-vendor/easyui/themes/metro/images/pagination_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/pagination_icons.png
rename to FHC-vendor/easyui/themes/metro/images/pagination_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/panel_tools.png b/FHC-vendor/easyui/themes/metro/images/panel_tools.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/panel_tools.png
rename to FHC-vendor/easyui/themes/metro/images/panel_tools.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/searchbox_button.png b/FHC-vendor/easyui/themes/metro/images/searchbox_button.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/searchbox_button.png
rename to FHC-vendor/easyui/themes/metro/images/searchbox_button.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/slider_handle.png b/FHC-vendor/easyui/themes/metro/images/slider_handle.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/slider_handle.png
rename to FHC-vendor/easyui/themes/metro/images/slider_handle.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png b/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
rename to FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/tabs_icons.png b/FHC-vendor/easyui/themes/metro/images/tabs_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/tabs_icons.png
rename to FHC-vendor/easyui/themes/metro/images/tabs_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/tree_icons.png b/FHC-vendor/easyui/themes/metro/images/tree_icons.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/tree_icons.png
rename to FHC-vendor/easyui/themes/metro/images/tree_icons.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png b/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
rename to FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
diff --git a/vendor/FHC-vendor/easyui/themes/metro/layout.css b/FHC-vendor/easyui/themes/metro/layout.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/layout.css
rename to FHC-vendor/easyui/themes/metro/layout.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/linkbutton.css b/FHC-vendor/easyui/themes/metro/linkbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/linkbutton.css
rename to FHC-vendor/easyui/themes/metro/linkbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/menu.css b/FHC-vendor/easyui/themes/metro/menu.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/menu.css
rename to FHC-vendor/easyui/themes/metro/menu.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/menubutton.css b/FHC-vendor/easyui/themes/metro/menubutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/menubutton.css
rename to FHC-vendor/easyui/themes/metro/menubutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/messager.css b/FHC-vendor/easyui/themes/metro/messager.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/messager.css
rename to FHC-vendor/easyui/themes/metro/messager.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/numberbox.css b/FHC-vendor/easyui/themes/metro/numberbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/numberbox.css
rename to FHC-vendor/easyui/themes/metro/numberbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/pagination.css b/FHC-vendor/easyui/themes/metro/pagination.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/pagination.css
rename to FHC-vendor/easyui/themes/metro/pagination.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/panel.css b/FHC-vendor/easyui/themes/metro/panel.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/panel.css
rename to FHC-vendor/easyui/themes/metro/panel.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/progressbar.css b/FHC-vendor/easyui/themes/metro/progressbar.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/progressbar.css
rename to FHC-vendor/easyui/themes/metro/progressbar.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/propertygrid.css b/FHC-vendor/easyui/themes/metro/propertygrid.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/propertygrid.css
rename to FHC-vendor/easyui/themes/metro/propertygrid.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/searchbox.css b/FHC-vendor/easyui/themes/metro/searchbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/searchbox.css
rename to FHC-vendor/easyui/themes/metro/searchbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/slider.css b/FHC-vendor/easyui/themes/metro/slider.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/slider.css
rename to FHC-vendor/easyui/themes/metro/slider.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/spinner.css b/FHC-vendor/easyui/themes/metro/spinner.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/spinner.css
rename to FHC-vendor/easyui/themes/metro/spinner.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/splitbutton.css b/FHC-vendor/easyui/themes/metro/splitbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/splitbutton.css
rename to FHC-vendor/easyui/themes/metro/splitbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/switchbutton.css b/FHC-vendor/easyui/themes/metro/switchbutton.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/switchbutton.css
rename to FHC-vendor/easyui/themes/metro/switchbutton.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/tabs.css b/FHC-vendor/easyui/themes/metro/tabs.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/tabs.css
rename to FHC-vendor/easyui/themes/metro/tabs.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/textbox.css b/FHC-vendor/easyui/themes/metro/textbox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/textbox.css
rename to FHC-vendor/easyui/themes/metro/textbox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/tooltip.css b/FHC-vendor/easyui/themes/metro/tooltip.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/tooltip.css
rename to FHC-vendor/easyui/themes/metro/tooltip.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/tree.css b/FHC-vendor/easyui/themes/metro/tree.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/tree.css
rename to FHC-vendor/easyui/themes/metro/tree.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/validatebox.css b/FHC-vendor/easyui/themes/metro/validatebox.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/validatebox.css
rename to FHC-vendor/easyui/themes/metro/validatebox.css
diff --git a/vendor/FHC-vendor/easyui/themes/metro/window.css b/FHC-vendor/easyui/themes/metro/window.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/metro/window.css
rename to FHC-vendor/easyui/themes/metro/window.css
diff --git a/vendor/FHC-vendor/easyui/themes/mobile.css b/FHC-vendor/easyui/themes/mobile.css
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/mobile.css
rename to FHC-vendor/easyui/themes/mobile.css
diff --git a/vendor/FHC-vendor/easyui/themes/vilesci b/FHC-vendor/easyui/themes/vilesci
similarity index 100%
rename from vendor/FHC-vendor/easyui/themes/vilesci
rename to FHC-vendor/easyui/themes/vilesci
diff --git a/vendor/FHC-vendor/jquery-tablesorter/.gitattributes b/FHC-vendor/jquery-tablesorter/.gitattributes
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/.gitattributes
rename to FHC-vendor/jquery-tablesorter/.gitattributes
diff --git a/vendor/FHC-vendor/jquery-tablesorter/.gitignore b/FHC-vendor/jquery-tablesorter/.gitignore
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/.gitignore
rename to FHC-vendor/jquery-tablesorter/.gitignore
diff --git a/vendor/FHC-vendor/jquery-tablesorter/.jscsrc b/FHC-vendor/jquery-tablesorter/.jscsrc
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/.jscsrc
rename to FHC-vendor/jquery-tablesorter/.jscsrc
diff --git a/vendor/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md b/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
rename to FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
diff --git a/vendor/FHC-vendor/jquery-tablesorter/Gruntfile.js b/FHC-vendor/jquery-tablesorter/Gruntfile.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/Gruntfile.js
rename to FHC-vendor/jquery-tablesorter/Gruntfile.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/README.md b/FHC-vendor/jquery-tablesorter/README.md
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/README.md
rename to FHC-vendor/jquery-tablesorter/README.md
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
rename to FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
rename to FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif b/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
rename to FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
rename to FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
rename to FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
rename to FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
rename to FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
rename to FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
rename to FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js b/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
rename to FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js b/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
rename to FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/bower.json b/FHC-vendor/jquery-tablesorter/bower.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/bower.json
rename to FHC-vendor/jquery-tablesorter/bower.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/changelog.txt b/FHC-vendor/jquery-tablesorter/changelog.txt
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/changelog.txt
rename to FHC-vendor/jquery-tablesorter/changelog.txt
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/bootstrap.less b/FHC-vendor/jquery-tablesorter/css/bootstrap.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/bootstrap.less
rename to FHC-vendor/jquery-tablesorter/css/bootstrap.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css b/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
rename to FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/filter.formatter.css b/FHC-vendor/jquery-tablesorter/css/filter.formatter.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/filter.formatter.css
rename to FHC-vendor/jquery-tablesorter/css/filter.formatter.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
rename to FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
rename to FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
rename to FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
rename to FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
rename to FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
rename to FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
rename to FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
rename to FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/css/images/green-header.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/green-header.gif
rename to FHC-vendor/jquery-tablesorter/css/images/green-header.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
rename to FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
rename to FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
rename to FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
rename to FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
rename to FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
rename to FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
rename to FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/metro.less b/FHC-vendor/jquery-tablesorter/css/metro.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/metro.less
rename to FHC-vendor/jquery-tablesorter/css/metro.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
rename to FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
rename to FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
rename to FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd b/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
rename to FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css b/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
rename to FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.blue.css b/FHC-vendor/jquery-tablesorter/css/theme.blue.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.blue.css
rename to FHC-vendor/jquery-tablesorter/css/theme.blue.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
rename to FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
rename to FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.dark.css b/FHC-vendor/jquery-tablesorter/css/theme.dark.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.dark.css
rename to FHC-vendor/jquery-tablesorter/css/theme.dark.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css b/FHC-vendor/jquery-tablesorter/css/theme.default.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css
rename to FHC-vendor/jquery-tablesorter/css/theme.default.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css b/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
rename to FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.green.css b/FHC-vendor/jquery-tablesorter/css/theme.green.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.green.css
rename to FHC-vendor/jquery-tablesorter/css/theme.green.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.grey.css b/FHC-vendor/jquery-tablesorter/css/theme.grey.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.grey.css
rename to FHC-vendor/jquery-tablesorter/css/theme.grey.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.ice.css b/FHC-vendor/jquery-tablesorter/css/theme.ice.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.ice.css
rename to FHC-vendor/jquery-tablesorter/css/theme.ice.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.jui.css b/FHC-vendor/jquery-tablesorter/css/theme.jui.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.jui.css
rename to FHC-vendor/jquery-tablesorter/css/theme.jui.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.less b/FHC-vendor/jquery-tablesorter/css/theme.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.less
rename to FHC-vendor/jquery-tablesorter/css/theme.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css b/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
rename to FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css b/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css b/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/first.png b/FHC-vendor/jquery-tablesorter/dist/css/images/first.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/first.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/first.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/last.png b/FHC-vendor/jquery-tablesorter/dist/css/images/last.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/last.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/last.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/next.png b/FHC-vendor/jquery-tablesorter/dist/css/images/next.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/next.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/next.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png b/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
rename to FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
rename to FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css b/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less b/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
rename to FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less b/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
rename to FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less b/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
rename to FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
rename to FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
rename to FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/City0.json b/FHC-vendor/jquery-tablesorter/docs/assets/City0.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/City0.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/City0.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/City1.json b/FHC-vendor/jquery-tablesorter/docs/assets/City1.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/City1.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/City1.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/City2.json b/FHC-vendor/jquery-tablesorter/docs/assets/City2.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/City2.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/City2.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/City3.json b/FHC-vendor/jquery-tablesorter/docs/assets/City3.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/City3.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/City3.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html b/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
rename to FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/build.json b/FHC-vendor/jquery-tablesorter/docs/assets/build.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/build.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/build.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/build.txt b/FHC-vendor/jquery-tablesorter/docs/assets/build.txt
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/build.txt
rename to FHC-vendor/jquery-tablesorter/docs/assets/build.txt
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json b/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
rename to FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
rename to FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
rename to FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
rename to FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/jq.css b/FHC-vendor/jquery-tablesorter/docs/css/jq.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/jq.css
rename to FHC-vendor/jquery-tablesorter/docs/css/jq.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css b/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
rename to FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css b/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
rename to FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/menu.css b/FHC-vendor/jquery-tablesorter/docs/css/menu.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/menu.css
rename to FHC-vendor/jquery-tablesorter/docs/css/menu.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/prettify.css b/FHC-vendor/jquery-tablesorter/docs/css/prettify.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/prettify.css
rename to FHC-vendor/jquery-tablesorter/docs/css/prettify.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css b/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
rename to FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css b/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
rename to FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif b/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
rename to FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/select2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/select2.png
rename to FHC-vendor/jquery-tablesorter/docs/css/select2.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
rename to FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css b/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
rename to FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
rename to FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-ajax.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-ajax.html
rename to FHC-vendor/jquery-tablesorter/docs/example-ajax.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html b/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
rename to FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
rename to FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
rename to FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html b/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
rename to FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html b/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
rename to FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html b/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
rename to FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html b/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
rename to FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html b/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
rename to FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
rename to FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
rename to FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html b/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
rename to FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
rename to FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html b/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html b/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html b/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html b/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html b/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html b/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html b/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html b/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
rename to FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
rename to FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
rename to FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
rename to FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
rename to FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
rename to FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
rename to FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-pager.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-pager.html
rename to FHC-vendor/jquery-tablesorter/docs/example-pager.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-parsers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-parsers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
rename to FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-triggers.html b/FHC-vendor/jquery-tablesorter/docs/example-triggers.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-triggers.html
rename to FHC-vendor/jquery-tablesorter/docs/example-triggers.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-update-all.html b/FHC-vendor/jquery-tablesorter/docs/example-update-all.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-update-all.html
rename to FHC-vendor/jquery-tablesorter/docs/example-update-all.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html b/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
rename to FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/example-widgets.html b/FHC-vendor/jquery-tablesorter/docs/example-widgets.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/example-widgets.html
rename to FHC-vendor/jquery-tablesorter/docs/example-widgets.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
rename to FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
rename to FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
rename to FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
rename to FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2 b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
rename to FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/external.png b/FHC-vendor/jquery-tablesorter/docs/img/external.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/external.png
rename to FHC-vendor/jquery-tablesorter/docs/img/external.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png b/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
rename to FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/link.png b/FHC-vendor/jquery-tablesorter/docs/img/link.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/link.png
rename to FHC-vendor/jquery-tablesorter/docs/img/link.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
rename to FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
rename to FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png b/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
rename to FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/img/screens.png b/FHC-vendor/jquery-tablesorter/docs/img/screens.png
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/img/screens.png
rename to FHC-vendor/jquery-tablesorter/docs/img/screens.png
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/index.html b/FHC-vendor/jquery-tablesorter/docs/index.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/index.html
rename to FHC-vendor/jquery-tablesorter/docs/index.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js b/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
rename to FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
rename to FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js b/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
rename to FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/docs.js b/FHC-vendor/jquery-tablesorter/docs/js/docs.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/docs.js
rename to FHC-vendor/jquery-tablesorter/docs/js/docs.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/prettify.js b/FHC-vendor/jquery-tablesorter/docs/js/prettify.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/prettify.js
rename to FHC-vendor/jquery-tablesorter/docs/js/prettify.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js b/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js b/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
rename to FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/search.js b/FHC-vendor/jquery-tablesorter/docs/js/search.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/search.js
rename to FHC-vendor/jquery-tablesorter/docs/js/search.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js b/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
rename to FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/docs/themes.html b/FHC-vendor/jquery-tablesorter/docs/themes.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/docs/themes.html
rename to FHC-vendor/jquery-tablesorter/docs/themes.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/example.json b/FHC-vendor/jquery-tablesorter/example.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/example.json
rename to FHC-vendor/jquery-tablesorter/example.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/index.html b/FHC-vendor/jquery-tablesorter/index.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/index.html
rename to FHC-vendor/jquery-tablesorter/index.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
rename to FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
rename to FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js b/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
rename to FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/extras/semver.js b/FHC-vendor/jquery-tablesorter/js/extras/semver.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/extras/semver.js
rename to FHC-vendor/jquery-tablesorter/js/extras/semver.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
rename to FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
rename to FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
rename to FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
rename to FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
rename to FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/package.json b/FHC-vendor/jquery-tablesorter/package.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/package.json
rename to FHC-vendor/jquery-tablesorter/package.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json b/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
rename to FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
diff --git a/vendor/FHC-vendor/jquery-tablesorter/test.html b/FHC-vendor/jquery-tablesorter/test.html
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/test.html
rename to FHC-vendor/jquery-tablesorter/test.html
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
rename to FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
rename to FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js b/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
rename to FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js b/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
rename to FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/testing.css b/FHC-vendor/jquery-tablesorter/testing/testing.css
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/testing.css
rename to FHC-vendor/jquery-tablesorter/testing/testing.css
diff --git a/vendor/FHC-vendor/jquery-tablesorter/testing/testing.js b/FHC-vendor/jquery-tablesorter/testing/testing.js
similarity index 100%
rename from vendor/FHC-vendor/jquery-tablesorter/testing/testing.js
rename to FHC-vendor/jquery-tablesorter/testing/testing.js
diff --git a/application/config/constants.php b/application/config/constants.php
index ac2ecc649..ef4cdaf2c 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -64,7 +64,9 @@ define('LDAP_TOO_MANY_USER_DN',		11);
 |--------------------------------------------------------------------------
 */
 define('LANG_SESSION_NAME', 'LANGUAGE');
-define('LANG_SESSION_INDEXES', 'LANGUAGE_INDEXES');
+define('LANG_SESSION_INDEXES', 'INDEXES');
+define('LANG_SESSION_ACTIVE_LANGUAGES', 'ACTIVE_LANGUAGES');
+define('LANG_SESSION_CURRENT_LANGUAGE', 'sprache'); // NOTE: it is not under LANG_SESSION_NAME
 
 /*
 |--------------------------------------------------------------------------
@@ -125,37 +127,25 @@ define('EMAIL_CONFIG_INDEX', 'mail');
 | Messaging system constants
 |--------------------------------------------------------------------------
 */
-// Email kontakt type
-define('EMAIL_KONTAKT_TYPE', 'email');
-// tbl_msg_recipient->sentInfo separator
-define('SENT_INFO_NEWLINE', '\n');
-
 // Message statuses
 define('MSG_STATUS_UNREAD',		0);
 define('MSG_STATUS_READ',		1);
 define('MSG_STATUS_ARCHIVED',	2);
 define('MSG_STATUS_DELETED',	3);
 
-// Priority
-define('PRIORITY_LOW',		1);
-define('PRIORITY_NORMAL',	2);
-define('PRIORITY_HIGH',		3);
-define('PRIORITY_URGENT',	4);
+// Message priorities
+define('MSG_PRIORITY_LOW',		1);
+define('MSG_PRIORITY_NORMAL',	2);
+define('MSG_PRIORITY_HIGH',		3);
+define('MSG_PRIORITY_URGENT',	4);
 
-define('MSG_ERR_SUBJECT_EMPTY',			40);
-define('MSG_ERR_BODY_EMPTY',			41);
-define('MSG_ERR_TEMPLATE_NOT_FOUND',	42);
-define('MSG_ERR_DELIVERY_MESSAGE',		43);
-define('MSG_ERR_CONTACT_NOT_FOUND',		44);
-define('MSG_ERR_OU_CONTACTS_NOT_FOUND',	45);
-
-define('MSG_ERR_INVALID_USER_ID',		100);
-define('MSG_ERR_INVALID_MSG_ID',		101);
-define('MSG_ERR_INVALID_THREAD_ID',		102);
-define('MSG_ERR_INVALID_STATUS_ID',		103);
-define('MSG_ERR_INVALID_SENDER_ID',		104);
-define('MSG_ERR_INVALID_RECIPIENTS',	105);
-define('MSG_ERR_INVALID_RECEIVER_ID',	106);
-define('MSG_ERR_INVALID_OU',			107);
-define('MSG_ERR_INVALID_TEMPLATE',		108);
-define('MSG_ERR_INVALID_TOKEN',			109);
+// Message error status
+define('MSG_ERR_INVALID_SUBJECT',		40);
+define('MSG_ERR_INVALID_BODY',			41);
+define('MSG_ERR_INVALID_TEMPLATE',		42);
+define('MSG_ERR_INVALID_MSG_ID',		43);
+define('MSG_ERR_INVALID_STATUS_ID',		44);
+define('MSG_ERR_INVALID_SENDER',		45);
+define('MSG_ERR_INVALID_RECIPIENTS',	46);
+define('MSG_ERR_INVALID_OU',			47);
+define('MSG_ERR_INVALID_TOKEN',			48);
diff --git a/application/config/mail.php b/application/config/mail.php
index 2163bc122..9d577720d 100644
--- a/application/config/mail.php
+++ b/application/config/mail.php
@@ -29,3 +29,6 @@ $config['wrapchars'] = 76; // Character count to wrap at.
 $config['mailtype'] = 'html'; // html or text
 $config['priority'] = 3; // Email Priority. 1 = highest. 5 = lowest. 3 = normal
 $config['validate'] = false; // If true then the email address will be validated
+
+// If enabled will be logged info about emails in Codeigniter error logs
+$config['enable_debug'] = false;
diff --git a/application/config/message.php b/application/config/message.php
index 40d15a07e..35d34124b 100644
--- a/application/config/message.php
+++ b/application/config/message.php
@@ -7,13 +7,19 @@ $config['send_immediately'] = false;
 
 $config['msg_delivery'] = true; // Default true
 $config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
-$config['redirect_view_message_url'] = '/Redirect/redirectByToken/';
-$config['message_html_view_url'] = '/ViewMessage/toHTML/';
+$config['redirect_view_message_url'] = '/system/messages/ViewMessage/redirectByToken/';
+$config['message_html_view_url'] = '/system/messages/ViewMessage/toHTML/';
 
 // Change this to CIS Server (https://cis.example.com/index.ci.php) if you are sending Messages from Vilesci
 $config['message_server'] = site_url();
-$config['assistent_function'] = 'ass';
+// Organization unit function that are allowed to read messages for the organisation unit
+$config['ou_receivers'] = array('ass');
+// Organization units that will never receive notice emails
+$config['ou_receivers_no_notice'] = array('infocenter');
+// Organization units that will not send the notice email to the internal account, but to the private one
+$config['ou_receivers_private'] = array('eac', 'ewu', 'scs');
 
 $config['message_redirect_url'] = array();
-$config['message_redirect_url']['fallback'] = site_url('ViewMessage/writeReply');
-// $config['message_redirect_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';
+$config['message_redirect_url']['fallback'] = site_url('system/messages/ViewMessage/writeReply');
+// $config['message_redirect_url']['OE_ROOT_1'] = 'https://<server name>/addons/aufnahme/OE_ROOT/cis/index.php';
+// $config['message_redirect_url']['OE_ROOT_2'] = 'https://<server name>/<where ever you like to land to a message reply page>';
diff --git a/application/config/navigation.php b/application/config/navigation.php
index 9253c87a1..a89c259ee 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -72,11 +72,18 @@ $config['navigation_header'] = array(
 			'sort' => 40,
 			'requiredPermissions' => 'basis/vilesci:r',
 			'children'=> array(
+				'messages' => array(
+					'link' => site_url('system/messages/MessageClient/read'),
+					'icon' => '',
+					'target' => '_blank',
+					'description' => 'Messages',
+					'sort' => 10,
+				),
 				'bpk' => array(
 					'link' => site_url('person/BPKWartung'),
 					'icon' => '',
 					'description' => 'BPK Wartung',
-					'sort' => 10,
+					'sort' => 20,
 					'requiredPermissions' => 'admin:r'
 				)
 			)
diff --git a/application/controllers/MailJob.php b/application/controllers/MailJob.php
deleted file mode 100644
index 2f8b5b92d..000000000
--- a/application/controllers/MailJob.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class MailJob extends Auth_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		// An empty array as parameter will ensure that this controller is ONLY callable from command line
-		parent::__construct(array());
-
-		// Loads MessageLib
-		$this->load->library('MessageLib');
-	}
-
-	public function sendMessages($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null)
-	{
-		$this->messagelib->sendAll($numberToSent, $numberPerTimeRange, $email_time_range, $email_from_system);
-	}
-}
diff --git a/application/controllers/Redirect.php b/application/controllers/Redirect.php
deleted file mode 100644
index 8a24c590d..000000000
--- a/application/controllers/Redirect.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class Redirect extends FHC_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Loads model MessageTokenModel
-		$this->load->model('system/MessageToken_model', 'MessageTokenModel');
-	}
-
-	/**
-	 * redirectByToken
-	 *
-	 * - Loads the message using a token
-	 * - Loads the root of the organisation unit tree using the oe_kurzbz present in the message
-	 * - Redirect to the aufnahme related to the found organisation unit
-	 */
-	public function redirectByToken($token)
-	{
-		$msg = $this->MessageTokenModel->getMessageByToken($token);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-
-		$oe_kurzbz = $msg->retval[0]->oe_kurzbz;
-
-		if ($oe_kurzbz != null && $oe_kurzbz != '')
-		{
-			$organisationRoot = null;
-
-			$getOERoot = $this->MessageTokenModel->getOERoot($oe_kurzbz);
-			if (isSuccess($getOERoot)) // If no errors occurred
-			{
-				$organisationRoot = $getOERoot->retval;
-			}
-			else
-			{
-				show_error('No organisation unit present in the message');
-			}
-
-			$addonAufnahmeUrls = $this->config->item('message_redirect_url');
-			if(!isset($addonAufnahmeUrls[$organisationRoot]))
-				$organisationRoot = 'fallback';
-
-			if (isset($token)
-				&& hasData($msg)
-				&& is_array($addonAufnahmeUrls)
-				&& $organisationRoot != null
-				&& isset($addonAufnahmeUrls[$organisationRoot]))
-			{
-				redirect($addonAufnahmeUrls[$organisationRoot] . '?token=' . $token);
-			}
-		}
-		else
-		{
-			$addonAufnahmeUrls = $this->config->item('message_redirect_url');
-			if (isset($token)
-				&& hasData($msg)
-				&& is_array($addonAufnahmeUrls)
-				&& isset($addonAufnahmeUrls['fallback']))
-			{
-				redirect($addonAufnahmeUrls['fallback'] . '?token=' . $token);
-			}
-		}
-	}
-}
diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php
deleted file mode 100644
index 3c22c8977..000000000
--- a/application/controllers/ViewMessage.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Handles sending messages with token
- * NOTE: in this controller is not possible to include/call everything
- * that automatically call the authentication system, like the most of models or libraries
- */
-class ViewMessage extends FHC_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Loading config file message
-		$this->config->load('message');
-
-		// Load model MessageToken_model, not calling the authentication system
-		$this->load->model('system/MessageToken_model', 'MessageTokenModel');
-		$this->load->model('CL/Messages_model', 'CLMessagesModel');
-	}
-
-	/**
-	 * Using the MessageTokenModel instead of MessageLib to allow
-	 * viewing the message without prompting the login
-	 */
-	public function toHTML($token)
-	{
-		$msg = $this->MessageTokenModel->getMessageByToken($token);
-
-		if ($msg->error)
-		{
-			show_error(getData($msg));
-		}
-
-		if (is_array(getData($msg)) && count(getData($msg)) > 0)
-		{
-			$setReadMessageStatusByToken = $this->MessageTokenModel->setReadMessageStatusByToken($token);
-
-			if (isError($setReadMessageStatusByToken))
-			{
-				show_error($msg->$setReadMessageStatusByToken);
-			}
-
-			$sender_id = getData($msg)[0]->sender_id;
-			$receiver_id = getData($msg)[0]->receiver_id;
-			$sender = $this->MessageTokenModel->getSenderData($sender_id);
-
-			// To decide how to change the redirection
-			$isEmployee = $this->MessageTokenModel->isEmployee($receiver_id);
-			if (!is_bool($isEmployee) && isError($isEmployee))
-			{
-				show_error($isEmployee);
-			}
-
-			if($this->config->item('redirect_view_message_url') != '')
-				$href = $this->config->item('message_server').$this->config->item('redirect_view_message_url').$token;
-			else
-				$href = '';
-
-			$data = array (
-				'sender_id' => $sender_id,
-				'sender' => getData($sender)[0],
-				'message' => getData($msg)[0],
-				'isEmployee' => $isEmployee,
-				'href' => $href
-			);
-
-			$this->load->view('system/messages/messageHTML.php', $data);
-		}
-	}
-
-	/**
-	 * write the reply
-	 */
-	public function writeReply()
-	{
-		$token = $this->input->get('token');
-
-		if (isEmptyString($token))
-		{
-			show_error('No token supplied');
-		}
-
-		$msg = null;
-
-		// Get message data if possible
-		$msg = $this->MessageTokenModel->getMessageByToken($token);
-		if (!hasData($msg))
-		{
-			show_error('No message found');
-		}
-
-		$msg = getData($msg)[0];
-
-		// Get variables
-		$receiverData = $this->MessageTokenModel->getPersonData($msg->sender_id);
-		if (!hasData($receiverData))
-		{
-			show_error('No sender found');
-		}
-
-		$data = array (
-			'receivers' => getData($receiverData),
-			'message' => $msg,
-			'token' => $token
-		);
-
-		$this->load->view('system/messages/messageWriteReply', $data);
-	}
-
-	/**
-	 * Send a reply
-	 */
-	public function sendReply()
-	{
-		$subject = $this->input->post('subject');
-		$body = $this->input->post('body');
-		$persons = $this->input->post('persons');
-		$relationmessage_id = $this->input->post('relationmessage_id');
-		$token = $this->input->post('token');
-
-		if (!isset($relationmessage_id) || $relationmessage_id == '' || !isset($token) || $token == '')
-		{
-			show_error('Error while sending reply');
-		}
-
-		$sendReply = $this->CLMessagesModel->sendReply($subject, $body, $persons, $relationmessage_id, $token);
-		if (isError($sendReply))
-		{
-			show_error(getData($sendReply));
-		}
-
-		$this->load->view('system/messages/messageReplySent');
-	}
-}
diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
index c8c95ae06..ca8a66bea 100644
--- a/application/controllers/api/v1/person/Person.php
+++ b/application/controllers/api/v1/person/Person.php
@@ -1,267 +1,267 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class Person extends APIv1_Controller
-{
-	/**
-	 * Person API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct(array('Person' => 'basis/person:rw', 'CheckBewerbung' => 'basis/person:r'));
-		// Load model PersonModel
-		$this->load->model('person/person_model', 'PersonModel');
-	}
-
-	/**
-	 * @return void
-	 */
-	public function getPerson()
-	{
-		$person_id = $this->get('person_id');
-		$code = $this->get('code');
-		$email = $this->get('email');
-
-		if (isset($code) || isset($email) || isset($person_id))
-		{
-			if (isset($code) && isset($email))
-			{
-				$result = $this->PersonModel->getPersonKontaktByZugangscode($code, $email);
-			}
-			else
-			{
-				$parametersArray = array();
-
-				if (isset($code))
-				{
-					$parametersArray['zugangscode'] = $code;
-				}
-				else
-				{
-					$parametersArray['person_id'] = $person_id;
-				}
-
-				$result = $this->PersonModel->loadWhere($parametersArray);
-			}
-
-			$this->response($result, REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->response();
-		}
-	}
-
-	/**
-	 * @return void
-	 */
-	public function getCheckBewerbung()
-	{
-		$email = $this->get('email');
-		$studiensemester_kurzbz = $this->get('studiensemester_kurzbz');
-
-		if (isset($email))
-		{
-			$result = $this->PersonModel->checkBewerbung($email, $studiensemester_kurzbz);
-
-			$this->response($result, REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->response();
-		}
-	}
-
-	/**
-	 * @return void
-	 */
-	public function postPerson()
-	{
-		$person = $this->post();
-		$validation = $this->_validate($person);
-
-		if (isSuccess($validation))
-		{
-			if(isset($person['person_id']) && !(is_null($person['person_id'])) && ($person['person_id'] != ''))
-			{
-				$result = $this->PersonModel->updatePerson($person);
-			}
-			else
-			{
-				$result = $this->PersonModel->insert($person);
-			}
-
-			$this->response($result, REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->response($validation, REST_Controller::HTTP_OK);
-		}
-	}
-
-	private function _validate($person)
-	{
-		// If $person is consistent
-		if (!isset($person) || (isset($person) && !is_array($person)))
-		{
-			return error('Any parameters posted');
-		}
-
-		// Trim all the values
-		foreach($person as $key => $value)
-		{
-			if (gettype($value) == 'string')
-			{
-				$person[$key] = trim($value);
-			}
-		}
-
-		if (isset($person['sprache']) && mb_strlen($person['sprache']) > 16)
-		{
-			return error('Sprache darf nicht laenger als 16 Zeichen sein');
-		}
-		if (isset($person['anrede']) && mb_strlen($person['anrede']) > 16)
-		{
-			return error('Anrede darf nicht laenger als 16 Zeichen sein');
-		}
-		if (isset($person['titelpost']) && mb_strlen($person['titelpost']) > 32)
-		{
-			return error('Titelpost darf nicht laenger als 32 Zeichen sein');
-		}
-		if (isset($person['titelpre']) && mb_strlen($person['titelpre']) > 64)
-		{
-			return error('Titelpre darf nicht laenger als 64 Zeichen sein');
-		}
-		if (isset($person['nachname']) && mb_strlen($person['nachname']) > 64)
-		{
-			return error('Nachname darf nicht laenger als 64 Zeichen sein');
-		}
-		if (isset($person['nachname']) && ($person['nachname'] == '' || is_null($person['nachname'])))
-		{
-			return error('Nachname muss eingegeben werden');
-		}
-		if (isset($person['vorname']) && mb_strlen($person['vorname']) > 32)
-		{
-			return error('Vorname darf nicht laenger als 32 Zeichen sein');
-		}
-		if (isset($person['vornamen']) && mb_strlen($person['vornamen']) > 128)
-		{
-			return error('Vornamen darf nicht laenger als 128 Zeichen sein');
-		}
-		if (isset($person['gebort']) && mb_strlen($person['gebort']) > 128)
-		{
-			return error('Geburtsort darf nicht laenger als 128 Zeichen sein');
-		}
-		if (isset($person['homepage']) && mb_strlen($person['homepage']) > 256)
-		{
-			return error('Homepage darf nicht laenger als 256 Zeichen sein');
-		}
-		if (isset($person['matr_nr']) && mb_strlen($person['matr_nr']) > 32)
-		{
-			return error('Matrikelnummer darf nicht laenger als 32 Zeichen sein');
-		}
-		if (isset($person['ersatzkennzeichen']) && mb_strlen($person['ersatzkennzeichen']) > 10)
-		{
-			return error('Ersatzkennzeichen darf nicht laenger als 10 Zeichen sein');
-		}
-		if (isset($person['familienstand']) && mb_strlen($person['familienstand']) > 1)
-		{
-			return error('Familienstand ist ungueltig');
-		}
-		if (isset($person['anzahlkinder']) && $person['anzahlkinder'] != '' && !is_numeric($person['anzahlkinder']))
-		{
-			return error('Anzahl der Kinder ist ungueltig');
-		}
-		if (!isset($person['aktiv']) || (isset($person['aktiv']) && $person['aktiv'] !== true && $person['aktiv'] !== false))
-		{
-			return error('Aktiv ist ungueltig');
-		}
-		if (!isset($person['person_id']) && isset($person['insertvon']) && mb_strlen($person['insertvon']) > 32)
-		{
-			return error('Insertvon darf nicht laenger als 32 Zeichen sein');
-		}
-		if (isset($person['updatevon']) && mb_strlen($person['updatevon']) > 32)
-		{
-			return error('Updatevon darf nicht laenger als 32 Zeichen sein');
-		}
-		if (isset($person['geburtsnation']) && mb_strlen($person['geburtsnation']) > 3)
-		{
-			return error('Geburtsnation darf nicht laenger als 3 Zeichen sein');
-		}
-		if (isset($person['staatsbuergerschaft']) && mb_strlen($person['staatsbuergerschaft']) > 3)
-		{
-			return error('Staatsbuergerschaft darf nicht laenger als 3 Zeichen sein');
-		}
-		if (!isset($person['geschlecht']) || (isset($person['geschlecht']) && mb_strlen($person['geschlecht']) > 1))
-		{
-			return error('Geschlecht darf nicht laenger als 1 Zeichen sein');
-		}
-		if (isset($person['geschlecht']) && $person['geschlecht'] != 'm' && $person['geschlecht'] != 'w' && $person['geschlecht'] != 'u')
-		{
-			return error('Geschlecht muss w, m oder u sein!');
-		}
-
-		if (isset($person['svnr']))
-		{
-			if ($person['svnr'] != '' && mb_strlen($person['svnr']) != 16
-				&& mb_strlen($person['svnr']) != 12 && mb_strlen($person['svnr']) != 10)
-			{
-				return error('SVNR muss 10, 12 oder 16 Zeichen lang sein');
-			}
-			if (mb_strlen($person['svnr']) == 10 || mb_strlen($person['svnr']) == 12)
-			{
-				//SVNR mit Pruefziffer pruefen
-				//Die 4. Stelle in der SVNR ist die Pruefziffer
-				//(Summe von (gewichtung[i]*svnr[i])) modulo 11 ergibt diese Pruefziffer
-				//Falls nicht, ist die SVNR ungueltig
-				$gewichtung = array(3, 7, 9, 0, 5, 8, 4, 2, 1, 6);
-				$erg = 0;
-				$tmpSvnr = substr($person['svnr'], 0, 10);
-				//Quersumme bilden
-				for ($i = 0; $i < 10; $i++)
-				{
-					$erg += $gewichtung[$i] * $tmpSvnr{$i};
-				}
-
-				if ($tmpSvnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
-				{
-					return error('SVNR ist ungueltig');
-				}
-
-				if (mb_strlen($person['svnr']) == 12)
-				{
-					$last = substr($person['svnr'], 10, 12);
-					if ($last{0} != 'v' || !is_numeric($last{1}))
-					{
-						return error('SVNR ist ungueltig');
-					}
-				}
-			}
-
-			//Pruefen ob das Geburtsdatum mit der SVNR uebereinstimmt.
-			if (isset($person['gebdatum']) && $person['svnr'] != '' && $person['gebdatum'] != '')
-			{
-				if (!mb_ereg('([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})', $person['gebdatum'])
-					&& !mb_ereg('([0-9]{4})-([0-9]{2})-([0-9]{2})', $person['gebdatum']))
-				{
-					return error('Format des Geburtsdatums ist ungueltig');
-				}
-			}
-		}
-
-		return success('Input data are valid');
-	}
-}
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Person extends APIv1_Controller
+{
+	/**
+	 * Person API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(array('Person' => 'basis/person:rw', 'CheckBewerbung' => 'basis/person:r'));
+		// Load model PersonModel
+		$this->load->model('person/person_model', 'PersonModel');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function getPerson()
+	{
+		$person_id = $this->get('person_id');
+		$code = $this->get('code');
+		$email = $this->get('email');
+
+		if (isset($code) || isset($email) || isset($person_id))
+		{
+			if (isset($code) && isset($email))
+			{
+				$result = $this->PersonModel->getPersonKontaktByZugangscode($code, $email);
+			}
+			else
+			{
+				$parametersArray = array();
+
+				if (isset($code))
+				{
+					$parametersArray['zugangscode'] = $code;
+				}
+				else
+				{
+					$parametersArray['person_id'] = $person_id;
+				}
+
+				$result = $this->PersonModel->loadWhere($parametersArray);
+			}
+
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function getCheckBewerbung()
+	{
+		$email = $this->get('email');
+		$studiensemester_kurzbz = $this->get('studiensemester_kurzbz');
+
+		if (isset($email))
+		{
+			$result = $this->PersonModel->checkBewerbung($email, $studiensemester_kurzbz);
+
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function postPerson()
+	{
+		$person = $this->post();
+		$validation = $this->_validate($person);
+
+		if (isSuccess($validation))
+		{
+			if(isset($person['person_id']) && !(is_null($person['person_id'])) && ($person['person_id'] != ''))
+			{
+				$result = $this->PersonModel->updatePerson($person);
+			}
+			else
+			{
+				$result = $this->PersonModel->insert($person);
+			}
+
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response($validation, REST_Controller::HTTP_OK);
+		}
+	}
+
+	private function _validate($person)
+	{
+		// If $person is consistent
+		if (!isset($person) || (isset($person) && !is_array($person)))
+		{
+			return error('Any parameters posted');
+		}
+
+		// Trim all the values
+		foreach($person as $key => $value)
+		{
+			if (gettype($value) == 'string')
+			{
+				$person[$key] = trim($value);
+			}
+		}
+
+		if (isset($person['sprache']) && mb_strlen($person['sprache']) > 16)
+		{
+			return error('Sprache darf nicht laenger als 16 Zeichen sein');
+		}
+		if (isset($person['anrede']) && mb_strlen($person['anrede']) > 16)
+		{
+			return error('Anrede darf nicht laenger als 16 Zeichen sein');
+		}
+		if (isset($person['titelpost']) && mb_strlen($person['titelpost']) > 32)
+		{
+			return error('Titelpost darf nicht laenger als 32 Zeichen sein');
+		}
+		if (isset($person['titelpre']) && mb_strlen($person['titelpre']) > 64)
+		{
+			return error('Titelpre darf nicht laenger als 64 Zeichen sein');
+		}
+		if (isset($person['nachname']) && mb_strlen($person['nachname']) > 64)
+		{
+			return error('Nachname darf nicht laenger als 64 Zeichen sein');
+		}
+		if (isset($person['nachname']) && ($person['nachname'] == '' || is_null($person['nachname'])))
+		{
+			return error('Nachname muss eingegeben werden');
+		}
+		if (isset($person['vorname']) && mb_strlen($person['vorname']) > 32)
+		{
+			return error('Vorname darf nicht laenger als 32 Zeichen sein');
+		}
+		if (isset($person['vornamen']) && mb_strlen($person['vornamen']) > 128)
+		{
+			return error('Vornamen darf nicht laenger als 128 Zeichen sein');
+		}
+		if (isset($person['gebort']) && mb_strlen($person['gebort']) > 128)
+		{
+			return error('Geburtsort darf nicht laenger als 128 Zeichen sein');
+		}
+		if (isset($person['homepage']) && mb_strlen($person['homepage']) > 256)
+		{
+			return error('Homepage darf nicht laenger als 256 Zeichen sein');
+		}
+		if (isset($person['matr_nr']) && mb_strlen($person['matr_nr']) > 32)
+		{
+			return error('Matrikelnummer darf nicht laenger als 32 Zeichen sein');
+		}
+		if (isset($person['ersatzkennzeichen']) && mb_strlen($person['ersatzkennzeichen']) > 10)
+		{
+			return error('Ersatzkennzeichen darf nicht laenger als 10 Zeichen sein');
+		}
+		if (isset($person['familienstand']) && mb_strlen($person['familienstand']) > 1)
+		{
+			return error('Familienstand ist ungueltig');
+		}
+		if (isset($person['anzahlkinder']) && $person['anzahlkinder'] != '' && !is_numeric($person['anzahlkinder']))
+		{
+			return error('Anzahl der Kinder ist ungueltig');
+		}
+		if (!isset($person['aktiv']) || (isset($person['aktiv']) && $person['aktiv'] !== true && $person['aktiv'] !== false))
+		{
+			return error('Aktiv ist ungueltig');
+		}
+		if (!isset($person['person_id']) && isset($person['insertvon']) && mb_strlen($person['insertvon']) > 32)
+		{
+			return error('Insertvon darf nicht laenger als 32 Zeichen sein');
+		}
+		if (isset($person['updatevon']) && mb_strlen($person['updatevon']) > 32)
+		{
+			return error('Updatevon darf nicht laenger als 32 Zeichen sein');
+		}
+		if (isset($person['geburtsnation']) && mb_strlen($person['geburtsnation']) > 3)
+		{
+			return error('Geburtsnation darf nicht laenger als 3 Zeichen sein');
+		}
+		if (isset($person['staatsbuergerschaft']) && mb_strlen($person['staatsbuergerschaft']) > 3)
+		{
+			return error('Staatsbuergerschaft darf nicht laenger als 3 Zeichen sein');
+		}
+		if (!isset($person['geschlecht']) || (isset($person['geschlecht']) && mb_strlen($person['geschlecht']) > 1))
+		{
+			return error('Geschlecht darf nicht laenger als 1 Zeichen sein');
+		}
+		if (isset($person['geschlecht']) && $person['geschlecht'] != 'm' && $person['geschlecht'] != 'w' && $person['geschlecht'] != 'u')
+		{
+			return error('Geschlecht muss w, m oder u sein!');
+		}
+
+		if (isset($person['svnr']))
+		{
+			if ($person['svnr'] != '' && mb_strlen($person['svnr']) != 16
+				&& mb_strlen($person['svnr']) != 12 && mb_strlen($person['svnr']) != 10)
+			{
+				return error('SVNR muss 10, 12 oder 16 Zeichen lang sein');
+			}
+			if (mb_strlen($person['svnr']) == 10 || mb_strlen($person['svnr']) == 12)
+			{
+				//SVNR mit Pruefziffer pruefen
+				//Die 4. Stelle in der SVNR ist die Pruefziffer
+				//(Summe von (gewichtung[i]*svnr[i])) modulo 11 ergibt diese Pruefziffer
+				//Falls nicht, ist die SVNR ungueltig
+				$gewichtung = array(3, 7, 9, 0, 5, 8, 4, 2, 1, 6);
+				$erg = 0;
+				$tmpSvnr = substr($person['svnr'], 0, 10);
+				//Quersumme bilden
+				for ($i = 0; $i < 10; $i++)
+				{
+					$erg += $gewichtung[$i] * $tmpSvnr{$i};
+				}
+
+				if ($tmpSvnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
+				{
+					return error('SVNR ist ungueltig');
+				}
+
+				if (mb_strlen($person['svnr']) == 12)
+				{
+					$last = substr($person['svnr'], 10, 12);
+					if ($last{0} != 'v' || !is_numeric($last{1}))
+					{
+						return error('SVNR ist ungueltig');
+					}
+				}
+			}
+
+			//Pruefen ob das Geburtsdatum mit der SVNR uebereinstimmt.
+			if (isset($person['gebdatum']) && $person['svnr'] != '' && $person['gebdatum'] != '')
+			{
+				if (!mb_ereg('([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})', $person['gebdatum'])
+					&& !mb_ereg('([0-9]{4})-([0-9]{2})-([0-9]{2})', $person['gebdatum']))
+				{
+					return error('Format des Geburtsdatums ist ungueltig');
+				}
+			}
+		}
+
+		return success('Input data are valid');
+	}
+}
diff --git a/application/controllers/api/v1/system/Message.php b/application/controllers/api/v1/system/Message.php
index be87526ed..1825b7db9 100644
--- a/application/controllers/api/v1/system/Message.php
+++ b/application/controllers/api/v1/system/Message.php
@@ -144,26 +144,26 @@ class Message extends APIv1_Controller
 	 */
 	public function postMessage()
 	{
-		$validation = $this->_validatePostMessage($this->post());
+		$postMessage = $this->_validatePostMessage($this->post());
 
-		if (isSuccess($validation))
+		if (isSuccess($postMessage))
 		{
-			$result = $this->messagelib->sendMessage(
-				isset($this->post()['person_id']) ? $this->post()['person_id'] : null,
-				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,
-				$this->post()['subject'],
-				$this->post()['body'],
-				PRIORITY_NORMAL,
-				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,
-				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null, // Sender organisation unit
-				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true
+			$result = $this->messagelib->sendMessageUser(
+				$this->post()['receiver_id'],																// receiverPersonId
+				$this->post()['subject'],																	// subject
+				$this->post()['body'],																		// body
+				$this->post()['person_id'] ? $this->post()['person_id'] : null,								// sender_id
+				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null, 						// senderOU
+				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,	// relationmessage_id
+				MSG_PRIORITY_NORMAL,																		// priority
+				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true				// multiPartMime
 			);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
 		else
 		{
-			$this->response($validation, REST_Controller::HTTP_OK);
+			$this->response($postMessage, REST_Controller::HTTP_OK);
 		}
 	}
 
@@ -172,26 +172,27 @@ class Message extends APIv1_Controller
 	 */
 	public function postMessageVorlage()
 	{
-		$validation = $this->_validatePostMessageVorlage($this->post());
+		$postMessage = $this->_validatePostMessageVorlage($this->post());
 
-		if (isSuccess($validation))
+		if (isSuccess($postMessage))
 		{
-			$result = $this->messagelib->sendMessageVorlage(
-				isset($this->post()['sender_id']) ? $this->post()['sender_id'] : null,
-				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,
-				$this->post()['vorlage_kurzbz'],
-				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null, // Sender organisation unit
-				$this->post()['data'],
-				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,
-				isset($this->post()['orgform_kurzbz']) ? $this->post()['orgform_kurzbz'] : null,
-				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true
+			$result = $this->messagelib->sendMessageUserTemplate(
+				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,					// receiversPersonId
+				$this->post()['vorlage_kurzbz'],															// vorlage
+				$this->post()['data'],																		// parseData
+				isset($this->post()['orgform_kurzbz']) ? $this->post()['orgform_kurzbz'] : null,			// orgform
+				isset($this->post()['sender_id']) ? $this->post()['sender_id'] : null,						// sender_id
+				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null,						// senderOU
+				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,	// relationmessage_id
+				MSG_PRIORITY_NORMAL,																		// priority
+				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true				// multiPartMime
 			);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
 		else
 		{
-			$this->response($validation, REST_Controller::HTTP_OK);
+			$this->response($postMessage, REST_Controller::HTTP_OK);
 		}
 	}
 
@@ -220,26 +221,26 @@ class Message extends APIv1_Controller
 	/**
 	 * _validatePostMessage
 	 */
-	private function _validatePostMessage($message = null)
+	private function _validatePostMessage($post = null)
 	{
-		if (!isset($message))
+		if (!isset($post))
 		{
 			return error('Parameter is null');
 		}
-		if (!isset($message['subject']))
+		if (!isset($post['subject']))
 		{
 			return error('subject is not set');
 		}
-		if( !isset($message['body']))
+		if (!isset($post['body']))
 		{
 			return error('body is not set');
 		}
-		if (!isset($message['receiver_id']) && !isset($message['oe_kurzbz']))
+		if (!isset($post['receiver_id']))
 		{
-			return error('If a receiver_id is not given a oe_kurzbz must be specified');
+			return error('receiver_id is not set');
 		}
 
-		return success('Input data are valid');
+		return success();
 	}
 
 	/**
diff --git a/application/controllers/crm/Statusgrund.php b/application/controllers/crm/Statusgrund.php
index 472270ef3..344ac06dc 100644
--- a/application/controllers/crm/Statusgrund.php
+++ b/application/controllers/crm/Statusgrund.php
@@ -35,7 +35,7 @@ class Statusgrund extends Auth_Controller
 		$status = $this->StatusModel->load();
 		if ($status->error)
 		{
-			show_error($status->retval);
+			show_error(getError($status));
 		}
 
 		$data = array (
@@ -50,7 +50,7 @@ class Statusgrund extends Auth_Controller
 		$statusGrund = $this->StatusgrundModel->loadWhere(array("status_kurzbz" => $status_kurzbz));
 		if ($statusGrund->error)
 		{
-			show_error($statusGrund->retval);
+			show_error(getError($statusGrund));
 		}
 
 		$data = array (
@@ -66,13 +66,13 @@ class Statusgrund extends Auth_Controller
 		$statusGrund = $this->StatusgrundModel->load($statusgrund_id);
 		if ($statusGrund->error)
 		{
-			show_error($statusGrund->retval);
+			show_error(getError($statusGrund));
 		}
 
 		$sprache = $this->SpracheModel->loadWhere(array('content' => true));
 		if ($sprache->error)
 		{
-			show_error($sprache->retval);
+			show_error(getError($sprache));
 		}
 
 		$data = array (
@@ -89,13 +89,13 @@ class Statusgrund extends Auth_Controller
 		$status = $this->StatusModel->load($status_id);
 		if ($status->error)
 		{
-			show_error($status->retval);
+			show_error(getError($status));
 		}
 
 		$sprache = $this->SpracheModel->loadWhere(array('content' => true));
 		if ($sprache->error)
 		{
-			show_error($sprache->retval);
+			show_error(getError($sprache));
 		}
 
 		$data = array (
@@ -112,7 +112,7 @@ class Statusgrund extends Auth_Controller
 		$sprache = $this->SpracheModel->loadWhere(array('content' => true));
 		if ($sprache->error)
 		{
-			show_error($sprache->retval);
+			show_error(getError($sprache));
 		}
 
 		$data = array (
@@ -184,7 +184,7 @@ class Statusgrund extends Auth_Controller
 
 		if ($statusgrund->error)
 		{
-			show_error($statusgrund->retval);
+			show_error(getError($statusgrund));
 		}
 
 		redirect("/crm/Statusgrund/editGrund/" . $statusgrund_id . "/" . true);
@@ -252,7 +252,7 @@ class Statusgrund extends Auth_Controller
 
 		if ($statusgrund->error)
 		{
-			show_error($statusgrund->retval);
+			show_error(getError($statusgrund));
 		}
 
 		redirect("/crm/Statusgrund/editGrund/" . $statusgrund->retval . "/" . true);
@@ -297,7 +297,7 @@ class Statusgrund extends Auth_Controller
 
 		if ($status->error)
 		{
-			show_error($status->retval);
+			show_error(getError($status));
 		}
 
 		redirect("/crm/Statusgrund/editStatus/" . $status_kurzbz . "/" . true);
diff --git a/application/controllers/jobs/AmpelMail.php b/application/controllers/jobs/AmpelMail.php
index e29cac8fd..67acd76d0 100644
--- a/application/controllers/jobs/AmpelMail.php
+++ b/application/controllers/jobs/AmpelMail.php
@@ -121,13 +121,13 @@ class AmpelMail extends CLI_Controller
 				}
 				elseif (isError($result_ampel_user))
 				{
-					show_error($result_ampel_user->error);
+					show_error(getError($result_ampel_user));
 				}
 			}
 		}
 		elseif (isError($result_active_ampeln))
 		{
-			show_error($result_active_ampeln->error);
+			show_error(getError($result_active_ampeln));
 		}
 
 		// Send mails for new ampeln merged by user
diff --git a/application/controllers/jobs/MailJob.php b/application/controllers/jobs/MailJob.php
new file mode 100644
index 000000000..f459d4d3e
--- /dev/null
+++ b/application/controllers/jobs/MailJob.php
@@ -0,0 +1,47 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class MailJob extends JOB_Controller
+{
+	/**
+	 * API constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Loads MessageLib
+		$this->load->library('MessageLib');
+	}
+
+	/**
+	 * Send all the NOT sent notice emails for messaging system
+	 * The parameters are all not mandatory, they could be used to overrides the configs for testing, debug or one shot purposes
+	 */
+	public function sendAllMessageEmailNotices($since = '1970-01-01', $numberToSent = null, $numberPerTimeRange = null, $emailTimeRange = null, $emailFromSystem = null)
+	{
+		$this->logInfo('Send all message email notices started');
+
+		// Send them all!
+		$sendAllEmailNotices = $this->messagelib->sendAllEmailNotices($since, $numberToSent, $numberPerTimeRange, $emailTimeRange, $emailFromSystem);
+
+		if (isError($sendAllEmailNotices))
+		{
+			$optionalParameters = new stdClass();
+			$optionalParameters->$since = $since;
+			$optionalParameters->$numberToSent = $numberToSent;
+			$optionalParameters->$numberPerTimeRange = $numberPerTimeRange;
+			$optionalParameters->$emailTimeRange = $emailTimeRange;
+			$optionalParameters->$emailFromSystem = $emailFromSystem;
+
+			$this->logError($sendAllEmailNotices->retval, $optionalParameters);
+		}
+		elseif (!hasData($sendAllEmailNotices))
+		{
+			$this->logInfo('There were no unsent messages');
+		}
+
+		$this->logInfo('Send all message email notices ended');
+	}
+}
diff --git a/application/controllers/jobs/Prestudentstatus.php b/application/controllers/jobs/Prestudentstatus.php
index e5b015753..a3b765f07 100644
--- a/application/controllers/jobs/Prestudentstatus.php
+++ b/application/controllers/jobs/Prestudentstatus.php
@@ -109,7 +109,7 @@ class Prestudentstatus extends CLI_Controller
 		}
 		else
 		{
-			show_error($status->retval);
+			show_error(getError($status));
 		}
 		echo "Corrected:".$sum_corrected."\n";
 		echo "Not Corrected:".$sum_notcorrected."\n";
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index 5aa355b5f..859b8f265 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -3,30 +3,32 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class ReihungstestJob extends CLI_Controller
 {
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        // Load models
-        $this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
-        $this->load->model('crm/RtStudienplan_model', 'RtStudienplanModel');
-        $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-        $this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		// Load models
+		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
+		$this->load->model('crm/RtStudienplan_model', 'RtStudienplanModel');
+		$this->load->model('crm/Konto_model', 'KontoModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
-        // Load helpers
-        $this->load->helper('hlp_sancho_helper');
-    }
+		// Load helpers
+		$this->load->helper('hlp_sancho_helper');
+	}
 
-    /**
-     * runReihungstestJob
-     */
-    public function runReihungstestJob()
-    {
-        // Get study plans that have no assigned placement tests yet
-        $result = $this->ReihungstestModel->checkMissingReihungstest();
+	/**
+	 * runReihungstestJob
+	 */
+	public function runReihungstestJob()
+	{
+		// Get study plans that have no assigned placement tests yet
+		$result = $this->ReihungstestModel->checkMissingReihungstest();
 
 		$missing_rt_arr = array();
 		if (hasData($result))
@@ -35,11 +37,11 @@ class ReihungstestJob extends CLI_Controller
 		}
 		elseif (isError($result))
 		{
-			show_error($result->error);
+			show_error(getError($result));
 		}
 
-        // Get free places
-        $result = $this->ReihungstestModel->getFreePlaces();
+		// Get free places
+		$result = $this->ReihungstestModel->getFreePlaces();
 
 		$free_places_arr = array();
 		if (hasData($result))
@@ -48,11 +50,11 @@ class ReihungstestJob extends CLI_Controller
 		}
 		elseif (isError($result))
 		{
-			show_error($result->error);
+			show_error(getError($result));
 		}
 
-        // Prepare data for mail template 'ReihungstestJob'
-        $content_data_arr = $this->_getContentData($missing_rt_arr, $free_places_arr);
+		// Prepare data for mail template 'ReihungstestJob'
+		$content_data_arr = $this->_getContentData($missing_rt_arr, $free_places_arr);
 
 		// Send email in Sancho design
 		if (!empty($missing_rt_arr) || !empty($free_places_arr))
@@ -95,7 +97,7 @@ class ReihungstestJob extends CLI_Controller
 		// Get placement tests where registration date was yesterday
 		$result = $this->ReihungstestModel->checkReachedRegistrationDate($degreeProgram);
 
-        $reachedRegistration_rt_arr = array();
+		$reachedRegistration_rt_arr = array();
 
 		if (hasData($result))
 		{
@@ -103,14 +105,14 @@ class ReihungstestJob extends CLI_Controller
 		}
 		elseif (isError($result))
 		{
-			show_error($result->error);
+			show_error(getError($result));
 		}
 
-        $applicants_arr = array();
+		$applicants_arr = array();
 
-        foreach ($reachedRegistration_rt_arr as $reihungstest)
-        {
-            $applicants = $this->ReihungstestModel->getApplicantsOfPlacementTestForCronjob($reihungstest->reihungstest_id);
+		foreach ($reachedRegistration_rt_arr as $reihungstest)
+		{
+			$applicants = $this->ReihungstestModel->getApplicantsOfPlacementTestForCronjob($reihungstest->reihungstest_id);
 
 			if (hasData($applicants))
 			{
@@ -118,7 +120,7 @@ class ReihungstestJob extends CLI_Controller
 			}
 			elseif (isError($applicants))
 			{
-				show_error($applicants->error);
+				show_error(getError($applicants));
 			}
 
 			// Get all Bachelor-Degree-Programs with Mailadress
@@ -131,7 +133,7 @@ class ReihungstestJob extends CLI_Controller
 			}
 			elseif (isError($bachelorStudiengeange))
 			{
-				show_error($bachelorStudiengeange->error);
+				show_error(getError($bachelorStudiengeange));
 			}
 
 			// If a person ist an applicant of this degree-program send mail with application data
@@ -214,24 +216,24 @@ class ReihungstestJob extends CLI_Controller
 		// Get applicants that have been added to a test after Anmeldefrist
 		$result = $this->ReihungstestModel->getApplicantAssignedAfterDate($degreeProgram);
 
-        $applicants_after_anmeldefrist_arr = array();
+		$applicants_after_anmeldefrist_arr = array();
 
-        if (hasData($result))
-        {
-            $applicants_after_anmeldefrist_arr = $result->retval;
-        }
-        elseif (isError($result))
-        {
-            show_error($result->error);
-        }
+		if (hasData($result))
+		{
+			$applicants_after_anmeldefrist_arr = $result->retval;
+		}
+		elseif (isError($result))
+		{
+			show_error(getError($result));
+		}
 
-        $studiengang = '';
-        $mailReceipients = ''; // String with all mailadresses
-        $mailcontent_data_arr = array();
-        $headerstyle = 'style="background: #DCE4EF; border: 1px solid #FFF; padding: 4px; text-align: left;"';
-        $rowstyle = 'style="background-color: #EEEEEE; padding: 4px;"';
-        $mailcontent = '';
-        $applicants_list = '';
+		$studiengang = '';
+		$mailReceipients = ''; // String with all mailadresses
+		$mailcontent_data_arr = array();
+		$headerstyle = 'style="background: #DCE4EF; border: 1px solid #FFF; padding: 4px; text-align: left;"';
+		$rowstyle = 'style="background-color: #EEEEEE; padding: 4px;"';
+		$mailcontent = '';
+		$applicants_list = '';
 
 		if (count($applicants_after_anmeldefrist_arr) > 0)
 		{
@@ -277,11 +279,11 @@ class ReihungstestJob extends CLI_Controller
 						</thead>
 						<tbody>
 						';
-                }
+				}
 
-                $studiengang = $applicant->studiengang_kz;
-                $mailReceipients .= $applicant->email . ';';
-                $applicants_list .= '
+				$studiengang = $applicant->studiengang_kz;
+				$mailReceipients .= $applicant->email . ';';
+				$applicants_list .= '
 						<tr ' . $rowstyle . '>
 						<td>' . date_format(date_create($applicant->datum), 'd.m.Y') . '</td>
 						<td>' . $applicant->uhrzeit . '</td>
@@ -315,7 +317,7 @@ class ReihungstestJob extends CLI_Controller
 	}
 
 	/*
-	 * Sends an email to all applicants of a placement test to remind them 3 working days before
+	 * Sends an email to all applicants of a placement test to remind them 2 working days before
 	 *
 	 * @param integer $degreeProgram. Kennzahl of Degree Program to check
 	 * @param string $bcc. Optional. BCC-Mailadress to send the Mails to
@@ -341,66 +343,66 @@ class ReihungstestJob extends CLI_Controller
 			$from = urldecode($from);
 		}
 
-        // Get placement tests with testdate within the next 2 weeks
-        $resultNextTestDates = $this->ReihungstestModel->getNextPlacementtests($degreeProgram, 14);
-        if (hasData($resultNextTestDates))
-        {
-            $nextTestDates = $resultNextTestDates->retval;
-            $enddate = '';
-            // Loop through the dates
-            foreach ($nextTestDates as $testDates)
-            {
-                $workingdays = 0;
-                $testsOndate = array();
+		// Get placement tests with testdate within the next 2 weeks
+		$resultNextTestDates = $this->ReihungstestModel->getNextPlacementtests($degreeProgram, 14);
+		if (hasData($resultNextTestDates))
+		{
+			$nextTestDates = $resultNextTestDates->retval;
+			$enddate = '';
+			// Loop through the dates
+			foreach ($nextTestDates as $testDates)
+			{
+				$workingdays = 0;
+				$testsOndate = array();
 
-                // Deduct days till 3 working days are reached
-                for ($i = 1; ; $i++)
-                {
-                    if (isDateWorkingDay($testDates->datum, $i) === true)
-                    {
-                        $workingdays++;
-                    }
-                    if ($workingdays == 3)
-                    {
-                        $enddate = date("Y-m-d", strtotime("$testDates->datum -" . $i . " days"));
-                        break;
-                    }
-                    else
-                    {
-                        continue;
-                    }
-                }
+				// Deduct days till 2 working days are reached
+				for ($i = 1; ; $i++)
+				{
+					if (isDateWorkingDay($testDates->datum, $i) === true)
+					{
+						$workingdays++;
+					}
+					if ($workingdays == 2)
+					{
+						$enddate = date("Y-m-d", strtotime("$testDates->datum -" . $i . " days"));
+						break;
+					}
+					else
+					{
+						continue;
+					}
+				}
 
-                // If $enddate is today -> load all tests of $testDates->datum
-                if (date("Y-m-d", strtotime($enddate)) == date('Y-m-d'))
-                {
-                    $resultTestsOnDate = $this->ReihungstestModel->getTestsOnDate($testDates->datum, $degreeProgram);
+				// If $enddate is today -> load all tests of $testDates->datum
+				if (date("Y-m-d", strtotime($enddate)) == date('Y-m-d'))
+				{
+					$resultTestsOnDate = $this->ReihungstestModel->getTestsOnDate($testDates->datum, $degreeProgram);
 
-                    if (hasData($resultTestsOnDate))
-                    {
-                        $testsOndate = $resultTestsOnDate->retval;
-                    }
-                    elseif (isError($resultTestsOnDate))
-                    {
-                        show_error($resultTestsOnDate->error);
-                    }
-                }
+					if (hasData($resultTestsOnDate))
+					{
+						$testsOndate = $resultTestsOnDate->retval;
+					}
+					elseif (isError($resultTestsOnDate))
+					{
+						show_error(getError($resultTestsOnDate));
+					}
+				}
 
-                if (!isEmptyArray($testsOndate))
-                {
-                    foreach ($testsOndate as $reihungstest)
-                    {
-                        // Loads applicants of a test
-                        $applicants = $this->ReihungstestModel->getApplicantsOfPlacementTest($reihungstest->reihungstest_id);
+				if (!isEmptyArray($testsOndate))
+				{
+					foreach ($testsOndate as $reihungstest)
+					{
+						// Loads applicants of a test
+						$applicants = $this->ReihungstestModel->getApplicantsOfPlacementTest($reihungstest->reihungstest_id);
 
-                        if (hasData($applicants))
-                        {
-                            $applicants_arr = $applicants->retval;
-                        }
-                        elseif (isError($applicants))
-                        {
-                            show_error($applicants->error);
-                        }
+						if (hasData($applicants))
+						{
+							$applicants_arr = $applicants->retval;
+						}
+						elseif (isError($applicants))
+						{
+							show_error(getError($applicants));
+						}
 
 						foreach ($applicants_arr as $applicant)
 						{
@@ -420,237 +422,237 @@ class ReihungstestJob extends CLI_Controller
 								$mailcontent_data_arr['wegbeschreibung'] = $applicant->lageplan;
 							}
 
-                            sendSanchoMail(
-                                'Sancho_RemindApplicantsOfTest',
-                                $mailcontent_data_arr,
-                                $applicant->email,
-                                'Ihre Anmeldung zum Reihungstest - Reminder / Your registration for the placement test - Reminder',
-                                DEFAULT_SANCHO_HEADER_IMG,
-                                DEFAULT_SANCHO_FOOTER_IMG,
-                                $from,
-                                '',
-                                $bcc);
-                        }
-                    }
-                }
-            }
-        }
-    }
+							sendSanchoMail(
+								'Sancho_RemindApplicantsOfTest',
+								$mailcontent_data_arr,
+								$applicant->email,
+								'Ihre Anmeldung zum Reihungstest - Reminder / Your registration for the placement test - Reminder',
+								DEFAULT_SANCHO_HEADER_IMG,
+								DEFAULT_SANCHO_FOOTER_IMG,
+								$from,
+								'',
+								$bcc);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * This job sends eMail(s) to the relevant stg assistance(s) informing about:
-     * All applicants, who have sent new applications AFTER they had absolved a
-     * placement test in the actual studiensemester
-     * AND who have been confirmed yesterday.
-     */
-    public function mailNewApplicants()
-    {
-        // Get yesterdays confirmed applicants for Bachelor-studies
-        $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-        $this->PrestudentstatusModel->addSelect('
-            tbl_person.person_id,
-            tbl_prestudentstatus.prestudent_id,
-            tbl_prestudent.studiengang_kz,
-            tbl_prestudentstatus.studiensemester_kurzbz,
-            tbl_prestudentstatus.bestaetigtam,
-            tbl_prestudentstatus.bewerbung_abgeschicktamum
-        ');
-        $this->PrestudentstatusModel->addJoin('public.tbl_prestudent', 'prestudent_id');
-        $this->PrestudentstatusModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-        $this->PrestudentstatusModel->addJoin('public.tbl_studiengangstyp', 'typ');
-        $this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
+	/**
+	 * This job sends eMail(s) to the relevant stg assistance(s) informing about:
+	 * All applicants, who have sent new applications AFTER they had absolved a
+	 * placement test in the actual studiensemester
+	 * AND who have been confirmed yesterday.
+	 */
+	public function mailNewApplicants()
+	{
+		// Get yesterdays confirmed applicants for Bachelor-studies
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->PrestudentstatusModel->addSelect('
+			tbl_person.person_id,
+			tbl_prestudentstatus.prestudent_id,
+			tbl_prestudent.studiengang_kz,
+			tbl_prestudentstatus.studiensemester_kurzbz,
+			tbl_prestudentstatus.bestaetigtam,
+			tbl_prestudentstatus.bewerbung_abgeschicktamum
+		');
+		$this->PrestudentstatusModel->addJoin('public.tbl_prestudent', 'prestudent_id');
+		$this->PrestudentstatusModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->PrestudentstatusModel->addJoin('public.tbl_studiengangstyp', 'typ');
+		$this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
 
-        $yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
-            status_kurzbz = \'Interessent\' AND
-            typ = \'b\' AND
-            bestaetigtam = current_date - 1
-        ');
+		$yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
+			status_kurzbz = \'Interessent\' AND
+			typ = \'b\' AND
+			bestaetigtam = current_date - 1
+		');
 
-        // Retrieve the person_ids of yesterdays confirmed applicants
-        $person_id_arr = array();
-        if (hasData($yesterdays_applicants_arr))
-        {
-            foreach ($yesterdays_applicants_arr->retval as $yesterdays_applicant)
-            {
-                if (isset($yesterdays_applicant->person_id)) {
-                    $person_id_arr[] = $yesterdays_applicant->person_id;
-                }
-            }
-        }
-        elseif (isError($yesterdays_applicants_arr))
-        {
-            show_error($yesterdays_applicants_arr->error);
-        }
+		// Retrieve the person_ids of yesterdays confirmed applicants
+		$person_id_arr = array();
+		if (hasData($yesterdays_applicants_arr))
+		{
+			foreach ($yesterdays_applicants_arr->retval as $yesterdays_applicant)
+			{
+				if (isset($yesterdays_applicant->person_id)) {
+					$person_id_arr[] = $yesterdays_applicant->person_id;
+				}
+			}
+		}
+		elseif (isError($yesterdays_applicants_arr))
+		{
+			show_error(getError($yesterdays_applicants_arr));
+		}
 
-        // Get all other prestudenten of the given persons.
-        if (!isEmptyArray($person_id_arr))
-        {
-            $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-            $this->PrestudentModel->addDistinct();
-            $this->PrestudentModel->addSelect('
-                person_id,
-                tbl_reihungstest.studiensemester_kurzbz,
-                tbl_reihungstest.reihungstest_id,
-                (SELECT(tbl_reihungstest.datum::text || \' \' || tbl_reihungstest.uhrzeit::text)::timestamp) AS reihungstest_timestamp
-            ');
-            $this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-            $this->PrestudentModel->addJoin('public.tbl_studiengangstyp', 'typ');
-            $this->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
-            $this->PrestudentModel->addJoin('public.tbl_person', 'person_id');
-            $this->PrestudentModel->addJoin('public.tbl_rt_person', 'person_id');
-            $this->PrestudentModel->addJoin('public.tbl_reihungstest', 'tbl_reihungstest.reihungstest_id = tbl_rt_person.rt_id');
+		// Get all other prestudenten of the given persons.
+		if (!isEmptyArray($person_id_arr))
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$this->PrestudentModel->addDistinct();
+			$this->PrestudentModel->addSelect('
+				person_id,
+				tbl_reihungstest.studiensemester_kurzbz,
+				tbl_reihungstest.reihungstest_id,
+				(SELECT(tbl_reihungstest.datum::text || \' \' || tbl_reihungstest.uhrzeit::text)::timestamp) AS reihungstest_timestamp
+			');
+			$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+			$this->PrestudentModel->addJoin('public.tbl_studiengangstyp', 'typ');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_person', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_rt_person', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_reihungstest', 'tbl_reihungstest.reihungstest_id = tbl_rt_person.rt_id');
 
-            // Store them, if they have already absolved a placement test in the same study term they have applied for.
-            $placement_absolvents_arr = $this->PrestudentModel->loadWhere('
-                person_id IN (' . implode(', ', $person_id_arr) . ') AND
-                typ = \'b\' AND 
-                teilgenommen = \'t\' AND
-                tbl_reihungstest.studiensemester_kurzbz IN (
-                    SELECT
-                        studiensemester_kurzbz
-                    FROM
-                        public.tbl_studiensemester
-                    WHERE
-                        ende >= now()
-                )
-            ');
-        }
+			// Store them, if they have already absolved a placement test in the same study term they have applied for.
+			$placement_absolvents_arr = $this->PrestudentModel->loadWhere('
+				person_id IN (' . implode(', ', $person_id_arr) . ') AND
+				typ = \'b\' AND
+				teilgenommen = \'t\' AND
+				tbl_reihungstest.studiensemester_kurzbz IN (
+					SELECT
+						studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						ende >= now()
+				)
+			');
+		}
 
-        // Store data to be send in the email-link
-        $result_arr = array();
-        foreach($yesterdays_applicants_arr->retval as $yesterdays_applicant)
-        {
-            foreach ($placement_absolvents_arr->retval as $placement_absolvent)
-            {
-                if ($yesterdays_applicant->person_id == $placement_absolvent->person_id &&
-                    $yesterdays_applicant->studiensemester_kurzbz == $placement_absolvent->studiensemester_kurzbz &&
-                    $yesterdays_applicant->bewerbung_abgeschicktamum >= $placement_absolvent->reihungstest_timestamp)
-                {
-                    $obj = new stdClass();
-                    $obj->prestudent_id = $yesterdays_applicant->prestudent_id;     // prestudent_id of the yesterdays applicant
-                    $obj->studiengang_kz = $yesterdays_applicant->studiengang_kz;   // study program of interest of the yesterdays applicant
-                    $obj->reihungstest_id = $placement_absolvent->reihungstest_id;  // reihungstest_id of absolved reihungstest of that person
+		// Store data to be send in the email-link
+		$result_arr = array();
+		foreach($yesterdays_applicants_arr->retval as $yesterdays_applicant)
+		{
+			foreach ($placement_absolvents_arr->retval as $placement_absolvent)
+			{
+				if ($yesterdays_applicant->person_id == $placement_absolvent->person_id &&
+					$yesterdays_applicant->studiensemester_kurzbz == $placement_absolvent->studiensemester_kurzbz &&
+					$yesterdays_applicant->bewerbung_abgeschicktamum >= $placement_absolvent->reihungstest_timestamp)
+				{
+					$obj = new stdClass();
+					$obj->prestudent_id = $yesterdays_applicant->prestudent_id;	 // prestudent_id of the yesterdays applicant
+					$obj->studiengang_kz = $yesterdays_applicant->studiengang_kz;   // study program of interest of the yesterdays applicant
+					$obj->reihungstest_id = $placement_absolvent->reihungstest_id;  // reihungstest_id of absolved reihungstest of that person
 
-                    $result_arr[]= $obj;
-                }
-            }
-        }
+					$result_arr[]= $obj;
+				}
+			}
+		}
 
-        // Sort by STG. This is important to send the mails clustered by STG to the different STG assistances.
-        usort($result_arr, function ($a, $b)
-        {
-            if ($a->studiengang_kz == $b->studiengang_kz) {
-                return 0;
-            }
-            return ($a->studiengang_kz < $b->studiengang_kz) ? -1 : 1;
-        });
+		// Sort by STG. This is important to send the mails clustered by STG to the different STG assistances.
+		usort($result_arr, function ($a, $b)
+		{
+			if ($a->studiengang_kz == $b->studiengang_kz) {
+				return 0;
+			}
+			return ($a->studiengang_kz < $b->studiengang_kz) ? -1 : 1;
+		});
 
-        $to = ''; // mail recipient (stg assistance)
-        $content_arr = array(); // url paths to the new applicants
-        $base_link = base_url('vilesci/stammdaten/auswertung_fhtw.php');
-       
-        $i = 0; // loop counter
-        $len = count($result_arr);
+		$to = ''; // mail recipient (stg assistance)
+		$content_arr = array(); // url paths to the new applicants
+		$base_link = base_url('vilesci/stammdaten/auswertung_fhtw.php');
 
-        // Loop trough list of new applicants
-        foreach($result_arr as $result)
-        {
-            $studiengang = $this->StudiengangModel->load($result->studiengang_kz);
-            $mail_stg_assistance = $studiengang->retval[0]->email;
+		$i = 0; // loop counter
+		$len = count($result_arr);
 
-            // If first loop
-            if ($i == 0)
-            {
-                $to = $mail_stg_assistance; // set recipient initially
-            }
+		// Loop trough list of new applicants
+		foreach($result_arr as $result)
+		{
+			$studiengang = $this->StudiengangModel->load($result->studiengang_kz);
+			$mail_stg_assistance = $studiengang->retval[0]->email;
 
-            // If new study is encountered but is not the first loop
-            if ($to != $mail_stg_assistance && $i != 0)
-            {
-                // Prepare content for mail template
-                $content_data_arr = $this->_getContentDataNewApplicant($content_arr);
-                
-                // Send mail
-                 sendSanchoMail(
-                     'BewerberNachReihungstest',
-                     $content_data_arr,
-                     $to,
-                     'Neue Bewerbungen nach absolviertem Reihungstest',
-                     'sancho_header_min_bw.jpg',
-                     'sancho_footer_min_bw.jpg'
-                 );
+			// If first loop
+			if ($i == 0)
+			{
+				$to = $mail_stg_assistance; // set recipient initially
+			}
 
-                 // Reset content for new study applicants & reset recipient (new stg assistance)
-                $content_arr = array($base_link. '?reihungstest='. $result->reihungstest_id. '&prestudent_id='. $result->prestudent_id);
-                $to = $mail_stg_assistance;
-            }
-            // If same study
-            else
-            {
-                // just add content
-                $content_arr[]= $base_link. '?reihungstest='. $result->reihungstest_id. '&prestudent_id='. $result->prestudent_id; // add to content
-            }
+			// If new study is encountered but is not the first loop
+			if ($to != $mail_stg_assistance && $i != 0)
+			{
+				// Prepare content for mail template
+				$content_data_arr = $this->_getContentDataNewApplicant($content_arr);
 
-            // If last loop
-            if (($i == $len - 1))
-            {
-                // Prepare content for mail template
-                $content_data_arr = $this->_getContentDataNewApplicant($content_arr);
+				// Send mail
+				 sendSanchoMail(
+					 'BewerberNachReihungstest',
+					 $content_data_arr,
+					 $to,
+					 'Neue Bewerbungen nach absolviertem Reihungstest',
+					 'sancho_header_min_bw.jpg',
+					 'sancho_footer_min_bw.jpg'
+				 );
 
-                // Send mail
-                  sendSanchoMail(
-                      'BewerberNachReihungstest',
-                      $content_data_arr,
-                      $to,
-                      'Neue Bewerbungen nach absolviertem Reihungstest',
-                      'sancho_header_min_bw.jpg',
-                      'sancho_footer_min_bw.jpg'
-                  );
-            }
-            $i++; // iterate counter
-        }
-    }
+				 // Reset content for new study applicants & reset recipient (new stg assistance)
+				$content_arr = array($base_link. '?reihungstest='. $result->reihungstest_id. '&prestudent_id='. $result->prestudent_id);
+				$to = $mail_stg_assistance;
+			}
+			// If same study
+			else
+			{
+				// just add content
+				$content_arr[]= $base_link. '?reihungstest='. $result->reihungstest_id. '&prestudent_id='. $result->prestudent_id; // add to content
+			}
 
-    // ------------------------------------------------------------------------
-    // Private methods
-    /**
-     * Returns associative array with data as needed in the reihungstest job template.
-     * @param array $missing_rt_arr Array with studienpläne, which have no assigned placement tests.
-     * @param array $free_places_arr Array with info and amount of free placement test places.
-     * @return array
-     */
-    private function _getContentData($missing_rt_arr, $free_places_arr)
-    {
-        $style_tbl1 = ' cellpadding="0" cellspacing="10" width="100%" style="font-family: courier, verdana, sans-serif; font-size: 0.95em; border: 1px solid #000000;" ';
-        $style_tbl2 = ' cellpadding="0" cellspacing="20" width="100%" style="font-family: courier, verdana, sans-serif; font-size: 0.95em; border: 1px solid #000000;" ';
+			// If last loop
+			if (($i == $len - 1))
+			{
+				// Prepare content for mail template
+				$content_data_arr = $this->_getContentDataNewApplicant($content_arr);
 
-        // Prepare HTML table with study plans that have no placement tests yet
-        if (!empty($missing_rt_arr)) {
-            $studienplan_list
-                = '
+				// Send mail
+				  sendSanchoMail(
+					  'BewerberNachReihungstest',
+					  $content_data_arr,
+					  $to,
+					  'Neue Bewerbungen nach absolviertem Reihungstest',
+					  'sancho_header_min_bw.jpg',
+					  'sancho_footer_min_bw.jpg'
+				  );
+			}
+			$i++; // iterate counter
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// Private methods
+	/**
+	 * Returns associative array with data as needed in the reihungstest job template.
+	 * @param array $missing_rt_arr Array with studienpläne, which have no assigned placement tests.
+	 * @param array $free_places_arr Array with info and amount of free placement test places.
+	 * @return array
+	 */
+	private function _getContentData($missing_rt_arr, $free_places_arr)
+	{
+		$style_tbl1 = ' cellpadding="0" cellspacing="10" width="100%" style="font-family: courier, verdana, sans-serif; font-size: 0.95em; border: 1px solid #000000;" ';
+		$style_tbl2 = ' cellpadding="0" cellspacing="20" width="100%" style="font-family: courier, verdana, sans-serif; font-size: 0.95em; border: 1px solid #000000;" ';
+
+		// Prepare HTML table with study plans that have no placement tests yet
+		if (!empty($missing_rt_arr)) {
+			$studienplan_list
+				= '
 				<table' . $style_tbl2 . '>
 			';
 
-            foreach ($missing_rt_arr as $rt) {
-                $studienplan_list .= '
+			foreach ($missing_rt_arr as $rt) {
+				$studienplan_list .= '
 					<tr><td>' . $rt->bezeichnung . '</td></tr>
 				';
-            }
+			}
 
-            $studienplan_list .= '
+			$studienplan_list .= '
 				</table>
 			';
-        } else {
-            $studienplan_list = '
+		} else {
+			$studienplan_list = '
 				<table' . $style_tbl1 . '>
 					<tr><td>Alles okay! Alle Studienpläne haben zumindest einen Reihungstest.</td></tr>
 				</table>
 			';
-        }
+		}
 
-        // Prepare HTML table with information and amount of free places
-        if (!empty($free_places_arr)) {
-            $freie_plaetze_list = '
+		// Prepare HTML table with information and amount of free places
+		if (!empty($free_places_arr)) {
+			$freie_plaetze_list = '
 				<table' . $style_tbl2 . '>
 					<tr>
 						<th>Fakultät</th>
@@ -659,67 +661,67 @@ class ReihungstestJob extends CLI_Controller
 					</tr>
 			';
 
-            foreach ($free_places_arr as $free_place) {
-                $datum = new DateTime($free_place->datum);
-                $style_alarm = ($free_place->freie_plaetze <= 5) ? ' style=" color: red; font-weight: bold" ' : '';    // mark if <=5 free places
+			foreach ($free_places_arr as $free_place) {
+				$datum = new DateTime($free_place->datum);
+				$style_alarm = ($free_place->freie_plaetze <= 5) ? ' style=" color: red; font-weight: bold" ' : '';	// mark if <=5 free places
 
-                $freie_plaetze_list .= '
+				$freie_plaetze_list .= '
 					<tr>
 						<td width="350">' . $free_place->fakultaet . '</td>
 						<td align="center">' . $datum->format('d.m.Y') . '</td>
 						<td align="center"' . $style_alarm . '>' . $free_place->freie_plaetze . '</td>
 					</tr>
 				';
-            }
+			}
 
-            $freie_plaetze_list .= '
+			$freie_plaetze_list .= '
 				</table>
 			';
-        } else {
-            $freie_plaetze_list = '
+		} else {
+			$freie_plaetze_list = '
 				<table' . $style_tbl1 . '>
 					<tr><td>Es gibt heute keine Ergebnisse zu freien Reihungstestplätze.</td></tr>
 				</table>
 			';
-        }
+		}
 
-        // Set associative array with the prepared HTML tables and URL be used by the template's variables
-        $content_data_arr['studienplan_list'] = $studienplan_list;
-        $content_data_arr['freie_plaetze_list'] = $freie_plaetze_list;
-        $content_data_arr['link'] = site_url('/organisation/Reihungstest');
+		// Set associative array with the prepared HTML tables and URL be used by the template's variables
+		$content_data_arr['studienplan_list'] = $studienplan_list;
+		$content_data_arr['freie_plaetze_list'] = $freie_plaetze_list;
+		$content_data_arr['link'] = site_url('/organisation/Reihungstest');
 
-        return $content_data_arr;
-    }
+		return $content_data_arr;
+	}
 
-    /**
-     * Returns associative array with data as needed in the BewerberNachReihungstest-template.
-     * @param array $content_arr Array with links to the testtool evaluation page of the new applicants.
-     * @return array
-     */
-    private function _getContentDataNewApplicant($content_arr)
-    {
-        $content = '';
-        $counter = 1;
-        foreach ($content_arr as $row)
-        {
-            $content .= '<br>Link zu: <a href="'. $row. '">Bewerber '. $counter. '</a>';
-            $counter++;
-        }
+	/**
+	 * Returns associative array with data as needed in the BewerberNachReihungstest-template.
+	 * @param array $content_arr Array with links to the testtool evaluation page of the new applicants.
+	 * @return array
+	 */
+	private function _getContentDataNewApplicant($content_arr)
+	{
+		$content = '';
+		$counter = 1;
+		foreach ($content_arr as $row)
+		{
+			$content .= '<br>Link zu: <a href="'. $row. '">Bewerber '. $counter. '</a>';
+			$counter++;
+		}
 
-        $content_data_arr['link'] = $content;
-        return $content_data_arr;
-    }
+		$content_data_arr['link'] = $content;
+		return $content_data_arr;
+	}
 
 
-    /**
-     * Checks the upcoming placement tests if there are correct studyplans assigned
-     * If there are invalid studyplans assigned (outdated because there exists a new version),
-     * it tries to find a better one and assigns it additionaly
-     */
-    public function correctStudienplan()
-    {
-        // get all placement tests with incorrect studyplan
-        $qry = "
+	/**
+	 * Checks the upcoming placement tests if there are correct studyplans assigned
+	 * If there are invalid studyplans assigned (outdated because there exists a new version),
+	 * it tries to find a better one and assigns it additionaly
+	 */
+	public function correctStudienplan()
+	{
+		// get all placement tests with incorrect studyplan
+		$qry = "
 		SELECT
 			tbl_reihungstest.reihungstest_id,
 			tbl_studienplan.studienplan_id,
@@ -752,38 +754,300 @@ class ReihungstestJob extends CLI_Controller
 			)
 		";
 
-        $db = new DB_Model();
-        $result_rt = $db->execReadOnlyQuery($qry);
+		$db = new DB_Model();
+		$result_rt = $db->execReadOnlyQuery($qry);
 
-        if (hasdata($result_rt)) {
-            foreach ($result_rt->retval as $row_rt) {
-                // find an active studyplan for the same degree program with is valid in this semester
-                $result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
-                    $row_rt->studiengang_kz,
-                    $row_rt->studiensemester_kurzbz
-                );
+		if (hasdata($result_rt)) {
+			foreach ($result_rt->retval as $row_rt) {
+				// find an active studyplan for the same degree program with is valid in this semester
+				$result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
+					$row_rt->studiengang_kz,
+					$row_rt->studiensemester_kurzbz
+				);
 
-                if (hasData($result_stpl)) {
-                    foreach ($result_stpl->retval as $row_stpl) {
-                        // Add new Studyplan to RtStudienplan if missing
-                        $rt_studienplan = $this->RtStudienplanModel->loadWhere(array(
-                            "reihungstest_id" => $row_rt->reihungstest_id,
-                            "studienplan_id" => $row_stpl->studienplan_id
-                        ));
+				if (hasData($result_stpl)) {
+					foreach ($result_stpl->retval as $row_stpl) {
+						// Add new Studyplan to RtStudienplan if missing
+						$rt_studienplan = $this->RtStudienplanModel->loadWhere(array(
+							"reihungstest_id" => $row_rt->reihungstest_id,
+							"studienplan_id" => $row_stpl->studienplan_id
+						));
 
-                        if (!hasData($rt_studienplan)) {
-                            echo "\nAdding StudienplanId: $row_stpl->studienplan_id";
-                            echo " to ReihungstestId: $row_rt->reihungstest_id";
+						if (!hasData($rt_studienplan)) {
+							echo "\nAdding StudienplanId: $row_stpl->studienplan_id";
+							echo " to ReihungstestId: $row_rt->reihungstest_id";
 
-                            $this->RtStudienplanModel->insert(array(
-                                "reihungstest_id" => $row_rt->reihungstest_id,
-                                "studienplan_id" => $row_stpl->studienplan_id
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-    }
+							$this->RtStudienplanModel->insert(array(
+								"reihungstest_id" => $row_rt->reihungstest_id,
+								"studienplan_id" => $row_stpl->studienplan_id
+							));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/*
+	 * Cronjob for priorisation process of FHTW
+	 *
+	 * Wenn ein Student in einer höheren Prio aufgenommen wird, werden die anderen Bewerbungen auf "Abgewiesen" gesetzt,
+	 * solang diese noch im Status "Bewerber" sind.
+	 * Andernfalls wird eine Mail an die niedrigeren Prios verschickt, dass eine höhere Prio aufgenommen hat
+	 * Die Kaution wird automatisch gebucht
+	 *
+	 * @param string $bcc. Optional. BCC-Mailadress to send the Mails to
+	 * @param string $from. Optional. Sender-Mailadress shown to recipient
+	 */
+	public function prioritizationJob($bcc = null, $from = null)
+	{
+		$qry = "    SELECT DISTINCT
+					get_rolle_prestudent (tbl_prestudent.prestudent_id, 'WS2020') AS laststatus, /* Todo: Studiensemester dynamisch ermitteln oder als Parameter */
+					tbl_prestudentstatus.studiensemester_kurzbz,
+					tbl_prestudent.*
+					FROM PUBLIC.tbl_person
+					JOIN PUBLIC.tbl_prestudent USING (person_id)
+					JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+					JOIN lehre.tbl_studienplan USING (studienplan_id)
+					JOIN lehre.tbl_studienordnung USING (studienordnung_id)
+					JOIN PUBLIC.tbl_studiengang ON (tbl_studienordnung.studiengang_kz = tbl_studiengang.studiengang_kz)
+					WHERE tbl_prestudentstatus.datum >= (SELECT CURRENT_DATE -1)
+						AND get_rolle_prestudent (tbl_prestudent.prestudent_id, 'WS2020') IN ('Aufgenommener','Bewerber','Wartender')
+						AND studiensemester_kurzbz = 'WS2020' /* Todo: Studiensemester dynamisch ermitteln oder als Parameter */
+						AND tbl_studiengang.typ = 'b'
+						ORDER BY studiengang_kz, laststatus
+					";
+
+		// Encode Params
+		if ($bcc != '')
+		{
+			// $bcc can be given as null-string, so check that too
+			if ($bcc == 'null')
+			{
+				$bcc = '';
+			}
+			else
+			{
+				$bcc = urldecode($bcc);
+			}
+		}
+		if ($from != '')
+		{
+			$from = urldecode($from);
+		}
+
+		$db = new DB_Model();
+		$result_prestudents = $db->execReadOnlyQuery($qry);
+		$mailArray = array();
+
+		if (hasdata($result_prestudents))
+		{
+			foreach ($result_prestudents->retval as $row_ps)
+			{
+				// Wenn der letzte Status "Aufgenommener" ist, alle niedrigeren Prios auf "Abgewiesen" setzen
+				// falls diese Bewerber oder Warteliste sind
+				// Danach Kaution einbuchen
+				if ($row_ps->laststatus == 'Aufgenommener')
+				{
+					// Alle niedrigeren Prios laden
+					$qryNiedrPrios = "
+						SELECT DISTINCT
+							get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') AS laststatus,
+							tbl_studienplan.orgform_kurzbz,
+							tbl_person.nachname,
+							tbl_person.vorname,
+							tbl_prestudent.*
+						FROM PUBLIC.tbl_person
+							JOIN PUBLIC.tbl_prestudent USING (person_id)
+							JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+							JOIN lehre.tbl_studienplan USING (studienplan_id)
+							JOIN PUBLIC.tbl_studiengang ON (tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz)
+						WHERE tbl_prestudent.person_id = ".$row_ps->person_id."
+							AND tbl_prestudent.prestudent_id != ".$row_ps->prestudent_id."
+							AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender')
+							AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."'
+							AND tbl_studiengang.typ = 'b'
+							AND priorisierung > ".$row_ps->priorisierung."
+						ORDER BY studiengang_kz, laststatus
+					";
+
+					$resultNiedrPrios = $db->execReadOnlyQuery($qryNiedrPrios);
+
+					if (hasdata($resultNiedrPrios))
+					{
+						foreach ($resultNiedrPrios->retval as $rowNiedrPrios)
+						{
+							if ($rowNiedrPrios->laststatus == 'Bewerber')
+							{
+								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
+								$lastStatus = $this->PrestudentstatusModel->getLastStatus($rowNiedrPrios->prestudent_id);
+
+								$result = $this->PrestudentstatusModel->insert(
+									array(
+										'prestudent_id' => $rowNiedrPrios->prestudent_id,
+										'studiensemester_kurzbz' => $lastStatus->retval[0]->studiensemester_kurzbz,
+										'ausbildungssemester' => $lastStatus->retval[0]->ausbildungssemester,
+										'datum' => date('Y-m-d'),
+										'orgform_kurzbz' => $lastStatus->retval[0]->orgform_kurzbz,
+										'studienplan_id' => $lastStatus->retval[0]->studienplan_id,
+										'status_kurzbz' => 'Abgewiesener',
+										'statusgrund_id' => 5,
+										'insertvon' => 'prioritizationJob',
+										'insertamum' => date('Y-m-d H:i:s')
+									)
+								);
+								if (isSuccess($result))
+								{
+									// Derzeit nur Info an Admins schicken, wenn er Bewerber war
+									$mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AbgewiesenWeilBewerber'][]
+										= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+								}
+							}
+							elseif ($rowNiedrPrios->laststatus == 'Wartender')
+							{
+								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
+								// Mail zur Info an Assistenz schicken
+								$lastStatus = $this->PrestudentstatusModel->getLastStatus($rowNiedrPrios->prestudent_id);
+
+								$result = $this->PrestudentstatusModel->insert(
+									array(
+										'prestudent_id' => $rowNiedrPrios->prestudent_id,
+										'studiensemester_kurzbz' => $lastStatus->retval[0]->studiensemester_kurzbz,
+										'ausbildungssemester' => $lastStatus->retval[0]->ausbildungssemester,
+										'datum' => date('Y-m-d'),
+										'orgform_kurzbz' => $lastStatus->retval[0]->orgform_kurzbz,
+										'studienplan_id' => $lastStatus->retval[0]->studienplan_id,
+										'status_kurzbz' => 'Abgewiesener',
+										'statusgrund_id' => 5,
+										'insertvon' => 'prioritizationJob',
+										'insertamum' => date('Y-m-d H:i:s')
+									)
+								);
+								if (isSuccess($result))
+								{
+									$mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AbgewiesenGesetztWartender'][]
+										= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+								}
+							}
+							elseif ($rowNiedrPrios->laststatus == 'Aufgenommener')
+							{
+								// Mail zur Info an Assistenz schicken, dass in höherer Prio aufgenommen wurde
+								$mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][]
+									= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+							}
+						}
+					}
+
+					// Kaution einbuchen für $row_ps->prestudent_id
+					// Vorher prüfen, ob schon eine Kaution gebucht ist
+					// Todo: Betrag automatisch aus tbl_buchungstyp laden
+
+					$qryKautionExists = "
+						SELECT count(*) as anzahl
+						FROM public.tbl_konto
+						WHERE person_id = ".$row_ps->person_id."
+							AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."'
+							AND buchungstyp_kurzbz = 'Kaution'";
+
+					$resultKautionExists = $db->execReadOnlyQuery($qryKautionExists);
+					if (hasdata($resultKautionExists))
+					{
+						if ($resultKautionExists->retval[0]->anzahl == '0')
+						{
+							// Todo: Zahlungsreferenz generieren (StudiengangsOE+Buchungsnummer)
+							$this->KontoModel->insert(array(
+								"person_id" => $row_ps->person_id,
+								"studiengang_kz" => $row_ps->studiengang_kz,
+								"studiensemester_kurzbz" => $row_ps->studiensemester_kurzbz,
+								"betrag" => -150,
+								"buchungsdatum" => date('Y-m-d'),
+								"buchungstext" => 'Kaution',
+								"buchungstyp_kurzbz" => 'Kaution',
+								"insertvon" => 'prioritizationJob',
+								"insertamum" => date('Y-m-d H:i:s')
+							));
+						}
+					}
+				}
+			}
+		}
+
+		// Mails senden
+		if (!isEmptyArray($mailArray))
+		{
+			foreach ($mailArray AS $stg=>$orgform)
+			{
+				$studiengang = $this->StudiengangModel->load($stg);
+				$mailcontent = '';
+
+				foreach ($orgform AS $art=>$value)
+				{
+					// Orgform nur dazu schreiben, wenn es mehr als Eine gibt
+					if (count($orgform) > 1)
+					{
+						$mailcontent .= '<p style="font-family: verdana, sans-serif;"><b>Orgform '.$art.'</b></p>';
+					}
+					if (isset($value['AbgewiesenGesetztWartender']) && !isEmptyArray($value['AbgewiesenGesetztWartender']))
+					{
+						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
+									Folgende Personen auf der Warteliste wurden in einem höher priorisierten Studiengang aufgenommen und haben deshalb einen Status "Abgewiesen" erhalten:</p>';
+						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Zuvor Warteliste</th></thead>';
+						$mailcontent .= '					<tbody>';
+						sort($value['AbgewiesenGesetztWartender']);
+						foreach ($value['AbgewiesenGesetztWartender'] AS $key=>$bewerber)
+						{
+							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
+						}
+						$mailcontent .= '</tbody></table><br><br>';
+					}
+					if (isset($value['AufnahmeHoeherePrio']) && !isEmptyArray($value['AufnahmeHoeherePrio']))
+					{
+						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
+									Folgende Aufgenommene wurden in einem höher priorisierten Studiengang aufgenommen:</p>';
+						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Aufgenommene</th></thead>';
+						$mailcontent .= '					<tbody>';
+						sort($value['AufnahmeHoeherePrio']);
+						foreach ($value['AufnahmeHoeherePrio'] AS $key=>$bewerber)
+						{
+							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
+						}
+						$mailcontent .= '</tbody></table>';
+					}
+					if ($bcc != '' && isset($value['AbgewiesenWeilBewerber']) && !isEmptyArray($value['AbgewiesenWeilBewerber']))
+					{
+						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
+										Folgende BewerberInnen wurden zu Abgewiesenen gemacht:</p>';
+						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Aufgenommene</th></thead>';
+						$mailcontent .= '					<tbody>';
+						sort($value['AbgewiesenWeilBewerber']);
+						foreach ($value['AbgewiesenWeilBewerber'] AS $key => $bewerber)
+						{
+							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
+						}
+						$mailcontent .= '</tbody></table>';
+					}
+				}
+
+				$mailcontent_data_arr['table'] = $mailcontent;
+
+				// Send email in Sancho design
+				if (!isEmptyString($mailcontent))
+				{
+					sendSanchoMail(
+						'Sancho_ReihungstestteilnehmerJob',
+						$mailcontent_data_arr,
+						$studiengang->retval[0]->email,
+						'Status Abgewiesen gesetzt',
+						'sancho_header_min_bw.jpg',
+						'sancho_footer_min_bw.jpg',
+						$from,
+						'',
+						$bcc);
+				}
+			}
+		}
+	}
 }
-
diff --git a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php
index db20b6897..dade1fb21 100644
--- a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php
+++ b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php
@@ -26,7 +26,7 @@ class Lehrauftrag extends Auth_Controller
             array(
                 'index' => 'lehre/lehrauftrag_bestellen:r',
                 'orderLehrauftrag' => 'lehre/lehrauftrag_bestellen:rw',
-				'Dashboard' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:rw'),
+				'Dashboard' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r'),
 				'LehrendeUebersicht' => array('lehre/lehrauftrag_erteilen:r')
             )
         );
@@ -107,14 +107,14 @@ class Lehrauftrag extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getNext();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;
             }
             elseif (isError($studiensemester))
             {
-                show_error($studiensemester->error);
+                show_error(getError($studiensemester));
             }
         }
 
@@ -154,8 +154,9 @@ class Lehrauftrag extends Auth_Controller
                 $studiengang_kz = (isset($lehrauftrag->studiengang_kz)) ? $lehrauftrag->studiengang_kz : null;
 
                 // Check if user is entitled to order this Lehrauftrag
-                if (!$this->permissionlib->isBerechtigt(self::BERECHTIGUNG_LEHRAUFTRAG_BESTELLEN, 'suid', $studiengang_kz)){
-                    show_error('Keine Bestellberechtigung für diesen Studiengang: '. $studiengang_kz);
+                if (!$this->permissionlib->isBerechtigt(self::BERECHTIGUNG_LEHRAUFTRAG_BESTELLEN, 'suid', $studiengang_kz))
+                {
+					return $this->outputJsonError('Sie haben keine Bestellberechtigung für diesen Studiengang: '. $studiengang_kz);
                 }
 
                 // update contract if contract exists and the betrag was changed
@@ -168,6 +169,10 @@ class Lehrauftrag extends Auth_Controller
                         $vertrag_betrag = $result[0]->betrag;
                         $vertrag_stunden = $result[0]->vertragsstunden;
                     }
+                    elseif (isError($result))
+					{
+						return $this->outputJsonError('Fehler beim Laden des Vertrags');
+					}
 
                     $hasChanged = ($betrag != floatval($vertrag_betrag) || $stunden != $vertrag_stunden) ? true : false;
 
@@ -190,6 +195,10 @@ class Lehrauftrag extends Auth_Controller
                                 'erteilt' => null
                             );
                         }
+                        else
+						{
+							return $this->outputJsonError('Fehler beim Vertragsupdate');
+						}
                     }
                 }
                 // else save new contract
@@ -215,6 +224,14 @@ class Lehrauftrag extends Auth_Controller
 							'vertrag_stunden' => $stunden
                         );
                     }
+                    elseif (isError($result) && $result->retval)
+					{
+						return $this->outputJsonError($result->retval);
+					}
+                    else
+					{
+						return $this->outputJsonError('Fehler beim Speichern des Vertrags');
+					}
 
                     $new_lehrvertrag_data_arr[] = array(
                         'studiensemester_kurzbz' => $lehrauftrag->studiensemester_kurzbz,
@@ -224,6 +241,10 @@ class Lehrauftrag extends Auth_Controller
                 }
             }
         }
+		else
+		{
+			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
+		}
 
         if (isset($json) && !isEmptyArray($json))
         {
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php b/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
index cc37eb9ec..4fc0a879b 100644
--- a/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
+++ b/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
@@ -71,14 +71,14 @@ class LehrauftragAkzeptieren extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getNext();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;
             }
             elseif (isError($studiensemester))
             {
-                show_error($studiensemester->error);
+                show_error(getError($studiensemester));
             }
         }
 
@@ -107,7 +107,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
         }
         else
         {
-            show_error('Password is missing');
+			return $this->outputJsonError('Passwort fehlt');
         }
 
         // Loop through lehraufträge
@@ -139,20 +139,20 @@ class LehrauftragAkzeptieren extends Auth_Controller
 								$account_found = true;
 							}
 						}
-						
+
                         if (!$account_found)
                         {
-                            show_error('Keine Berechtigung für diesen Vertrag');
+							return $this->outputJsonError('Sie haben keine Berechtigung für einen Vertrag');
                         }
                     }
                     else
                     {
-                        show_error($result->retval);
+						return $this->outputJsonError('Fehler beim Laden der Benutzerdaten');
                     }
                 }
                 else
                 {
-                    show_error($result->retval);
+					return $this->outputJsonError('Fehler beim Laden des Vertrags');
                 }
 
                 // Set status to accepted
@@ -165,6 +165,10 @@ class LehrauftragAkzeptieren extends Auth_Controller
                         'akzeptiert' => date('Y-m-d')
                     );
                 }
+				else
+				{
+					return $this->outputJsonError($result->retval);
+				}
             }
 
             // Output json to ajax
@@ -173,17 +177,21 @@ class LehrauftragAkzeptieren extends Auth_Controller
                 $this->outputJsonSuccess($json);
             }
         }
+		else
+		{
+			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
+		}
     }
 
 	/**
-	 * Check if lectors latest active Verwendung has inkludierte Lehre
+	 * Check if lectors latest Verwendung has inkludierte Lehre
 	 * - inkludierte_lehre is null OR 0: freelancer lector -> has NO inkludierte Lehre
 	 * - inkludierte_lehre -1: fix employed lector -> has inkludierte Lehre (all inclusive)
 	 * - inkludierte_lehre > 0: fix employed lector -> has inkludierte Lehre (value is amount of hours included)
 	 */
     public function checkInkludierteLehre()
 	{
-		$result = $this->BisverwendungModel->getLast($this->_uid);
+		$result = $this->BisverwendungModel->getLast($this->_uid, false);
 
 		if (hasData($result))
 		{
@@ -191,7 +199,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
 		}
 		else
 		{
-			$this->outputJsonError($result->retval);
+			$this->outputJsonError(getError($result));
 		}
 	}
 
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php b/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
index 1fe5a924a..b339c81a4 100644
--- a/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
+++ b/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
@@ -90,14 +90,14 @@ class LehrauftragErteilen extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getNext();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;
             }
             elseif (isError($studiensemester))
             {
-                show_error($studiensemester->error);
+                show_error(getError($studiensemester));
             }
         }
 
@@ -122,10 +122,10 @@ class LehrauftragErteilen extends Auth_Controller
     public function approveLehrauftrag()
     {
         $lehrauftrag_arr = json_decode($this->input->post('selected_data'));
-        
-        if (is_array($lehrauftrag_arr)) 
+
+        if (is_array($lehrauftrag_arr))
         {
-            foreach ($lehrauftrag_arr as $lehrauftrag) 
+            foreach ($lehrauftrag_arr as $lehrauftrag)
             {
                 $mitarbeiter_uid = (isset($lehrauftrag->mitarbeiter_uid)) ? $lehrauftrag->mitarbeiter_uid : null;
                 $vertrag_id = (isset($lehrauftrag->vertrag_id)) ? $lehrauftrag->vertrag_id : null;
@@ -146,31 +146,42 @@ class LehrauftragErteilen extends Auth_Controller
                     }
                     elseif (isError(($result)))
                     {
-                        show_error($result->retval);
+						return $this->outputJsonError('Fehler beim Laden einer Lehrveranstaltung.');
                     }
                 }
                 elseif (isError($result))
                 {
-                    show_error($result->retval);
+					return $this->outputJsonError('Fehler beim Laden von Lehreinheitdaten.');
                 }
 
                 // Check if user is entitled to approve this lehrauftrag (by permission and organisational unit)
-                if (!$this->permissionlib->isBerechtigt(self::BERECHTIGUNG_LEHRAUFTRAG_ERTEILEN, 'suid', $lv_oe_kurzbz)){
-                    show_error('Keine Erteilberechtigung für diese Organisationseinheit: '. $lv_oe_kurzbz);
+                if (!$this->permissionlib->isBerechtigt(self::BERECHTIGUNG_LEHRAUFTRAG_ERTEILEN, 'suid', $lv_oe_kurzbz))
+                {
+					return $this->outputJsonError('Sie haben keine Erteilberechtigung für diese Organisationseinheit: '. $lv_oe_kurzbz);
                 }
 
                 // Approve lehrauftrag by setting vertragsstatus to 'erteilt'
                 $result = $this->VertragvertragsstatusModel->setStatus($vertrag_id, $mitarbeiter_uid, 'erteilt');
 
-                if ($result->retval) {
+                if (!isError($result))
+                {
                     $json [] = array(
                         'row_index' => $lehrauftrag->row_index,
                         'erteilt' => date('Y-m-d')
                     );
                 }
+                else
+				{
+					return $this->outputJsonError($result->retval);
+				}
             }
         }
-        // output json to ajax
+        else
+		{
+			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
+		}
+
+        // output success json to ajax
         if (isset($json) && !isEmptyArray($json))
         {
             $this->outputJsonSuccess($json);
diff --git a/application/controllers/organisation/Studienjahr.php b/application/controllers/organisation/Studienjahr.php
index e154734d4..ed8c0b6a1 100644
--- a/application/controllers/organisation/Studienjahr.php
+++ b/application/controllers/organisation/Studienjahr.php
@@ -44,7 +44,7 @@ class Studienjahr extends Auth_Controller
 		$studienjahr = $this->StudienjahrModel->load();
 		if ($studienjahr->error)
 		{
-			show_error($studienjahr->retval);
+			show_error(getError($studienjahr));
 		}
 
 		$data = array(
@@ -66,7 +66,7 @@ class Studienjahr extends Auth_Controller
 		$studienjahr = $this->StudienjahrModel->load($studienjahr_kurzbez);
 		if ($studienjahr->error)
 		{
-			show_error($studienjahr->retval);
+			show_error(getError($studienjahr));
 		}
 		$data = array(
 			"studienjahr" => $studienjahr->retval
@@ -86,7 +86,7 @@ class Studienjahr extends Auth_Controller
 		$allstudienjahrkurzbz = $this->StudienjahrModel->load();
 		if ($allstudienjahrkurzbz->error)
 		{
-			show_error($allstudienjahrkurzbz->retval);
+			show_error(getError($allstudienjahrkurzbz));
 		}
 		$studienjahrkurzbz = $allstudienjahrkurzbz->retval[0]->studienjahr_kurzbz;
 		$years = $this->__getYearsFromStudienjahr($studienjahrkurzbz);
@@ -125,7 +125,7 @@ class Studienjahr extends Auth_Controller
 
 		if ($studienjahr->error)
 		{
-			show_error($studienjahr->retval);
+			show_error(getError($studienjahr));
 		}
 
 		redirect("/organisation/studienjahr/editStudienjahr/".str_replace("/", "_", $data['studienjahr_kurzbz']."?saved=true"));
@@ -153,7 +153,7 @@ class Studienjahr extends Auth_Controller
 			return $data;
 		} else
 		{
-			show_error($validation->retval);
+			show_error(getError($validation));
 		}
 	}
 
@@ -188,7 +188,7 @@ class Studienjahr extends Auth_Controller
 
 		if ($studienjahr->error)
 		{
-			show_error($studienjahr->retval);
+			show_error(getError($studienjahr));
 		}
 
 		redirect("/organisation/studienjahr/editStudienjahr/".str_replace("/", "_", $data['studienjahr_kurzbz']."?saved=true"));
@@ -207,7 +207,7 @@ class Studienjahr extends Auth_Controller
 
 		if ($studienjahr->error)
 		{
-			show_error($studienjahr->retval);
+			show_error(getError($studienjahr));
 		}
 
 		redirect("/organisation/studienjahr/listStudienjahr");
diff --git a/application/controllers/organisation/Studiensemester.php b/application/controllers/organisation/Studiensemester.php
index 1e1aa45ee..10fa5b3ad 100644
--- a/application/controllers/organisation/Studiensemester.php
+++ b/application/controllers/organisation/Studiensemester.php
@@ -45,7 +45,7 @@ class Studiensemester extends Auth_Controller
 		$semester = $this->StudiensemesterModel->load();
 		if ($semester->error)
 		{
-			show_error($semester->retval);
+			show_error(getError($semester));
 		}
 
 		$data = array(
@@ -64,13 +64,13 @@ class Studiensemester extends Auth_Controller
 		$semester = $this->StudiensemesterModel->load($semester_kurzbez);
 		if ($semester->error)
 		{
-			show_error($semester->retval);
+			show_error(getError($semester));
 		}
 		$this->StudienjahrModel->addOrder('studienjahr_kurzbz', "DESC");
 		$allstudienjahre = $this->StudienjahrModel->load();
 		if ($allstudienjahre->error)
 		{
-			show_error($allstudienjahre->retval);
+			show_error(getError($allstudienjahre));
 		}
 		$data = array(
 			"semester" => $semester->retval,
@@ -90,7 +90,7 @@ class Studiensemester extends Auth_Controller
 		$allstudienjahre = $this->StudienjahrModel->load();
 		if ($allstudienjahre->error)
 		{
-			show_error($allstudienjahre->retval);
+			show_error(getError($allstudienjahre));
 		}
 
 		$data = array(
@@ -117,7 +117,7 @@ class Studiensemester extends Auth_Controller
 
 		if ($semester->error)
 		{
-			show_error($semester->retval);
+			show_error(getError($semester));
 		}
 
 		redirect("/organisation/studiensemester/editStudiensemester/".$data['studiensemester_kurzbz']."?saved=true");
@@ -161,7 +161,7 @@ class Studiensemester extends Auth_Controller
 			return $data;
 		} else
 		{
-			show_error($validation->retval);
+			show_error(getError($validation));
 		}
 	}
 
@@ -197,7 +197,7 @@ class Studiensemester extends Auth_Controller
 
 		if ($semester->error)
 		{
-			show_error($semester->retval);
+			show_error(getError($semester));
 		}
 
 		redirect("/organisation/studiensemester/editStudiensemester/".$data['studiensemester_kurzbz']."?saved=true");
@@ -214,7 +214,7 @@ class Studiensemester extends Auth_Controller
 
 		if ($semester->error)
 		{
-			show_error($semester->retval);
+			show_error(getError($semester));
 		}
 
 		redirect("/organisation/studiensemester/listStudiensemester");
diff --git a/application/controllers/person/BPKWartung.php b/application/controllers/person/BPKWartung.php
index a8e9b8829..52cb09c5c 100644
--- a/application/controllers/person/BPKWartung.php
+++ b/application/controllers/person/BPKWartung.php
@@ -71,7 +71,7 @@ class BPKWartung extends Auth_Controller
 		$personexists = $this->PersonModel->load($person_id);
 
 		if (isError($personexists))
-			show_error($personexists->retval);
+			show_error(getError($personexists));
 
 		if (!hasData($personexists))
 			show_error('Person does not exist!');
@@ -122,7 +122,7 @@ class BPKWartung extends Auth_Controller
 
 		if (isError($stammdaten))
 		{
-			show_error($stammdaten->retval);
+			show_error(getError($stammdaten));
 		}
 
 		if (!isset($stammdaten->retval))
@@ -132,7 +132,7 @@ class BPKWartung extends Auth_Controller
 
 		if (isError($adresse))
 		{
-			show_error($adresse->retval);
+			show_error(getError($adresse));
 		}
 
 		$data = array(
diff --git a/application/controllers/system/FASMessages.php b/application/controllers/system/FASMessages.php
deleted file mode 100644
index 6928a919d..000000000
--- a/application/controllers/system/FASMessages.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class FASMessages extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'write' => 'basis/message:rw',
-				'writeReply' => 'basis/message:rw'
-			)
-		);
-
-		// Loads the message library
-		$this->load->library('MessageLib');
-
-		// Loads the widget library
-		$this->load->library('WidgetLib');
-
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Write a new message
-	 */
-	public function write($sender_id)
- 	{
-		$prestudent_id = $this->input->post('prestudent_id'); // recipients prestudend_id(s)
-
-		if (!is_numeric($sender_id))
- 		{
- 			show_error('The current logged user person_id is not defined');
- 		}
-
-		$msgVarsData = $this->_getMsgVarsData($prestudent_id);
-
-		// Retrieves message vars for a person from view view vw_msg_vars_person
-		$variablesArray = $this->_getMessageVarsPerson();
-
- 		// Organisation units used to get the templates
-		$oe_kurzbz = $this->_getOeKurzbz($sender_id);
-
- 		// Admin or commoner?
- 		$isAdmin = $this->_getIsAdmin($sender_id);
-
- 		$data = array(
- 			'recipients' => getData($msgVarsData),
- 			'variables' => $variablesArray,
- 			'oe_kurzbz' => $oe_kurzbz, // used to get the templates
- 			'isAdmin' => $isAdmin
- 		);
-
- 		$this->load->view('system/messages/messageWrite', $data);
- 	}
-
-	/**
-	 * Write a reply
-	 */
-	public function writeReply($sender_id, $msg_id, $receiver_id)
- 	{
-		$prestudent_id = $this->input->post('prestudent_id'); // recipients prestudend_id(s)
-
-		if (!is_numeric($sender_id))
- 		{
- 			show_error('The current logged user person_id is not defined');
- 		}
-
-		if (!is_numeric($msg_id))
- 		{
- 			show_error('The msg_id must be a number');
- 		}
-
-		if (!is_numeric($receiver_id))
- 		{
- 			show_error('The receiver_id must be a number');
- 		}
-
-		$msg = $this->_getMessage($msg_id, $receiver_id);
-
-		$msgVarsData = $this->_getMsgVarsData($prestudent_id);
-
-		// Retrieves message vars for a person from view view vw_msg_vars_person
-		$variablesArray = $this->_getMessageVarsPerson();
-
- 		// Organisation units used to get the templates
-		$oe_kurzbz = $this->_getOeKurzbz($sender_id);
-
- 		// Admin or commoner?
- 		$isAdmin = $this->_getIsAdmin($sender_id);
-
- 		$data = array(
- 			'recipients' => getData($msgVarsData),
- 			'message' => $msg,
- 			'variables' => $variablesArray,
- 			'oe_kurzbz' => $oe_kurzbz, // used to get the templates
- 			'isAdmin' => $isAdmin
- 		);
-
- 		$this->load->view('system/messages/messageWrite', $data);
- 	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 *
-	 */
-	private function _getMessage($msg_id, $receiver_id)
-	{
-		$msg = $this->messagelib->getMessage($msg_id, $receiver_id);
-		if (isError($msg))
-		{
-			show_error(getData($msg));
-		}
-		elseif (!hasData($msg))
-		{
-			show_error('The selected message does not exist');
-		}
-		else
-		{
-			$msg = getData($msg)[0];
-		}
-
-		return $msg;
-	}
-
-	/**
-	 * Retrieves message vars from view vw_msg_vars
-	 */
-	private function _getMsgVarsData($prestudent_id)
-	{
-		$this->load->model('system/Message_model', 'MessageModel');
-		$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-
-		if (isError($msgVarsData))
-		{
-			show_error(getData($msgVarsData));
-		}
-
-		return $msgVarsData;
-	}
-
-	/**
-	 * Wrapper method to call messagelib->getMessageVarsPerson
-	 */
-	private function _getMessageVarsPerson()
-	{
-		$variables = $this->messagelib->getMessageVarsPerson();
-
-		if (isError($variables)) show_error(getData($variables));
-
-		return getData($variables);
-	}
-
-	/**
-	 * Wrapper method to call messagelib->getOeKurzbz
-	 */
-	private function _getOeKurzbz($sender_id)
-	{
-		$oe_kurzbz = $this->messagelib->getOeKurzbz($sender_id);
-
-		if (isError($oe_kurzbz)) show_error(getData($oe_kurzbz));
-
-		return getData($oe_kurzbz);
-	}
-
-	/**
-	 * Wrapper method to call messagelib->getIsAdmin
-	 */
-	private function _getIsAdmin($sender_id)
-	{
-		$isAdmin = $this->messagelib->getIsAdmin($sender_id);
-
-		if (isError($isAdmin)) show_error(getData($isAdmin));
-
-		return getData($isAdmin);
-	}
-}
diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
deleted file mode 100644
index ec630da1e..000000000
--- a/application/controllers/system/Messages.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Messages extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'write' => array('basis/message:rw', 'infocenter:rw'),
-				'send' => array('basis/message:rw', 'infocenter:rw'),
-				'sendJson' => array('basis/message:rw', 'infocenter:rw'),
-				'getVorlage' => array('basis/message:r', 'infocenter:r'),
-				'parseMessageText' => array('basis/message:r', 'infocenter:r'),
-				'getMessageFromIds' => array('basis/message:r', 'infocenter:r')
-			)
-		);
-
-		// Loads the message library
-		$this->load->library('MessageLib');
-
-		// Loads the widget library
-		$this->load->library('WidgetLib');
-
-		$this->load->model('system/Message_model', 'MessageModel');
-		$this->load->model('CL/Messages_model', 'CLMessagesModel');
-
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Write a new message
-	 */
-	public function write()
-	{
-		$person_id = $this->input->post('person_id');
-		$sender_id = null;
-
-		$authUser = $this->CLMessagesModel->getAuthUser();
-		if (isError($authUser))
-		{
-			show_error(getData($authUser));
-		}
-		else
-		{
-			$sender_id = getData($authUser)[0]->person_id;
-		}
-
-		$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-		if (isError($msgVarsData)) show_error(getData($msgVarsData));
-
-		// Retrieves message vars for a person from view view vw_msg_vars_person
-		$variables = $this->messagelib->getMessageVarsPerson();
-		if (isError($variables)) show_error(getData($variables));
-
- 		// Organisation units used to get the templates
-		$oe_kurzbz = $this->messagelib->getOeKurzbz($sender_id);
-		if (isError($oe_kurzbz)) show_error(getData($oe_kurzbz));
-
- 		// Admin or commoner?
-		$isAdmin = $this->messagelib->getIsAdmin($sender_id);
-		if (isError($isAdmin)) show_error(getData($isAdmin));
-
-		$data = array (
-			'recipients' => getData($msgVarsData),
-			'variables' => getData($variables),
-			'oe_kurzbz' => getData($oe_kurzbz), // used to get the templates
-			'isAdmin' => getData($isAdmin)
-		);
-
-		$this->load->view('system/messages/messageWrite', $data);
-	}
-
-	/**
-	 * Send message
-	 */
-	public function send()
-	{
-		$persons = $this->input->post('persons');
-		$relationmessage_id = $this->input->post('relationmessage_id');
-
-		$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($persons);
-
-		$send = $this->CLMessagesModel->send($msgVarsData, $relationmessage_id);
-
-		$this->load->view('system/messages/messageSent', array('success' => isSuccess($send)));
-	}
-
-	/**
-	 * Send message, response is in JSON format
-	 */
-	public function sendJson()
-	{
-		$prestudents = $this->input->post('prestudents');
-		$vorlage_kurzbz = $this->input->post('vorlage_kurzbz');
-		$oe_kurzbz = $this->input->post('oe_kurzbz');
-		$msgVars = $this->input->post('msgvars');
-
-		$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
-
-		// Adds the organisation unit to each prestudent
-		if (isEmptyString($oe_kurzbz) && hasData($msgVarsData) && hasData($prestudentsData))
-		{
-			$this->CLMessagesModel->addOeToPrestudents($msgVarsData, $prestudentsData);
-		}
-
-		$send = $this->CLMessagesModel->send($msgVarsData, null, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
-		if (isError($send))
-		{
-			$this->outputJsonError(getData($send));
-		}
-		else
-		{
-			$this->outputJsonSuccess(getData($send));
-		}
-	}
-
-	/**
-	 * getVorlage
-	 */
-	public function getVorlage()
-	{
-		$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
-		$result = null;
-
-		if (!isEmptyString($vorlage_kurzbz))
-		{
-			$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
-			$this->VorlagestudiengangModel->addOrder('version','DESC');
-
-			$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
-		}
-		else
-		{
-			$result = error('The given vorlage_kurzbz is not valid');
-		}
-
-		if (isError($result) || !hasData($result))
-		{
-			$this->outputJsonError(getData($result));
-		}
-		else
-		{
-			$this->outputJsonSuccess(getData($result));
-		}
-	}
-
-	/**
-	 * parseMessageText
-	 */
-	public function parseMessageText()
-	{
-		$person_id = $this->input->get('person_id');
-		$text = $this->input->get('text');
-		$parsedText = '';
-		$data = null;
-
-		if (is_numeric($person_id))
-		{
-			$data = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-		}
-		else
-		{
-			$data = error('The given person_id is not a valid number');
-		}
-
-		if (isError($data) || !hasData($data))
-		{
-			$this->outputJsonError(getData($data));
-		}
-		else
-		{
-			$parsedText = $this->messagelib->parseMessageText($text, $this->CLMessagesModel->replaceKeys((array)getData($data)[0]));
-
-			$this->outputJsonSuccess($parsedText);
-		}
-	}
-
-	/**
-	 * Outputs message data for a message (identified my msg id and receiver id) in JSON format
-	 * @param $msg_id
-	 * @param $receiver_id
-	 */
-	public function getMessageFromIds()
-	{
-		$msg_id = $this->input->get('msg_id');
-		$receiver_id = $this->input->get('receiver_id');
-
-		$msg = $this->messagelib->getMessage($msg_id, $receiver_id);
-
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode(array(getData($msg)[0])));
-	}
-}
diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
index 070750b7c..2bb003567 100644
--- a/application/controllers/system/Phrases.php
+++ b/application/controllers/system/Phrases.php
@@ -45,7 +45,7 @@ class Phrases extends Auth_Controller
 	{
 		$phrases = $this->phraseslib->getPhraseByApp('aufnahme');
 		if ($phrases->error)
-			show_error($phrases->retval);
+			show_error(getError($phrases));
 
 		$data = array(
 			'app' => 'aufnahme',
@@ -67,7 +67,7 @@ class Phrases extends Auth_Controller
 
 		$phrase_inhalt = $this->phraseslib->getPhraseInhalt($phrase_id);
 		if ($phrase_inhalt->error)
-			show_error($phrase_inhalt->retval);
+			show_error(getError($phrase_inhalt));
 
 		$data = array(
 			'phrase_id' => $phrase_id,
@@ -88,7 +88,7 @@ class Phrases extends Auth_Controller
 
 		$phrase_inhalt = $this->phraseslib->delPhrasentext($phrasentext_id);
 		if ($phrase_inhalt->error)
-			show_error($phrase_inhalt->retval);
+			show_error(getError($phrase_inhalt));
 
 		redirect('/system/Phrases/view/'.$phrase_id);
 	}
@@ -102,7 +102,7 @@ class Phrases extends Auth_Controller
 
 		$phrase = $this->phraseslib->getPhrase($phrase_id);
 		if ($phrase->error)
-			show_error($phrase->retval);
+			show_error(getError($phrase));
 
 		if (count($phrase->retval) != 1)
 			show_error('Phrase nicht vorhanden! ID: '.$phrase_id);
@@ -124,7 +124,7 @@ class Phrases extends Auth_Controller
 
 		$phrase = $this->phraseslib->savePhrase($phrase_id, $data);
 		if ($phrase->error)
-			show_error($phrase->retval);
+			show_error(getError($phrase));
 
 		$phrase_id = $phrase->retval;
 
@@ -145,7 +145,7 @@ class Phrases extends Auth_Controller
 
 		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
 		if ($resultOE->error)
-			show_error($resultOE->retval);
+			show_error(getError($resultOE));
 
 		if (hasData($resultOE))
 		{
@@ -161,7 +161,7 @@ class Phrases extends Auth_Controller
 
 			$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
 			if ($phrase_inhalt->error)
-				show_error($phrase_inhalt->retval);
+				show_error(getError($phrase_inhalt));
 
 			$phrase_inhalt_id = $phrase_inhalt->retval;
 
@@ -180,7 +180,7 @@ class Phrases extends Auth_Controller
 	{
 		$phrase_inhalt = $this->phraseslib->getPhrasentextById($phrasentext_id);
 		if ($phrase_inhalt->error)
-			show_error($phrase_inhalt->retval);
+			show_error(getError($phrase_inhalt));
 
 		$data = $phrase_inhalt->retval[0];
 
@@ -204,7 +204,7 @@ class Phrases extends Auth_Controller
 
 		$phrase_inhalt = $this->phraseslib->updatePhraseInhalt($phrase_inhalt_id, $data);
 		if ($phrase_inhalt->error)
-			show_error($phrase_inhalt->retval);
+			show_error(getError($phrase_inhalt));
 
 
 		redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
diff --git a/application/controllers/system/Vorlage.php b/application/controllers/system/Vorlage.php
index 4712d0e68..7ae79c77f 100644
--- a/application/controllers/system/Vorlage.php
+++ b/application/controllers/system/Vorlage.php
@@ -49,7 +49,7 @@ class Vorlage extends Auth_Controller
 		$vorlage = $this->vorlagelib->getVorlageByMimetype($mimetype);
 
 		if ($vorlage->error)
-			show_error($vorlage->retval);
+			show_error(getError($vorlage));
 
 		$data = array (
 			'mimetype' => $mimetype,
@@ -66,7 +66,7 @@ class Vorlage extends Auth_Controller
 		$vorlagentext = $this->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz);
 
 		if ($vorlagentext->error)
-			show_error($vorlagentext->retval);
+			show_error(getError($vorlagentext));
 
 		$data = array (
 			'vorlage_kurzbz' => $vorlage_kurzbz,
@@ -83,7 +83,7 @@ class Vorlage extends Auth_Controller
 		$vorlage = $this->vorlagelib->getVorlage($vorlage_kurzbz);
 
 		if ($vorlage->error)
-			show_error($vorlage->retval);
+			show_error(getError($vorlage));
 
 		if (count($vorlage->retval) != 1)
 			show_error('Nachricht nicht vorhanden! ID: '.$vorlage_kurzbz);
@@ -119,7 +119,7 @@ class Vorlage extends Auth_Controller
 		$vorlage = $this->vorlagelib->saveVorlage($vorlage_kurzbz, $data);
 
 		if ($vorlage->error)
-			show_error($vorlage->retval);
+			show_error(getError($vorlage));
 
 		$vorlage_kurzbz = $vorlage->retval;
 
@@ -137,7 +137,7 @@ class Vorlage extends Auth_Controller
 		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
 
 		if ($resultOE->error)
-			show_error($resultOE->retval);
+			show_error(getError($resultOE));
 
 		if (hasData($resultOE))
 		{
@@ -153,7 +153,7 @@ class Vorlage extends Auth_Controller
 			$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
 
 			if ($vorlagetext->error)
-				show_error($vorlagetext->retval);
+				show_error(getError($vorlagetext));
 
 			$vorlagestudiengang_id = $vorlagetext->retval;
 
@@ -170,7 +170,7 @@ class Vorlage extends Auth_Controller
 		$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
 
 		if ($vorlagetext->error)
-			show_error($vorlagetext->retval);
+			show_error(getError($vorlagetext));
 
 		$data = $vorlagetext->retval[0];
 
@@ -254,7 +254,7 @@ class Vorlage extends Auth_Controller
 		$vorlagetext = $this->vorlagelib->updateVorlagetext($data['vorlagestudiengang_id'], $data);
 
 		if ($vorlagetext->error)
-			show_error($vorlagetext->retval);
+			show_error(getError($vorlagetext));
 
 		redirect('/system/vorlage/editText/'.$data['vorlagestudiengang_id']);
 	}
@@ -266,10 +266,10 @@ class Vorlage extends Auth_Controller
 		$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
 
 		if ($vorlagetext->error)
-			show_error($vorlagetext->retval);
+			show_error(getError($vorlagetext));
 
 		$data = array(
-			'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $jsonDecodedForm)
+			'text' => parseText($vorlagetext->retval[0]->text, $jsonDecodedForm)
 		);
 
 		$this->load->view('system/vorlage/templatetextPreview', $data);
diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
index 30df81281..9906e83cb 100644
--- a/application/controllers/system/aufnahme/PrestudentMultiAssign.php
+++ b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
@@ -61,7 +61,7 @@ class PrestudentMultiAssign extends Auth_Controller
 		}
 		else if (isError($returnUsers))
 		{
-			show_error($returnUsers->retval);
+			show_error(getError($returnUsers));
 		}
 	}
 
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 2f66e0e2d..92636e6df 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -24,7 +24,6 @@ class InfoCenter extends Auth_Controller
 
 	const FILTER_ID = 'filter_id';
 	const PREV_FILTER_ID = 'prev_filter_id';
-	const RELOAD_DATASET = 'reloadDataset';
 	const KEEP_TABLESORTER_FILTER = 'keepTsFilter';
 
 	private $_uid; // contains the UID of the logged user
@@ -70,6 +69,7 @@ class InfoCenter extends Auth_Controller
 	// Name of Interessentenstatus
 	const INTERESSENTSTATUS = 'Interessent';
 	const ABGEWIESENERSTATUS = 'Abgewiesener';
+	const BEWERBERSTATUS = 'Bewerber';
 
 	// Statusgruende for which no Studiengangsfreigabemessage should be sent
 	private $_statusgruendeNoStgFreigabeMessage = array('FIT Programm', 'FIT program', 'FIT programme');
@@ -194,7 +194,7 @@ class InfoCenter extends Auth_Controller
 		$personexists = $this->PersonModel->load($person_id);
 
 		if (isError($personexists))
-			show_error($personexists->retval);
+			show_error(getError($personexists));
 
 		if (!hasData($personexists))
 			show_error('Person does not exist!');
@@ -205,8 +205,7 @@ class InfoCenter extends Auth_Controller
 			// mark person as locked for editing
 			$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
 
-			if (isError($result))
-				show_error($result->retval);
+			if (isError($result)) show_error(getError($result));
 		}
 
 		$persondata = $this->_loadPersonData($person_id);
@@ -232,13 +231,12 @@ class InfoCenter extends Auth_Controller
 	{
 		$result = $this->PersonLockModel->unlockPerson($person_id, self::APP);
 
-		if (isError($result))
-			show_error($result->retval);
+		if (isError($result)) show_error(getError($result));
 
 		$redirectLink = '/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
 
 		// Force reload of Dataset after Unlock
-		$redirectLink .= '&'.self::RELOAD_DATASET.'=true&'.self::KEEP_TABLESORTER_FILTER.'=true';
+		$redirectLink .= '&'.self::KEEP_TABLESORTER_FILTER.'=true';
 
 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -496,7 +494,9 @@ class InfoCenter extends Auth_Controller
 
 		$logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
 
-		$akteresult = $this->AkteModel->loadWhere(array('person_id' => $logdata['person_id'], 'formal_geprueft_amum !=' => NULL));
+		$person_id = $logdata['person_id'];
+
+		$akteresult = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'formal_geprueft_amum !=' => NULL));
 
 		if (hasData($lastStatus) && isSuccess($akteresult))
 		{
@@ -532,6 +532,8 @@ class InfoCenter extends Auth_Controller
 				if (isSuccess($result))
 				{
 					$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+					$json->retval['nonCriticalErrors'] = array();
+					$json->retval['infoMessages'] = array();
 
 					//set documents which have been formal geprüft to accepted
 					$dokument_kurzbzs = array();
@@ -545,7 +547,7 @@ class InfoCenter extends Auth_Controller
 
 					// acceptresult returns null if no documents to accept
 					if ($acceptresult !== null && isError($acceptresult))
-						$json->retval['nonCriticalErrors'] = 'error when accepting documents in FAS';
+						$json->retval['nonCriticalErrors'][] = 'error when accepting documents in FAS';
 
 					$logparams = array($prestudent_id, $logdata['studiengang_kurzbz'], '');
 
@@ -557,8 +559,69 @@ class InfoCenter extends Auth_Controller
 						if (hasData($statusgrund_kurzbz))
 							$logparams[2] = ', confirmation type '.$statusgrund_kurzbz->retval[0]->bezeichnung_mehrsprachig[0];
 					}
+					else
+					{
+						// check if there is already a Bewerberstatus and Reihungsverfahren already absolviert
+						$bewerber = $this->PersonModel->hasBewerber($person_id, $lastStatus->studiensemester_kurzbz, 'b');
 
-					$this->_log($logdata['person_id'], 'freigegeben', $logparams);
+						if (hasData($bewerber))
+						{
+							$bewerbercnt = getData($bewerber);
+
+							if (is_numeric($bewerbercnt[0]->anzahl_bewerber) && $bewerbercnt[0]->anzahl_bewerber > 0)
+							{
+								// then insert Bewerberstatus and rt absolviert, teilgenommen for prestudent
+								$bewerberresult = $this->PrestudentstatusModel->insert(
+									array(
+										'prestudent_id' => $prestudent_id,
+										'status_kurzbz' => self::BEWERBERSTATUS,
+										'studiensemester_kurzbz' => $lastStatus->studiensemester_kurzbz,
+										'ausbildungssemester' => $lastStatus->ausbildungssemester,
+										'datum' => date('Y-m-d'),
+										'orgform_kurzbz' => $lastStatus->orgform_kurzbz,
+										'studienplan_id' => $lastStatus->studienplan_id,
+										'insertvon' => $this->_uid,
+										'insertamum' => date('Y-m-d H:i:s')
+									)
+								);
+
+								if (isError($bewerberresult))
+									$json->retval['nonCriticalErrors'][] = 'error when inserting Bewerberstatus';
+
+								$rtangetretenres = $this->PrestudentModel->update(
+									$prestudent_id,
+									array(
+										'reihungstestangetreten' => true
+									)
+								);
+
+								if (isError($rtangetretenres))
+								{
+									$json->retval['nonCriticalErrors'][] = 'error when setting reihungstestangetreten';
+								}
+								else
+								{
+									$json->retval['infoMessages'][] = $this->p->t('infocenter', 'rtPunkteEintragenInfo');
+									$this->load->model('crm/RtPerson_model', 'RtPersonModel');
+
+									$rtteilgenommenres = $this->RtPersonModel->update(
+										array(
+											'person_id' => $person_id,
+											'studienplan_id' => $lastStatus->studienplan_id
+										),
+										array(
+											'teilgenommen' => true
+										)
+									);
+
+									if (isError($rtteilgenommenres))
+										$json->retval['nonCriticalErrors'][] = 'error when setting reihungstest teilgenommen';
+								}
+							}
+						}
+					}
+
+					$this->_log($person_id, 'freigegeben', $logparams);
 
 					$this->_sendFreigabeMail($prestudent_id);
 				}
@@ -652,7 +715,7 @@ class InfoCenter extends Auth_Controller
 	public function reloadMessages($person_id)
 	{
 		$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
-		$this->load->view('system/messages/messageList.php', array('messages' => $messages->retval));
+		$this->load->view('system/infocenter/messageList.php', array('messages' => $messages->retval));
 	}
 
 	/**
@@ -665,7 +728,7 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($notizen))
 		{
-			show_error($notizen->retval);
+			show_error(getError($notizen));
 		}
 
 		$this->load->view('system/infocenter/notizen.php', array('notizen' => $notizen->retval));
@@ -693,14 +756,14 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($akte))
 		{
-			show_error($akte->retval);
+			show_error(getError($akte));
 		}
 
 		$aktecontent = $this->dmslib->getAkteContent($akte_id);
 
 		if (isError($aktecontent))
 		{
-			show_error($aktecontent->retval);
+			show_error(getError($aktecontent));
 		}
 
 		$this->output
@@ -943,17 +1006,12 @@ class InfoCenter extends Auth_Controller
 
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
+
 		$currentFilterId = $this->input->get(self::FILTER_ID);
-		$reloadDatasetParam = self::RELOAD_DATASET.'=true';
 		if (isset($currentFilterId))
 		{
-			$freigegebenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId.'&'.$reloadDatasetParam;
-			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId.'&'.$reloadDatasetParam;
-		}
-		else
-		{
-			$freigegebenLink .= '?'.$reloadDatasetParam;
-			$reihungstestAbsolviertLink .= '?'.$reloadDatasetParam;
+			$freigegebenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
+			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1019,7 +1077,7 @@ class InfoCenter extends Auth_Controller
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
-			$link .= '?'.self::FILTER_ID.'='.$prevFilterId.'&'.self::RELOAD_DATASET.'=true&'.self::KEEP_TABLESORTER_FILTER.'=true';
+			$link .= '?'.self::FILTER_ID.'='.$prevFilterId.'&'.self::KEEP_TABLESORTER_FILTER.'=true';
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1049,14 +1107,13 @@ class InfoCenter extends Auth_Controller
 		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.$page));
 
 		// Generate the home link with the eventually loaded filter
-		$reloadDatasetParam = '?'.self::RELOAD_DATASET.'=true';
-		$homeLink = site_url(self::INFOCENTER_URI.'/'.self::INDEX_PAGE.$reloadDatasetParam);
-		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE.$reloadDatasetParam);
-		$absolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE.$reloadDatasetParam);
+		$homeLink = site_url(self::INFOCENTER_URI.'/'.self::INDEX_PAGE);
+		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
+		$absolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
-			$homeLink .= '&'.self::FILTER_ID.'='.$prevFilterId;
+			$homeLink .= '?'.self::FILTER_ID.'='.$prevFilterId;
 		}
 
 		$this->navigationlib->setSessionElementMenu(
@@ -1171,7 +1228,7 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($locked))
 		{
-			show_error($locked->retval);
+			show_error(getError($locked));
 		}
 
 		$lockedby = null;
@@ -1190,7 +1247,7 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($stammdaten))
 		{
-			show_error($stammdaten->retval);
+			show_error(getError($stammdaten));
 		}
 
 		if (!isset($stammdaten->retval))
@@ -1200,21 +1257,21 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($dokumente))
 		{
-			show_error($dokumente->retval);
+			show_error(getError($dokumente));
 		}
 
 		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
 
 		if (isError($dokumente_nachgereicht))
 		{
-			show_error($dokumente_nachgereicht->retval);
+			show_error(getError($dokumente_nachgereicht));
 		}
 
 		$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
 
 		if (isError($messages))
 		{
-			show_error($messages->retval);
+			show_error(getError($messages));
 		}
 
 		$logs = $this->personloglib->getLogs($person_id);
@@ -1223,21 +1280,21 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($notizen))
 		{
-			show_error($notizen->retval);
+			show_error(getError($notizen));
 		}
 
 		$notizen_bewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung%');
 
 		if (isError($notizen_bewerbung))
 		{
-			show_error($notizen_bewerbung->retval);
+			show_error(getError($notizen_bewerbung));
 		}
 
 		$user_person = $this->PersonModel->getByUid($this->_uid);
 
 		if (isError($user_person))
 		{
-			show_error($user_person->retval);
+			show_error(getError($user_person));
 		}
 
 		$data = array (
@@ -1268,7 +1325,7 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($prestudenten))
 		{
-			show_error($prestudenten->retval);
+			show_error(getError($prestudenten));
 		}
 
 		foreach ($prestudenten->retval as $prestudent)
@@ -1277,7 +1334,7 @@ class InfoCenter extends Auth_Controller
 
 			if (isError($prestudentWithZgv))
 			{
-				show_error($prestudentWithZgv->retval);
+				show_error(getError($prestudentWithZgv));
 			}
 
 			$zgvpruefung = $prestudentWithZgv->retval[0];
@@ -1385,13 +1442,13 @@ class InfoCenter extends Auth_Controller
 				$starta = $this->StudiensemesterModel->load($a->prestudentstatus->studiensemester_kurzbz);
 				if (!hasData($starta))
 				{
-					show_error($starta->retval);
+					show_error(getError($starta));
 				}
 
 				$startb = $this->StudiensemesterModel->load($b->prestudentstatus->studiensemester_kurzbz);
 				if (!hasData($startb))
 				{
-					show_error($startb->retval);
+					show_error(getError($startb));
 				}
 
 				$starta = date_format(date_create($starta->retval[0]->start), 'Y-m-d');
@@ -1463,7 +1520,7 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($prestudent))
 		{
-			show_error($prestudent->retval);
+			show_error(getError($prestudent));
 		}
 
 		$person_id = $prestudent->retval[0]->person_id;
@@ -1505,7 +1562,7 @@ class InfoCenter extends Auth_Controller
 	}
 
 	/**
-	 * Sends infomail with prestudent and person data when Prestudent is freigegeben
+	 * Sends infomail to Studiengang with prestudent and person data when Prestudent is freigegeben
 	 * @param $prestudent_id
 	 */
 	private function _sendFreigabeMail($prestudent_id)
diff --git a/application/controllers/system/messages/FASMessages.php b/application/controllers/system/messages/FASMessages.php
new file mode 100644
index 000000000..55d1da25f
--- /dev/null
+++ b/application/controllers/system/messages/FASMessages.php
@@ -0,0 +1,60 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class FASMessages extends Auth_Controller
+{
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'writeTemplate' => 'basis/message:rw',
+				'writeReplyTemplate' => 'basis/message:rw'
+			)
+		);
+
+		// Loads model CLMessagesModel which contains the GUI logic
+		$this->load->model('CL/Messages_model', 'CLMessagesModel');
+
+		// Phrases used in loaded views
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+			)
+		);
+	}
+
+	/**
+	 * Writes a new message to a prestudent using templates
+	 */
+	public function writeTemplate()
+ 	{
+		$prestudents = $this->input->post('prestudent_id'); // recipients prestudend_id(s)
+
+		// Loads the view to write a new message with a template
+		$this->load->view(
+			'system/messages/htmlWriteTemplate',
+			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
+		);
+ 	}
+
+	/**
+	 * Writes a reply to a message identified by parameters $message_id and $recipient_id
+	 * The recipient is a prestudent
+	 * Uses templates
+	 */
+	public function writeReplyTemplate($message_id, $recipient_id)
+ 	{
+		$prestudents = $this->input->post('prestudent_id'); // recipients prestudend_id(s)
+
+		// Loads the view to write a new message with a template
+		$this->load->view(
+			'system/messages/htmlWriteTemplate',
+			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
+		);
+ 	}
+}
diff --git a/application/controllers/system/messages/MessageClient.php b/application/controllers/system/messages/MessageClient.php
new file mode 100644
index 000000000..a0cc5c518
--- /dev/null
+++ b/application/controllers/system/messages/MessageClient.php
@@ -0,0 +1,112 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * NOTE: MessageClient extends FHC_Controller and NOT Auth_Controller to be able to use
+ * 		the authentication system without the need to load the permissions system
+ */
+class MessageClient extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Loads authentication library and starts authentication
+		// NOTE: it is loaded here because the controller extends FHC_Controller and NOT Auth_Controller
+		$this->load->library('AuthLib');
+
+		// Loads model CLMessagesModel which contains the GUI logic
+		$this->load->model('CL/Messages_model', 'CLMessagesModel');
+
+		// Phrases used in loaded views
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+			)
+		);
+	}
+
+	/**
+	 * Starts the GUI used to read all the personal messages
+	 */
+	public function read()
+	{
+		// Loads the view to read messages
+		$this->load->view('system/messages/ajaxRead');
+	}
+
+	/**
+	 * Starts the GUI used to write a personal message to an organisation unit
+	 */
+	public function write()
+	{
+		// Loads the view to write a message
+		$this->load->view('system/messages/ajaxWrite', $this->CLMessagesModel->prepareAjaxWrite());
+	}
+
+	/**
+	 * Starts the GUI used to reply to a received personal message
+	 */
+	public function writeReply()
+	{
+		$token = $this->input->get('token');
+
+		// Loads the view to reply to a message
+		$this->load->view('system/messages/ajaxWriteReply', $this->CLMessagesModel->prepareAjaxWriteReply($token));
+	}
+
+	/**
+	 * Returns JSON that that contains all the received messages by the currently logged user
+	 */
+	public function listReceivedMessages()
+	{
+		$this->outputJson($this->CLMessagesModel->prepareAjaxReadReceived());
+	}
+
+	/**
+	 * Returns JSON that that contains all the sent messages by the currently logged user
+	 */
+	public function listSentMessages()
+	{
+		$this->outputJson($this->CLMessagesModel->prepareAjaxReadSent());
+	}
+
+	/**
+	 * Sends a message to an organisation unit
+	 */
+	public function sendMessageToOU()
+	{
+		$receiverOU = $this->input->post('receiverOU');
+		$subject = $this->input->post('subject');
+		$body = $this->input->post('body');
+
+		$this->outputJson($this->CLMessagesModel->sendToOrganisationUnit($receiverOU, $subject, $body));
+	}
+
+	/**
+	 * Sends a message to an organisation unit
+	 */
+	public function sendMessageReply()
+	{
+		$receiver_id = $this->input->post('receiver_id');
+		$relationmessage_id = $this->input->post('relationmessage_id');
+		$token = $this->input->post('token');
+		$subject = $this->input->post('subject');
+		$body = $this->input->post('body');
+
+		$this->outputJson($this->CLMessagesModel->sendReply($receiver_id, $subject, $body, $relationmessage_id, $token));
+	}
+
+	/**
+	 * Set a message as read
+	 */
+	public function setMessageRead()
+	{
+		$message_id = $this->input->post('message_id');
+		$statusPersonId = $this->input->post('statusPersonId');
+
+		$this->outputJson($this->CLMessagesModel->setMessageRead($message_id, $statusPersonId));
+	}
+}
diff --git a/application/controllers/system/messages/Messages.php b/application/controllers/system/messages/Messages.php
new file mode 100644
index 000000000..296022ca4
--- /dev/null
+++ b/application/controllers/system/messages/Messages.php
@@ -0,0 +1,144 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Messages extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'writeTemplate' => array('basis/message:rw', 'infocenter:rw'),
+				'sendImplicitTemplate' => array('basis/message:rw', 'infocenter:rw'),
+				'sendExplicitTemplateJson' => array('basis/message:rw', 'infocenter:rw'),
+				'getVorlage' => array('basis/message:r', 'infocenter:r'),
+				'parseMessageText' => array('basis/message:r', 'infocenter:r'),
+				'getMessageFromIds' => array('basis/message:r', 'infocenter:r')
+			)
+		);
+
+		// Loads model CLMessagesModel which contains the GUI logic
+		$this->load->model('CL/Messages_model', 'CLMessagesModel');
+
+		// Phrases used in loaded views
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Methods with HTML output
+
+	/**
+	 * Initialize all the parameters used by view system/messages/htmlWriteTemplate
+	 * to build a GUI used to write a messate to user/s using a template
+	 */
+	public function writeTemplate()
+	{
+		$persons = $this->input->post('person_id');
+
+		// Loads the view to write a new message with a template
+		$this->load->view(
+			'system/messages/htmlWriteTemplate',
+			$this->CLMessagesModel->prepareHtmlWriteTemplatePersons($persons)
+		);
+	}
+
+	/**
+	 * Send a new message or reply to user/s
+	 * If a relationmessage_id this message is a reply to another one
+	 * Body is a template and will be parsed using information present in persons parameter
+	 */
+	public function sendImplicitTemplate()
+	{
+		$subject = $this->input->post('subject');
+		$body = $this->input->post('body');
+		$recipients_ids = $this->input->post('recipients_ids');
+		$relationmessage_id = $this->input->post('relationmessage_id');
+		$type = $this->input->post('type');
+
+		$sendImplicitTemplate = $this->CLMessagesModel->sendImplicitTemplate($type, $recipients_ids, $subject, $body, $relationmessage_id);
+		if (isSuccess($sendImplicitTemplate))
+		{
+			$this->load->view('system/messages/htmlMessageSentSuccess');
+		}
+		else
+		{
+			$this->load->view('system/messages/htmlMessageSentError');
+		}
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Methods with JSON output called by this controller and FASMessages (view system/messages/htmlWriteTemplate)
+
+	/**
+	 * Returns an object that represent a template store in database
+	 * If no templates are found with the given parameter or the given parameter is an empty string,
+	 * then an error is returned
+	 */
+	public function getVorlage()
+	{
+		$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
+
+		$this->outputJson($this->CLMessagesModel->getVorlage($vorlage_kurzbz));
+	}
+
+	/**
+	 * Parse the given given text using data from the given user
+	 * Use the CI parser which performs simple text substitution for pseudo-variable
+	 */
+	public function parseMessageText()
+	{
+		$receiver_id = $this->input->post('receiver_id');
+		$text = $this->input->post('text');
+		$type = $this->input->post('type');
+
+		if ($type == Messages_model::TYPE_PERSONS)
+		{
+			$this->outputJson($this->CLMessagesModel->parseMessageTextPerson($receiver_id, $text));
+		}
+		elseif ($type == Messages_model::TYPE_PRESTUDENTS)
+		{
+			$this->outputJson($this->CLMessagesModel->parseMessageTextPrestudent($receiver_id, $text));
+		}
+		else
+		{
+			$this->outputJsonError('Not a person nor a prestudent was provided');
+		}
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Methods with JSON output called by infocenter
+
+	/**
+	 * Outputs message data for a message (identified my msg id and receiver id) in JSON format
+	 */
+	public function getMessageFromIds()
+	{
+		$message_id = $this->input->get('msg_id');
+		$receiver_id = $this->input->get('receiver_id');
+
+		$this->outputJson($this->CLMessagesModel->getMessageFromIds($message_id, $receiver_id));
+	}
+
+	/**
+	 * Send a new message
+	 * - The recipients are prestudents
+	 * - An email template with message var may be provided
+	 * - A global organisation unit may be provided, otherwise is used the prestudent one
+	 * - A template is explicitly specified
+	 */
+	public function sendExplicitTemplateJson()
+	{
+		$prestudents = $this->input->post('prestudents');
+		$oe_kurzbz = $this->input->post('oe_kurzbz');
+		$vorlage_kurzbz = $this->input->post('vorlage_kurzbz');
+		$msgVars = $this->input->post('msgvars');
+
+		$sendExplicitTemplate = $this->CLMessagesModel->sendExplicitTemplate($prestudents, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
+		$this->outputJson(getData($sendExplicitTemplate));
+	}
+}
diff --git a/application/controllers/system/messages/ViewMessage.php b/application/controllers/system/messages/ViewMessage.php
new file mode 100644
index 000000000..ccb9afb33
--- /dev/null
+++ b/application/controllers/system/messages/ViewMessage.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Handles sending messages with token
+ * NOTE: it extends FHC_Controller instead of Auth_Controller because authentication is not needed
+ */
+class ViewMessage extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Loading config file message
+		$this->config->load('message');
+
+		// Load model MessageToken_model, not calling the authentication system
+		$this->load->model('CL/Messages_model', 'CLMessagesModel');
+
+		// Phrases used in loaded views
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+			)
+		);
+	}
+
+	/**
+	 * Display a message in read mode only using the specified token
+	 */
+	public function toHTML($token)
+	{
+		// Loads the view to read a received message using its token as identifier
+		$this->load->view('system/messages/htmlRead', $this->CLMessagesModel->prepareHtmlRead($token));
+	}
+
+	/**
+	 * Write a reply message to a received one using its token as identifier
+	 */
+	public function writeReply()
+	{
+		$token = $this->input->get('token'); // gets received message token
+
+		// Loads the view to write a reply message
+		$this->load->view('system/messages/htmlWriteReply', $this->CLMessagesModel->prepareHtmlWriteReply($token));
+	}
+
+	/**
+	 * Send a reply message (no templates are used)
+	 */
+	public function sendReply()
+	{
+		$subject = $this->input->post('subject');
+		$body = $this->input->post('body');
+		$receiver_id = $this->input->post('receiver_id');
+		$relationmessage_id = $this->input->post('relationmessage_id');
+		$token = $this->input->post('token');
+
+		$sendReply = $this->CLMessagesModel->sendReply($receiver_id, $subject, $body, $relationmessage_id, $token);
+		if (isSuccess($sendReply))
+		{
+			$this->load->view('system/messages/htmlMessageSentSuccess');
+		}
+		else
+		{
+			$this->load->view('system/messages/htmlMessageSentError');
+		}
+	}
+
+	/**
+	 * With the given token redirects the user to reply page configured in the config/message.php file
+	 */
+	public function redirectByToken($token)
+	{
+		// Loads model MessageTokenModel
+		$this->load->model('system/MessageToken_model', 'MessageTokenModel');
+
+		// Retrieves the single message data using the given token
+		$msg = $this->MessageTokenModel->getMessageByToken($token);
+		// If it is an error or it does not contain data show an error
+		if (!hasData($msg)) show_error('MSG-ERR-0001: An error occurred while redirecting, please contact the administrator');
+		// else
+		$oe_kurzbz = getData($msg)[0]->oe_kurzbz;
+
+		$organisationRoot = null; // by default is null
+
+		// If an organisation unit is present in the message tries to retrieve the root organisation unit
+		// from the one found in the message
+		if (!isEmptyString($oe_kurzbz))
+		{
+			// Retrieves the root organisation unit from the one found in the message
+			$getOERoot = $this->MessageTokenModel->getOERoot($oe_kurzbz);
+			// If it is an error or it does not contain data show an error
+			if (!hasData($getOERoot)) show_error('MSG-ERR-0002: An error occurred while redirecting, please contact the administrator');
+			// else
+			$organisationRoot = getData($getOERoot)[0]->oe_kurzbz;
+		}
+
+		// Retrieves the possible redirecting URLs array from configs
+		$messageRedirectUrls = $this->config->item('message_redirect_url');
+		// If it is not a valid array then show an error
+		if (isEmptyArray($messageRedirectUrls)) show_error('MSG-ERR-0003: An error occurred while redirecting, please contact the administrator');
+
+		// If this organisation unit root is not configured as an entry in the possible redirecting URLs array,
+		// then tries to use the default one...
+		if (!isset($messageRedirectUrls[$organisationRoot]))
+		{
+			$organisationRoot = 'fallback';
+
+			// ...if even the default one is not present show an error
+			if (!isset($messageRedirectUrls[$organisationRoot]))
+			{
+				show_error('MSG-ERR-0004: An error occurred while redirecting, please contact the administrator');
+			}
+		}
+
+		// Finally if everything was right then the user can be redirected
+		redirect($messageRedirectUrls[$organisationRoot] . '?token=' . $token);
+	}
+}
diff --git a/application/controllers/widgets/Language.php b/application/controllers/widgets/Language.php
new file mode 100644
index 000000000..8269d3b2d
--- /dev/null
+++ b/application/controllers/widgets/Language.php
@@ -0,0 +1,31 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller is used to set the current language for a user
+ * It is part of the Language Switcher Widget
+ */
+class Language extends FHC_Controller
+{
+	/**
+	 * Calls the parent's constructor
+	 */
+	public function __construct()
+    {
+        parent::__construct();
+    }
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 *
+	 */
+	public function setSessionLanguage()
+	{
+		$language = $this->input->post('language');
+
+		$this->outputJson(setUserLanguage($language));
+	}
+}
diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php
index 234cf6a6f..93c324b21 100644
--- a/application/core/FHC_Controller.php
+++ b/application/core/FHC_Controller.php
@@ -21,6 +21,9 @@ abstract class FHC_Controller extends CI_Controller
 	{
 		parent::__construct();
 
+		// NOTE: placed here before performing anything else!!!
+		$this->_checkHTTPS();
+
 		$this->_controllerId = null; // set _controllerId as null by default
 
 		// Loads helper message to manage returning messages
@@ -129,4 +132,20 @@ abstract class FHC_Controller extends CI_Controller
 	{
 		$this->output->set_content_type('application/json')->set_output(json_encode($mixed));
 	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Checks if the call is performed via web and if HTTPS is enabled and used
+	 * If NOT then an error is raised and the execution is terminated
+	 */
+	private function _checkHTTPS()
+	{
+		// If NOT called from command line and if the HTTPS protocol is NOT enabled
+		if (!$this->input->is_cli_request() && !isset($_SERVER['HTTPS']))
+		{
+			show_error('This web site cannot work correctly without the HTTPS protocol enabled');
+		}
+	}
 }
diff --git a/application/helpers/hlp_authentication_helper.php b/application/helpers/hlp_authentication_helper.php
index 194f0b249..459c7fb80 100644
--- a/application/helpers/hlp_authentication_helper.php
+++ b/application/helpers/hlp_authentication_helper.php
@@ -20,7 +20,6 @@ function getAuthPersonId()
 	return isLogged() ? ($ci->authlib->getAuthObj())->{AuthLib::AO_PERSON_ID} : null;
 }
 
-
 /**
  * If the user is NOT logged then a null value is returned.
  * If the user is alredy logged, then it is possible to access to the authentication object
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index bb8b1b8e4..6a2675a04 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -24,39 +24,54 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 // ------------------------------------------------------------------------
 
 /**
- * generateToken() - generates a new token for diffent use
- * - reading Messages from external
- * - forgotten Password
- *
- * @return  string
+ * Generates a new token for diffent use cases. Default token length is 64
+ * - Reading messages
+ * - Forgotten password
+ * - etc
+ * Returns null on failure
  */
 function generateToken($length = 64)
 {
+	$token = null;
+	$firstGeneratedToken = null;
+
 	// For PHP 7 you can use random_bytes()
 	if (function_exists('random_bytes'))
 	{
-		$token = base64_encode(random_bytes($length));
-		//base64 is about 33% longer, so we need to truncate the result
-		return strtr(substr($token, 0, $length), '+/=', '-_,');
+		try
+		{
+			$firstGeneratedToken = random_bytes($length); // try to generates cryptographically secure pseudo-random bytes...
+		}
+		catch (Exception $e) { $firstGeneratedToken = null; } // if fails $firstGeneratedToken is set to null
 	}
-
-	// for PHP >=5.3 and <7
-	if (function_exists('openssl_random_pseudo_bytes'))
+	// For PHP >= 5.3 and < 7 and openssl is available
+	elseif (function_exists('openssl_random_pseudo_bytes'))
 	{
-        $token = base64_encode(openssl_random_pseudo_bytes($length, $strong));
-		// is the token strong enough?
-        if($strong == true)
-			return strtr(substr($token, 0, $length), '+/=', '-_,');
+		$firstGeneratedToken = openssl_random_pseudo_bytes($length, $strong);
+		// If the token generation ended with errors OR the generated token is NOT strong enough
+        if ($firstGeneratedToken == false || $strong == false) $firstGeneratedToken = null; // $firstGeneratedToken is set to null
     }
 
-    //fallback to mt_rand if php < 5.3 or no openssl available
-    $characters = '0123456789';
-    $characters .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/+';
-    $charactersLength = strlen($characters)-1;
-    $token = '';
-    //select some random characters
-    for ($i = 0; $i < $length; $i++)
-        $token .= $characters[mt_rand(0, $charactersLength)];
+	if ($firstGeneratedToken != null) // If everything was fine
+	{
+		// base64 is about 33% longer, so we need to truncate the result
+		$token = strtr(substr(base64_encode($firstGeneratedToken), 0, $length), '+/=', '-_,');
+	}
+
+	// Fallback to mt_rand if:
+	// php < 5.3
+	// OR no openssl is available
+	// OR openssl_random_pseudo_bytes used an algorithm that is cryptographically NOT strong
+	// OR one of the previous methods failed
+	if ($token == null)
+	{
+		$token = ''; // set $token as an empty string
+	    $characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/+';
+	    $charactersLength = strlen($characters) - 1;
+
+	    // Select some random characters
+	    for ($i = 0; $i < $length; $i++) $token .= $characters[mt_rand(0, $charactersLength)];
+	}
 
     return $token;
 }
@@ -225,6 +240,52 @@ function isDateWorkingDay($date, $days = null)
 	}
 }
 
+/**
+ * Parse the given text using the given data parameter
+ * Use the CI parser which performs simple text substitution for pseudo-variable
+ */
+function parseText($text, $data)
+{
+	$ci =& get_instance(); // get CI instance
+	$ci->load->library('parser'); // Loads CI parser library
+
+	return $ci->parser->parse_string($text, $data, true);
+}
+
+/**
+ * Parse the given template using the given data parameter
+ * Use the CI parser which performs simple text substitution for pseudo-variable
+ */
+function parseTemplate($template, $data)
+{
+	$ci =& get_instance(); // get CI instance
+	$ci->load->library('parser'); // Loads CI parser library
+
+	return $ci->parser->parse($template, $data, true);
+}
+
+/**
+ * Terminate immediately the execution of the current script.
+ * If message parameter is given then:
+ * - logs the given message in CI logs
+ * - prints the given message to standard output
+ * Otherwise terminate with the generic error
+ */
+function terminateWithError($message = null)
+{
+	if (!isEmptyString($message))
+	{
+		$ci =& get_instance(); // get CI instance
+		$ci->load->library('LogLib'); // Loads LogLib
+
+		$ci->loglib->logError($message);
+
+		exit($message);
+	}
+
+	exit(EXIT_ERROR);
+}
+
 /**
  * Checks if the current user is logged by checking that the AuthLib is loaded and
  * it is present the authentication object in session
diff --git a/application/helpers/hlp_language_helper.php b/application/helpers/hlp_language_helper.php
index 4dfb53c7b..1678a4102 100644
--- a/application/helpers/hlp_language_helper.php
+++ b/application/helpers/hlp_language_helper.php
@@ -18,28 +18,48 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * Function to retrieve the language of the logged user
- * If is not possible to retrieve it, then the default system language is returnd
- * If as parameter is given a valid language the it's returned useful to avoid
- * to write the same control structures for the language
+ * If is not possible to retrieve it, then the default system language is returned
+ * NOTE: If the given parameter is a valid language then it is returned
+ *			It is useful to avoid to write a lot of "if else" structures
  */
 function getUserLanguage($language = null)
 {
+	// If the given parameter is a valid language then return it
 	if (!isEmptyString($language)) return $language;
 
-	$ci =& get_instance(); // get CI instance
-
-	// Use the default system language, if it's possible retrieves the language for the logged user
+	// Use the default system language as fallback
 	$language = DEFAULT_LANGUAGE;
-	// Checks if the user is authenticated to retrieve the users's language
-	// NOTE: this helper could be called when the user is not logged in the system
-	// 		so this is why is checked if the function getAuthUID exists
-	if (function_exists('getAuthUID'))
+
+	// If the language is present in the session and it is valid
+	if (isset($_SESSION[LANG_SESSION_CURRENT_LANGUAGE]) && !isEmptyString($_SESSION[LANG_SESSION_CURRENT_LANGUAGE]))
 	{
+		$language = $_SESSION[LANG_SESSION_CURRENT_LANGUAGE]; // then use it
+	}
+	// Otherwise checks if the user is authenticated to retrieve the users's language
+	// NOTE: this helper could be called when the user is NOT logged in the system
+	// 		therefore is checked if the user is logged
+	elseif (isLogged())
+	{
+		$ci =& get_instance(); // get CI instance
+
 		// NOTE: Stores the loaded model with the alias PersonModelLanguage to avoid to overwrite
 		// 		an already loaded PersonModel used somewhere else
 		$ci->load->model('person/Person_model', 'PersonModelLanguage');
 
-		$language = $ci->PersonModelLanguage->getLanguage(getAuthUID());
+		// Retrieves language/s for the logged user
+		$languagesDB = $ci->PersonModelLanguage->getLanguage(getAuthUID());
+		if (hasData($languagesDB))
+		{
+			// Looks for the first valid language
+			foreach (getData($languagesDB) as $languageDB)
+			{
+				if (!isEmptyString($languageDB->sprache))
+				{
+					$language = $languageDB->sprache;
+					break;
+				}
+			}
+		}
 	}
 
 	return $language;
@@ -62,31 +82,21 @@ function getPhraseByLanguage($phraseLanguagesArray, $language)
 	$langArray = getSessionElement(LANG_SESSION_NAME, LANG_SESSION_INDEXES);
 	if ($langArray == null) // If not already loaded in session
 	{
-		// Loads the Sprache_model to retrieve the language settings from the DB
-		// NOTE: Stores the loaded model with the alias SpracheModelLanguage to avoid to overwrite
-		// 		an already loaded SpracheModel used somewhere else
-		$ci->load->model('system/Sprache_model', 'SpracheModelLanguage');
-
-		// Add order clause by index and select only the sprache column
-		$ci->SpracheModelLanguage->addOrder('index');
-		$ci->SpracheModelLanguage->addSelect('sprache');
-
-		// Retrieves from public.tbl_sprache
-		$dbLanguages = $ci->SpracheModelLanguage->load();
+		// Retrieves active languages
+		$dbLanguages = getDBActiveLanguages();
 		if (hasData($dbLanguages)) // If everything is ok and contains data
 		{
 			$index = 0; // Incremental integer
-			$languageIndexes = array(); // Array that will contains languages and their indexes
+			$langArray = array(); // Array that will contains languages and their indexes
 
 			// Loops through database results
 			foreach (getData($dbLanguages) as $dbLanguage)
 			{
-				$languageIndexes[$dbLanguage->sprache] = $index++; // set $languageIndexes array elements
+				$langArray[$dbLanguage->sprache] = $index++; // set $languageIndexes array elements
 			}
 		}
 
-		$langArray = $languageIndexes; // copy $languageIndexes to $langArray
-		// Set session element $_SESSION['LANG']['LANG_INDEXES'] with $languageIndexes
+		// Set session element $_SESSION['LANG']['LANG_INDEXES'] with $langArray
 		setSessionElement(LANG_SESSION_NAME, LANG_SESSION_INDEXES, $langArray);
 	}
 
@@ -100,3 +110,78 @@ function getPhraseByLanguage($phraseLanguagesArray, $language)
 
 	return $phrase;
 }
+
+/**
+ * Tries to load active languages from session, if not present then loads them from database and stores them in session
+ */
+function getActiveLanguages()
+{
+	$languagesArray = getSessionElement(LANG_SESSION_NAME, LANG_SESSION_ACTIVE_LANGUAGES);
+	if ($languagesArray == null)
+	{
+		$languagesArray = array();
+
+		// Retrieves from public.tbl_sprache
+		$dbLanguages = getDBActiveLanguages();
+		if (hasData($dbLanguages))
+		{
+			// Loops through database results
+			foreach (getData($dbLanguages) as $dbLanguage)
+			{
+				$languagesArray[$dbLanguage->sprache] = $dbLanguage->bezeichnung; // set $languageIndexes array elements
+			}
+		}
+
+		// Set session element $_SESSION['LANG']['LANG_SESSION_ACTIVE_LANGUAGES'] with $languagesArray
+		setSessionElement(LANG_SESSION_NAME, LANG_SESSION_ACTIVE_LANGUAGES, $languagesArray);
+	}
+
+	return $languagesArray;
+}
+
+/**
+ * Loads active languages from database
+ */
+function getDBActiveLanguages()
+{
+	$ci =& get_instance(); // get CI instance
+
+	// Loads the Sprache_model to retrieve the language settings from the DB
+	// NOTE: Stores the loaded model with the alias SpracheModelLanguage to avoid to overwrite
+	// 		an already loaded SpracheModel used somewhere else
+	$ci->load->model('system/Sprache_model', 'SpracheModelLanguage');
+
+	// Add order clause by index and select only the sprache column
+	$ci->SpracheModelLanguage->addOrder('index');
+	$ci->SpracheModelLanguage->addSelect('sprache, bezeichnung');
+
+	// Retrieves from public.tbl_sprache
+	return $ci->SpracheModelLanguage->loadWhere(array('content' => true));
+}
+
+/**
+ * Sets the current language to render the GUI in session
+ */
+function setUserLanguage($language)
+{
+	$languageValid = false;
+
+	// Checks if the given language is valid (present between active languages)
+	foreach (getActiveLanguages() as $languageName => $languageTranslation)
+	{
+		if ($language == $languageName)
+		{
+			$languageValid = true;
+			break;
+		}
+	}
+
+	if ($languageValid) // if the provided language is valid
+	{
+		$_SESSION[LANG_SESSION_CURRENT_LANGUAGE] = $language; // stores it in session
+
+		return success('Language successfully changed'); // return success!!
+	}
+
+	return error('The given language is not valid'); // return an error
+}
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index 03b56bbbc..cc896856d 100644
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -125,3 +125,18 @@ function getCode($result)
 
 	return $code;
 }
+
+/**
+ * Returns the property retval if present, otherwise null
+ */
+function getError($result)
+{
+	$error = null;
+
+	if (isset($result->retval))
+	{
+		$error = $result->retval;
+	}
+
+	return $error;
+}
diff --git a/application/helpers/hlp_sancho_helper.php b/application/helpers/hlp_sancho_helper.php
index 6f5ef8c24..5d2d9f1f1 100644
--- a/application/helpers/hlp_sancho_helper.php
+++ b/application/helpers/hlp_sancho_helper.php
@@ -98,9 +98,7 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data)
 			!isEmptyString($result->retval[0]->text))
 		{
 			// Parses template text
-			$parsedText = $ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $vorlage_data);
-
-			return $parsedText;
+			return parseText($result->retval[0]->text, $vorlage_data);
 		}
 	}
 }
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
index 1c7c07ed8..67a527655 100644
--- a/application/libraries/AuthLib.php
+++ b/application/libraries/AuthLib.php
@@ -391,7 +391,7 @@ class AuthLib
 		}
 		elseif (isError($hta)) // display error and stop execution
 		{
-			$this->_showError($hta->retval);
+			$this->_showError(getError($hta));
 		}
 
 		return $hta; // if success then is returned!
@@ -551,7 +551,7 @@ class AuthLib
 			}
 			elseif (isError($auth)) // blocking error
 			{
-				$this->_showError(getData($auth)); // display a generic error message and logs the occurred error
+				$this->_showError(getError($auth)); // display a generic error message and logs the occurred error
 			}
 		}
 		// else the user is already logged, then loads authentication helper and continue with the execution
diff --git a/application/libraries/CryptLib.php b/application/libraries/CryptLib.php
new file mode 100644
index 000000000..ea19f3e5b
--- /dev/null
+++ b/application/libraries/CryptLib.php
@@ -0,0 +1,28 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use phpseclib\Crypt\Rijndael;
+
+/**
+ * Collection of different encryption/hashing algorithms
+ */
+class CryptLib
+{
+	/**
+	 * Encrypt using the Rijndael algorithm with a key length of 256 bits and the ECB mode
+	 * It is possible to disable the padding, enabled by default
+	 */
+	public static function RIJNDAEL_256_ECB($value, $key, $paddingDisabled = false)
+	{
+		if (isEmptyString($key) || strlen($value) % 32 != 0) return null;
+
+		$cipher = new Rijndael(Rijndael::MODE_ECB);
+		$cipher->setBlockLength(256);
+		$cipher->setKey($key);
+
+		if ($paddingDisabled === true) $cipher->disablePadding();
+
+		return $cipher->encrypt($value);
+	}
+}
diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php
index 6b86ce7f8..f32df5fd1 100644
--- a/application/libraries/DmsLib.php
+++ b/application/libraries/DmsLib.php
@@ -249,7 +249,7 @@ class DmsLib
 				}
 				else
 				{
-					return error($dmscontent->retval);
+					return error(getError($dmscontent));
 				}
 			}
 			else
@@ -259,7 +259,7 @@ class DmsLib
 		}
 		else
 		{
-			return error($akte->retval);
+			return error(getError($akte));
 		}
 	}
 
diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
index ed87a9f38..98e546b4e 100644
--- a/application/libraries/DocumentLib.php
+++ b/application/libraries/DocumentLib.php
@@ -68,7 +68,7 @@ class DocumentLib
 				}
 				else
 				{
-					return error($ret->retval);
+					return error(getError($ret));
 				}
 			case 'application/pdf':
 				return success($filename);
diff --git a/application/libraries/FilterWidgetLib.php b/application/libraries/FilterWidgetLib.php
index c2e57eed2..6e87833bd 100644
--- a/application/libraries/FilterWidgetLib.php
+++ b/application/libraries/FilterWidgetLib.php
@@ -101,7 +101,7 @@ class FilterWidgetLib
 	const FILTER_UNIQUE_ID = 'filterUniqueId'; // Filter page parameter name
 
 	const PERMISSION_FILTER_METHOD = 'FilterWidget'; // Name for fake method to be checked by the PermissionLib
-	const PERMISSION_TYPE = 'rw';
+	const PERMISSION_TYPE = 'r';
 
 	// Name and array keys of the filters menu array
 	const NAV_MENU_FILTER_KEY = 'filters';
diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php
index 6d0a48f73..dbbc22f08 100644
--- a/application/libraries/MailLib.php
+++ b/application/libraries/MailLib.php
@@ -7,6 +7,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class MailLib
 {
+	const ENABLE_DEBUG = 'enable_debug';
+
 	private $sended; // Sended email counter
 
 	// Properties for storing the configuration
@@ -15,6 +17,8 @@ class MailLib
 	private $email_time_range;
 	private $email_from_system;
 
+	private $_ci; // Codeigniter instance
+
 	/**
 	 * Class constructor
 	 */
@@ -24,16 +28,16 @@ class MailLib
 		$this->sended = 0;
 
 		// Get CI instance
-		$this->ci =& get_instance();
+		$this->_ci =& get_instance();
 
 		// The second parameter is used to avoiding name collisions in the config array
-		$this->ci->config->load('mail', true);
+		$this->_ci->config->load('mail', true);
 
 		// CI Email library
-		$this->ci->load->library('email');
+		$this->_ci->load->library('email');
 
 		// Initializing email library with the loaded configurations
-		$this->ci->email->initialize($this->ci->config->config['mail']);
+		$this->_ci->email->initialize($this->_ci->config->config['mail']);
 
 		// Set the configuration properties with the standard configuration values
 		$this->email_number_to_sent = $this->getEmailCfgItem('email_number_to_sent');
@@ -48,6 +52,22 @@ class MailLib
 	 */
 	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false)
 	{
+		// If it is configured then log mail info into the CI error logs
+		if ($this->getEmailCfgItem(self::ENABLE_DEBUG) === true)
+		{
+			$this->_ci->load->library('LogLib'); // Loads logging library
+
+			// Log them all!
+			$this->_ci->loglib->logError('From: '.$from);
+			$this->_ci->loglib->logError('To: '.$to);
+			$this->_ci->loglib->logError('Subject: '.$subject);
+			$this->_ci->loglib->logError('Message: '.$message);
+			$this->_ci->loglib->logError('Alias: '.$alias);
+			$this->_ci->loglib->logError('CC: '.$cc);
+			$this->_ci->loglib->logError('BCC: '.$bcc);
+			$this->_ci->loglib->logError('Alternative message: '.$altMessage);
+		}
+
 		// If from is not specified then use the standard one
 		if (is_null($from) || $from == '')
 		{
@@ -67,7 +87,7 @@ class MailLib
 			}
 		}
 
-		$this->ci->email->from($from, $alias);
+		$this->_ci->email->from($from, $alias);
 
 		// Check if the email address of the debug recipient is a valid one
 		$recipient = $to;
@@ -83,20 +103,20 @@ class MailLib
 				$recipientBCC = MAIL_DEBUG;
 		}
 
-		$this->ci->email->to($recipient);
-		if (!is_null($recipientCC)) $this->ci->email->cc($recipientCC);
-		if (!is_null($recipientBCC)) $this->ci->email->bcc($recipientBCC);
-		$this->ci->email->subject($subject);
-		$this->ci->email->message($message);
-		if (!isEmptyString($altMessage)) $this->ci->email->set_alt_message($altMessage);
+		$this->_ci->email->to($recipient);
+		if (!is_null($recipientCC)) $this->_ci->email->cc($recipientCC);
+		if (!is_null($recipientBCC)) $this->_ci->email->bcc($recipientBCC);
+		$this->_ci->email->subject($subject);
+		$this->_ci->email->message($message);
+		if (!isEmptyString($altMessage)) $this->_ci->email->set_alt_message($altMessage);
 
 		if($bulk)
-			$this->ci->email->set_header('Precedence', 'bulk');
+			$this->_ci->email->set_header('Precedence', 'bulk');
 		if($autogenerated)
-			$this->ci->email->set_header('Auto-Submitted', 'auto-generated');
+			$this->_ci->email->set_header('Auto-Submitted', 'auto-generated');
 
 		// Avoid printing on standard output ugly error messages
-		$result = @$this->ci->email->send();
+		$result = @$this->_ci->email->send();
 
 		// If the email was succesfully sended then increment the counter
 		// and checks if it has to wait until the sending of the next
@@ -110,43 +130,34 @@ class MailLib
 	}
 
 	/**
-	 * To ovveride the configurations
+	 * Overrides configuration parameters
+	 * If the given parameters are not null or empty strings then they are used to override
+	 * the following properties of this object:
+	 * - email_number_to_sent
+	 * - email_number_per_time_range
+	 * - email_time_range
+	 * - email_from_system
 	 */
-	public function overrideConfigs($cfg)
+	public function overrideConfigs($numberToSent, $numberPerTimeRange, $emailTimeRange, $emailFromSystem)
 	{
-		if (!is_null($cfg))
+		if (is_numeric($numberToSent)) $this->email_number_to_sent = $numberToSent;
+
+		if (is_numeric($numberPerTimeRange)) $this->email_number_per_time_range = $numberPerTimeRange;
+
+		if (is_numeric($emailTimeRange)) $this->email_time_range = $emailTimeRange;
+
+		if (!isEmptyString($emailFromSystem) && filter_var($emailFromSystem, FILTER_VALIDATE_EMAIL))
 		{
-			if (isset($cfg->email_number_to_sent) && is_numeric($cfg->email_number_to_sent))
-			{
-				$this->email_number_to_sent = $cfg->email_number_to_sent;
-			}
-			if (isset($cfg->email_number_per_time_range) && is_numeric($cfg->email_number_per_time_range))
-			{
-				$this->email_number_per_time_range = $cfg->email_number_per_time_range;
-			}
-			if (isset($cfg->email_time_range) && is_numeric($cfg->email_time_range))
-			{
-				$this->email_time_range = $cfg->email_time_range;
-			}
-			if (isset($cfg->email_from_system) && filter_var($cfg->email_from_system, FILTER_VALIDATE_EMAIL))
-			{
-				$this->email_from_system = $cfg->email_from_system;
-			}
+			$this->email_from_system = $emailFromSystem;
 		}
 	}
 
 	/**
-	 * Returns the current configuration
+	 * Returns value of property email_number_to_sent
 	 */
-	public function getConfigs()
+	public function getEmailNumberToSent()
 	{
-		$cfg = new stdClass();
-		$cfg->email_number_to_sent = $this->email_number_to_sent;
-		$cfg->email_number_per_time_range = $this->email_number_per_time_range;
-		$cfg->email_time_range = $this->email_time_range;
-		$cfg->email_from_system = $this->email_from_system;
-
-		return $cfg;
+		return $this->email_number_to_sent;
 	}
 
 	/**
@@ -180,6 +191,6 @@ class MailLib
 	 */
 	private function getEmailCfgItem($itemName)
 	{
-		return $this->ci->config->item($itemName, EMAIL_CONFIG_INDEX);
+		return $this->_ci->config->item($itemName, EMAIL_CONFIG_INDEX);
 	}
 }
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index feba96473..b97ef4bae 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -7,7 +7,24 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class MessageLib
 {
-	const MSG_INDX_PREFIX = 'message_';
+	// Config entries
+	const CFG_SYSTEM_PERSON_ID = 'system_person_id';
+	const CFG_SEND_IMMEDIATELY = 'send_immediately';
+	const CFG_MESSAGE_SERVER = 'message_server';
+	const CFG_MESSAGE_HTML_VIEW_URL = 'message_html_view_url';
+	const CFG_OU_RECEIVERS = 'ou_receivers';
+	const CFG_OU_RECEIVERS_NO_NOTICE = 'ou_receivers_no_notice';
+	const CFG_OU_RECEIVERS_PRIVATE = 'ou_receivers_private';
+	const CFG_REDIRECT_VIEW_MESSAGE_URL = 'redirect_view_message_url';
+
+	// Templates names
+	const NOTICE_TEMPLATE_HTML = 'MessageMailHTML';
+	const NOTICE_TEMPLATE_TXT = 'MessageMailTXT';
+	const NOTICE_TEMPLATE_FALLBACK_HTML = 'templates/mailHTML';
+	const NOTICE_TEMPLATE_FALLBACK_TXT = 'templates/mailTXT';
+
+	const EMAIL_KONTAKT_TYPE = 'email'; // Email kontakt type
+	const SENT_INFO_NEWLINE = '\n'; // tbl_msg_recipient->sentInfo separator
 
 	private $_ci;
 
@@ -22,16 +39,12 @@ class MessageLib
 		// Loads message configuration
 		$this->_ci->config->load('message');
 
-		// CI Parser library
-		$this->_ci->load->library('parser');
-		// Loads LogLib
-		$this->_ci->load->library('LogLib');
 		// Loads VorlageLib
 		$this->_ci->load->library('VorlageLib');
 		// Loads Mail library
 		$this->_ci->load->library('MailLib');
 
-		// Loading models
+		// Loads message models
 		$this->_ci->load->model('system/Message_model', 'MessageModel');
 		$this->_ci->load->model('system/MsgStatus_model', 'MsgStatusModel');
 		$this->_ci->load->model('system/Recipient_model', 'RecipientModel');
@@ -42,134 +55,298 @@ class MessageLib
 	// Public methods
 
 	/**
-	 * getMessage() - returns the specified received message for a specified person
+	 * Returns the specified message for a specified person
 	 */
 	public function getMessage($msg_id, $person_id)
 	{
-		if (!is_numeric($msg_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_RECIPIENTS);
+		if (!is_numeric($msg_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
 
 		return $this->_ci->RecipientModel->getMessage($msg_id, $person_id);
 	}
 
 	/**
-	 * getMessagesByUID() - will return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * Sends a message to persons ($receiversPersonId)
 	 */
-	public function getMessagesByUID($uid, $oe_kurzbz = null, $all = false)
+	public function sendMessageUser(
+		$receiversPersonId, $subject, $body, // Required parameters
+		$sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (isEmptyString($uid))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
+		// Retrieves receiver id and checks that is valid
+		$receivers = $this->_getReceiversByPersonId($receiversPersonId);
+		if (isError($receivers)) return $receivers;
 
-		return $this->_ci->RecipientModel->getMessagesByUID($uid, $oe_kurzbz, $all);
+		// Send the message and return the result
+		return $this->_sendMessage($receivers, null, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime);
 	}
 
 	/**
-	 * getMessagesByPerson() - will return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * Sends a message to persons ($receiversPersonId)
 	 */
-	public function getMessagesByPerson($person_id, $oe_kurzbz = null, $all = false)
+	public function sendMessageUserTemplate(
+		$receiversPersonId, $vorlage, $parseData, // Required parameters
+		$orgform = null, $sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
+		// Loads template data
+		$templateResult = $this->_ci->vorlagelib->loadVorlagetext($vorlage, $senderOU, $orgform, getUserLanguage());
+		if (hasData($templateResult)) // if a template is found
+		{
+			$template = getData($templateResult)[0]; // template object
 
-		return $this->_ci->RecipientModel->getMessagesByPerson($person_id, $oe_kurzbz, $all);
+			// Parses template subject
+			$subject = parseText($template->subject, $parseData);
+			// Parses template text
+			$body = parseText($template->text, $parseData);
+
+			return $this->sendMessageUser(
+				$receiversPersonId, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime
+			);
+		}
+		elseif (isError($templateResult)) // if an error occured
+		{
+			return $templateResult; // return it
+		}
+		else // if a template was not found
+		{
+			return error('Template was not found', MSG_ERR_INVALID_TEMPLATE);
+		}
 	}
 
 	/**
-	 * getSentMessagesByPerson() - Get all sent messages from a person identified by person_id
+	 * Sends a message to all the persons that are enabled to read messages for the given organisation unit ($receiversOU)
 	 */
-	public function getSentMessagesByPerson($person_id, $oe_kurzbz = null, $all = false)
+	public function sendMessageOU(
+		$receiversOU, $subject, $body, // Required parameters
+		$sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
+		// If the recipient is an organisation unit that would be possible to send the same message (same message id)
+		// to the entire organisation unit (one to many functionality)
+		// In this case the receiver id is a the one present in message configuration
+		$receiver = new stdClass();
+		$receiver->person_id = $this->_ci->config->item(self::CFG_SYSTEM_PERSON_ID);
+		$receivers = success(array($receiver));
 
-		return $this->_ci->MessageModel->getMessagesByPerson($person_id, $oe_kurzbz, $all);
+		// Send the message and return the result
+		return $this->_sendMessage($receivers, $receiversOU, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods called by a job
+
+	/**
+	 * Gets all messages for which notice emails are still not sent from DB and sends for each of them the notice email
+	 * Wrapper for _sendNoticeEmail.
+	 */
+	public function sendAllEmailNotices($since, $numberToSent, $numberPerTimeRange, $emailTimeRange, $emailFromSystem)
+	{
+		// Overrides MailLib configs with the given parameters
+		$this->_ci->maillib->overrideConfigs($numberToSent, $numberPerTimeRange, $emailTimeRange, $emailFromSystem);
+
+		// Retrieves a certain amount of NOT sent messages
+		$messagesResult = $this->_ci->RecipientModel->getNotSentMessages(
+			$this->_ci->maillib->getEmailNumberToSent(),
+			$since
+		);
+
+		if (isError($messagesResult) || !hasData($messagesResult)) return $messagesResult;
+
+		// Collects all the message ids in an array
+		$messageIds = array();
+		foreach (getData($messagesResult) as $message)
+		{
+			$messageIds[] = $message->message_id;
+		}
+
+		// Send'em all
+		return $this->_sendNoticeEmails($messageIds);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods used by to build the GUI to write messages to user/s
+
+	/**
+	 * Retrieves message vars from view vw_msg_vars_person
+	 */
+	public function getMessageVarsPerson()
+	{
+		// Retrieves message vars from view vw_msg_vars_person
+		$messageVarsPerson = $this->_ci->MessageModel->getMessageVarsPerson();
+		if (isSuccess($messageVarsPerson)) // if everything is ok
+		{
+			$variablesArray = array();
+			$tmpVariablesArray = getData($messageVarsPerson);
+
+			// Starts from 1 to skip the first element which is person_id
+			for ($i = 1; $i < count($tmpVariablesArray); $i++)
+			{
+				$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}'] = $tmpVariablesArray[$i];
+			}
+
+			return success($variablesArray);
+		}
+
+		return $messageVarsPerson; // otherwise returns the error
 	}
 
 	/**
-	 * getMessageByToken
+	 * Retrieves message vars from view vw_msg_vars
+	 */
+	public function getMessageVarsPrestudent()
+	{
+		// Retrieves message vars from view vw_msg_vars
+		$messageVars = $this->_ci->MessageModel->getMessageVars();
+		if (isSuccess($messageVars)) // if everything is ok
+		{
+			$variablesArray = array();
+			$tmpVariablesArray = getData($messageVars);
+
+			// Starts from 1 to skip the first element which is person_id
+			for ($i = 1; $i < count($tmpVariablesArray); $i++)
+			{
+				$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}'] = $tmpVariablesArray[$i];
+			}
+
+			return success($variablesArray);
+		}
+
+		return $messageVars; // otherwise returns the error
+	}
+
+	/**
+	 * Retrieves organisation units for each role that a user plays inside that organisation unit
+	 */
+	public function getOeKurzbz($sender_id)
+	{
+		$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		// Retrieves organisation units for a user from database
+ 		$benutzer = $this->_ci->BenutzerfunktionModel->getActiveFunctionsByPersonId($sender_id);
+ 		if (isSuccess($benutzer)) // if everything is ok
+ 		{
+			$ouArray = array();
+
+			// Copies organisation units in $ouArray array
+ 			foreach (getData($benutzer) as $val) $ouArray[] = $val->oe_kurzbz;
+
+			return success($ouArray);
+ 		}
+
+		return $benutzer; // otherwise returns the error
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods used by REST API
+
+	/**
+	 * Return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getMessagesByUID($uid, $senderOU = null, $all = false)
+	{
+		if (isEmptyString($uid)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->RecipientModel->getMessagesByUID($uid, $senderOU, $all);
+	}
+
+	/**
+	 * Return all messages, including the latest status for specified user. It does not return attachments
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getMessagesByPerson($person_id, $senderOU = null, $all = false)
+	{
+		if (!is_numeric($person_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->RecipientModel->getMessagesByPerson($person_id, $senderOU, $all);
+	}
+
+	/**
+	 * Get all sent messages from a person identified by person_id
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getSentMessagesByPerson($person_id, $senderOU = null, $all = false)
+	{
+		if (!is_numeric($person_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->MessageModel->getMessagesByPerson($person_id, $senderOU, $all);
+	}
+
+	/**
+	 * Retrieves a message by its token
+	 * If a message is found with the given token then this message is set as read
 	 */
 	public function getMessageByToken($token)
 	{
-		if (isEmptyString($token))
-			return $this->_error('', MSG_ERR_INVALID_TOKEN);
+		if (isEmptyString($token)) return error('The given token is not valid', MSG_ERR_INVALID_TOKEN);
 
-		$result = $this->_ci->RecipientModel->getMessageByToken($token);
-		if (hasData($result))
+		$messageTokenResult = $this->_ci->RecipientModel->getMessageByToken($token);
+		if (hasData($messageTokenResult))
 		{
-			// Searches for a status that is different from unread
-			$found = -1;
-			for ($i = 0; $i < count($result->retval); $i++)
+			// Searches for a status that is NOT unread
+			$found = false;
+
+			foreach (getData($messageTokenResult) as $message)
 			{
-				if ($result->retval[$i]->status > MSG_STATUS_UNREAD)
+				if ($message->status > MSG_STATUS_UNREAD)
 				{
-					$found = $i;
+					$found = true;
 					break;
 				}
 			}
 
-			// If not found then insert the read status
-			if ($found == -1)
+			// If NOT found then insert the read status
+			if (!$found)
 			{
-				$statusKey = array(
-					'message_id' => $result->retval[0]->message_id,
-					'person_id' => $result->retval[0]->receiver_id,
-					'status' => MSG_STATUS_READ
+				$uid = null;
+				if (!isEmptyString($messageTokenResult[0]->uid))
+				{
+					$uid = $messageTokenResult[0]->uid;
+				}
+
+				$statusData = array(
+					'message_id' => getData($messageTokenResult)[0]->message_id,
+					'person_id' => getData($messageTokenResult)[0]->receiver_id,
+					'status' => MSG_STATUS_READ,
+					'insertvon' => $uid
 				);
 
-				$resultIns = $this->_ci->MsgStatusModel->insert($statusKey);
+				$messageTokenResultIns = $this->_ci->MsgStatusModel->insert($statusData);
 				// If an error occured while writing on data base, then return it
-				if (isError($resultIns))
-				{
-					$result = $resultIns;
-				}
+				if (isError($messageTokenResultIns)) $messageTokenResult = $messageTokenResultIns;
 			}
 		}
 
-		return $result;
+		return $messageTokenResult;
 	}
 
 	/**
-	 * getCountUnreadMessages
+	 * Counts the unread messages for the given user
+	 * The sender organisation unit may be specified to filter messages
 	 */
-	public function getCountUnreadMessages($person_id, $oe_kurzbz = null)
+	public function getCountUnreadMessages($person_id, $senderOU = null)
 	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_RECIPIENTS);
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
 
-		return $this->_ci->RecipientModel->getCountUnreadMessages($person_id, $oe_kurzbz);
+		return $this->_ci->RecipientModel->getCountUnreadMessages($person_id, $senderOU);
 	}
 
 	/**
-	 * updateMessageStatus() - will change status on message for particular user
-	 * NOTE: it performs an insert, NOT an update
+	 * Change the message status of the given message specified by message_id and person_id, using the given status
+	 * NOTE: it performs an insert NOT an update
 	 */
 	public function updateMessageStatus($message_id, $person_id, $status)
 	{
-		if (!is_numeric($message_id))
-		{
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-		}
+		if (!is_numeric($message_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
+		if (!is_numeric($status)) return error('The given status is not valid', MSG_ERR_INVALID_STATUS_ID);
 
-		if (!is_numeric($person_id))
-		{
-			return $this->_error('', MSG_ERR_INVALID_USER_ID);
-		}
-
-		// NOTE: Not use empty otherwise if status is 0 it returns an error
-		if (!isset($status))
-		{
-			return $this->_error('', MSG_ERR_INVALID_STATUS_ID);
-		}
+		$this->_ci->MsgStatusModel->resetQuery(); // Reset an eventually already buit query
 
 		// Searches if the status is already present
-		$result = $this->_ci->MsgStatusModel->load(array($message_id, $person_id, $status));
-		if (hasData($result))
-		{
-			// status already present
-		}
-		else
+		$updMessageStatusResult = $this->_ci->MsgStatusModel->load(array($message_id, $person_id, $status));
+		if (!hasData($updMessageStatusResult)) // if not found
 		{
 			// Insert the new status
 			$statusKey = array(
@@ -177,820 +354,555 @@ class MessageLib
 				'person_id' => $person_id,
 				'status' => $status
 			);
-
-			$result = $this->_ci->MsgStatusModel->insert($statusKey);
+			$updMessageStatusResult = $this->_ci->MsgStatusModel->insert($statusKey);
 		}
 
-		return $result;
-	}
-
-	/**
-	 * sendMessage() - sends new internal message. This function will create a new thread
-	 */
-	public function sendMessage($sender_id, $receiver_id, $subject, $body, $priority = PRIORITY_NORMAL, $relationmessage_id = null, $oe_kurzbz = null, $multiPartMime = true)
-	{
-		if (!is_numeric($sender_id))
-		{
-			$sender_id = $this->_ci->config->item('system_person_id');
-		}
-
-		$receivers = $this->_getReceivers($receiver_id, $oe_kurzbz);
-
-		// If everything went ok
-		if (isSuccess($receivers) && is_array($receivers->retval))
-		{
-			// If no receivers were found for this organization unit
-			if (count($receivers->retval) == 0)
-			{
-				$result = $this->_error($receivers->retval, MSG_ERR_OU_CONTACTS_NOT_FOUND);
-			}
-
-			// Looping on receivers
-			for ($i = 0; $i < count($receivers->retval); $i++)
-			{
-				$receiver_id = $receivers->retval[$i]->person_id;
-
-				// Checks if the receiver exists
-				if ($this->_checkReceiverId($receiver_id))
-				{
-					// If the text and the subject of the template are not empty
-					if (!isEmptyString($subject) && !isEmptyString($body))
-					{
-						$result = $this->_saveMessage($sender_id, $receiver_id, $subject, $body, $relationmessage_id, $oe_kurzbz);
-						// If no errors were occurred
-						// Leave the code commented
-						if (isSuccess($result))
-						{
-							// If the system is configured to send messages immediately
-							if ($this->_ci->config->item('send_immediately') === true)
-							{
-								// Send message by email!
-								$resultSendEmail = $this->sendOne($result->retval, $subject, $body, $multiPartMime);
-							}
-						}
-					}
-					else
-					{
-						if (isEmptyString($subject))
-						{
-							$result = $this->_error('', MSG_ERR_SUBJECT_EMPTY);
-							break;
-						}
-						elseif (isEmptyString($body))
-						{
-							$result = $this->_error('', MSG_ERR_BODY_EMPTY);
-							break;
-						}
-					}
-				}
-				else
-				{
-					$result = $this->_error('', MSG_ERR_INVALID_RECEIVER_ID);
-					break;
-				}
-			}
-		}
-		// If there was some errors then copy them into the returning variable
-		else
-		{
-			$result = $receivers;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Sends new internal message using a template
-	 */
-	public function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $relationmessage_id = null, $orgform_kurzbz = null, $multiPartMime = true)
-	{
-		if (!is_numeric($sender_id))
-		{
-			$sender_id = $this->_ci->config->item('system_person_id');
-		}
-
-		$receivers = $this->_getReceivers($receiver_id, $oe_kurzbz);
-
-		// If everything went ok
-		if (isSuccess($receivers) && is_array($receivers->retval))
-		{
-			// If no receivers were found for this organization unit
-			if (count($receivers->retval) == 0)
-			{
-				$result = $this->_error($receivers->retval, MSG_ERR_OU_CONTACTS_NOT_FOUND);
-			}
-			else
-			{
-				// Load reveiver data to get its relative language
-				$this->_ci->load->model('person/Person_model', 'PersonModel');
-			}
-
-			// Looping on receivers
-			for ($i = 0; $i < count($receivers->retval); $i++)
-			{
-				$receiver_id = $receivers->retval[$i]->person_id;
-
-				// Checks if the receiver exists
-				$result = $this->_ci->PersonModel->load($receiver_id);
-				if (hasData($result))
-				{
-					// Retrieves the language of the logged user
-					$sprache = getUserLanguage();
-
-					// Loads template data
-					$result = $this->_ci->vorlagelib->loadVorlagetext($vorlage_kurzbz, $oe_kurzbz, $orgform_kurzbz, $sprache);
-					if (isSuccess($result))
-					{
-						// If the text and the subject of the template are not empty
-						if (is_array($result->retval) && count($result->retval) > 0 &&
-							!isEmptyString($result->retval[0]->text) && !isEmptyString($result->retval[0]->subject))
-						{
-							// Parses template text
-							$parsedText = $this->_ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $data);
-							// Parses subject
-							$subject = $this->_ci->vorlagelib->parseVorlagetext($result->retval[0]->subject, $data);
-
-							// Save message
-							$result = $this->_saveMessage($sender_id, $receiver_id, $subject, $parsedText, $relationmessage_id, $oe_kurzbz);
-							// If no errors were occurred
-							if (isSuccess($result))
-							{
-								// If the system is configured to send messages immediately
-								if ($this->_ci->config->item('send_immediately') === true)
-								{
-									// Send message by email!
-									$resultSendEmail = $this->sendOne($result->retval, $subject, $parsedText, $multiPartMime);
-								}
-							}
-						}
-						else
-						{
-							// Better message error
-							if (!is_array($result->retval) || (is_array($result->retval) && count($result->retval) == 0))
-							{
-								$result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND);
-								break;
-							}
-							elseif (is_array($result->retval) && count($result->retval) > 0)
-							{
-								if (is_null($result->retval[0]->oe_kurzbz))
-								{
-									$result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND);
-									break;
-								}
-								elseif (isEmptyString($result->retval[0]->text))
-								{
-									$result = $this->_error('', MSG_ERR_INVALID_TEMPLATE);
-									break;
-								}
-								elseif (isEmptyString($result->retval[0]->subject))
-								{
-									$result = $this->_error('', MSG_ERR_INVALID_TEMPLATE);
-									break;
-								}
-							}
-						}
-					}
-					else
-					{
-						$result = $this->_error($result->retval, EXIT_ERROR);
-						break;
-					}
-				}
-				else
-				{
-					$result = $this->_error('', MSG_ERR_INVALID_RECEIVER_ID);
-					break;
-				}
-			}
-		}
-		// If there was some errors then copy them into the returning variable
-		else
-		{
-			$result = $receivers;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Gets all the messages from DB and sends them via email
-	 */
-	public function sendAll($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null)
-	{
-		$sent = true; // optimistic expectation
-
-		// Gets standard configs
-		$cfg = $this->_ci->maillib->getConfigs();
-		$cfg->email_number_to_sent = $numberToSent;
-		$cfg->email_number_per_time_range = $numberPerTimeRange;
-		$cfg->email_time_range = $email_time_range;
-		$cfg->email_from_system = $email_from_system;
-
-		// Overrides configs with the parameters
-		$this->_ci->maillib->overrideConfigs($cfg);
-
-		// Gets a number ($this->_ci->maillib->getMaxEmailToSent()) of unsent messages from DB
-		// having EMAIL_KONTAKT_TYPE as relative contact type
-		$result = $this->_ci->RecipientModel->getMessages(
-			EMAIL_KONTAKT_TYPE,
-			null,
-			$this->_ci->maillib->getConfigs()->email_number_to_sent
-		);
-		// Checks if errors were occurred
-		if (isSuccess($result))
-		{
-			// If data are present
-			if (is_array($result->retval) && count($result->retval) > 0)
-			{
-				// Iterating through the result set, if no errors occurred in the previous iteration
-				for ($i = 0; $i < count($result->retval) && $sent; $i++)
-				{
-					// If the person has an email account
-					if ((!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '')
-						|| (!is_null($result->retval[$i]->employeecontact) && $result->retval[$i]->employeecontact != ''))
-					{
-						$href = $this->_ci->config->item('message_server').$this->_ci->config->item('message_html_view_url').$result->retval[$i]->token;
-
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailHTML');
-
-						if(hasData($vorlage))
-						{
-							// Using a template for the html email body
-							$body = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[$i]->subject,
-									'body' => $result->retval[$i]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							// Using a template for the html email body
-							$body = $this->_ci->parser->parse(
-								'templates/mailHTML',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[$i]->subject,
-									'body' => $result->retval[$i]->body
-								),
-								true
-							);
-						}
-						if (is_null($body) || $body == '')
-						{
-							$this->_ci->loglib->logError('Error while parsing the mail template');
-						}
-
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailTXT');
-						if(hasData($vorlage))
-						{
-							// Using a template for the plain text email body
-							$altBody = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[$i]->subject,
-									'body' => $result->retval[$i]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							// Using a template for the plain text email body
-							$altBody = $this->_ci->parser->parse(
-								'templates/mailTXT',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[$i]->subject,
-									'body' => $result->retval[$i]->body
-								),
-								true
-							);
-						}
-						if (is_null($altBody) || $altBody == '')
-						{
-							$this->_ci->loglib->logError('Error while parsing the mail template');
-						}
-
-						// If the sender is not an employee, then system-sender is used if empty
-						$sender = '';
-						if (!is_null($result->retval[0]->senderemployeecontact) && $result->retval[0]->senderemployeecontact != '')
-						{
-							$sender = $result->retval[0]->senderemployeecontact.'@'.DOMAIN;
-						}
-
-						$receiverContact = $result->retval[$i]->receiver;
-						if (!is_null($result->retval[$i]->employeecontact) && $result->retval[$i]->employeecontact != '')
-						{
-							$receiverContact = $result->retval[$i]->employeecontact.'@'.DOMAIN;
-						}
-
-						// Sending email
-						$sent = $this->_ci->maillib->send(
-							$sender,
-							$receiverContact,
-							$result->retval[$i]->subject,
-							$body,
-							null,
-							null,
-							null,
-							$altBody
-						);
-						// If errors were occurred while sending the email
-						if (!$sent)
-						{
-							$this->_ci->loglib->logError('Error while sending an email');
-							// Writing errors in tbl_msg_recipient
-							$sme = $this->setMessageError(
-								$result->retval[$i]->message_id,
-								$result->retval[$i]->receiver_id,
-								'Error while sending an email',
-								$result->retval[$i]->sentinfo
-							);
-							if (!$sme)
-							{
-								$this->_ci->loglib->logError('Error while updating DB');
-							}
-						}
-						else
-						{
-							// Setting the message as sent in DB
-							$sent = $this->setMessageSent($result->retval[$i]->message_id, $result->retval[$i]->receiver_id);
-							// If some errors occurred
-							if (!$sent)
-							{
-								$this->_ci->loglib->logError('Error while updating DB');
-							}
-						}
-					}
-					else
-					{
-						$this->_ci->loglib->logError('This person does not have an email account');
-						// Writing errors in tbl_msg_recipient
-						$sme = $this->setMessageError(
-							$result->retval[$i]->message_id,
-							$result->retval[$i]->receiver_id,
-							'This person does not have an email account',
-							$result->retval[$i]->sentinfo
-						);
-						if (!$sme)
-						{
-							$this->_ci->loglib->logError('Error while updating DB');
-						}
-						$sent = true; // Non blocking error
-					}
-				}
-			}
-			else
-			{
-				$this->_ci->loglib->logInfo('There are no email to be sent');
-				$sent = false;
-			}
-		}
-		else
-		{
-			$this->_ci->loglib->logError('Something went wrong while getting data from DB');
-			$sent = false;
-		}
-
-		return $sent;
-	}
-
-	/**
-	 * Gets one message from DB and sends it via email
-	 */
-	public function sendOne($message_id, $subject = null, $body = null, $multiPartMime = true)
-	{
-		$sent = true; // optimistic expectation
-
-		// Get a specific message from DB having EMAIL_KONTAKT_TYPE as relative contact type
-		$result = $this->_ci->RecipientModel->getMessages(
-			EMAIL_KONTAKT_TYPE,
-			null,
-			null,
-			$message_id
-		);
-
-		// Checks if errors were occurred
-		if (isSuccess($result))
-		{
-			// If data are present
-			if (is_array($result->retval) && count($result->retval) > 0)
-			{
-				// If the person has an email account
-				if ((!is_null($result->retval[0]->receiver) && $result->retval[0]->receiver != '')
-					|| (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != ''))
-				{
-					// If it is required use a multi-part message in MIME format
-					if ($multiPartMime === true)
-					{
-						// Using a template for the html email body
-						$href = $this->_ci->config->item('message_server').$this->_ci->config->item('message_html_view_url').$result->retval[0]->token;
-
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailHTML');
-						if(hasData($vorlage))
-						{
-							$bodyMsg = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							$bodyMsg = $this->_ci->parser->parse(
-								'templates/mailHTML',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						if (is_null($bodyMsg) || $bodyMsg == '')
-						{
-							// $body = $result->retval[0]->body;
-							$this->_ci->loglib->logError('Error while parsing the html mail template');
-						}
-
-						// Using a template for the plain text email body
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailTXT');
-						if(hasData($vorlage))
-						{
-							$altBody = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							$altBody = $this->_ci->parser->parse(
-								'templates/mailTXT',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						if (is_null($altBody) || $altBody == '')
-						{
-							$this->_ci->loglib->logError('Error while parsing the plain text mail template');
-						}
-					}
-					else
-					{
-						$bodyMsg = $altBody = $body;
-					}
-
-					// If the sender is not an employee, then system-sender is used if empty
-					$sender = '';
-					if (!is_null($result->retval[0]->senderemployeecontact) && $result->retval[0]->senderemployeecontact != '')
-					{
-						$sender = $result->retval[0]->senderemployeecontact.'@'.DOMAIN;
-					}
-
-					$receiverContact = $result->retval[0]->receiver;
-					if (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != '')
-					{
-						$receiverContact = $result->retval[0]->employeecontact.'@'.DOMAIN;
-					}
-
-					// Sending email
-					$sent = $this->_ci->maillib->send(
-						null,
-						$receiverContact,
-						is_null($subject) ? $result->retval[0]->subject : $subject, // if parameter subject is not null, use it!
-						$bodyMsg,
-						null,
-						null,
-						null,
-						$altBody
-					);
-					// If errors were occurred while sending the email
-					if (!$sent)
-					{
-						$this->_ci->loglib->logError('Error while sending an email');
-						// Writing errors in tbl_msg_recipient
-						$sme = $this->setMessageError(
-							$result->retval[0]->message_id,
-							$result->retval[0]->receiver_id,
-							'Error while sending an email',
-							$result->retval[0]->sentinfo
-						);
-						if (!$sme)
-						{
-							$this->_ci->loglib->logError('Error while updating DB');
-						}
-					}
-					else
-					{
-						// Setting the message as sent in DB
-						$sent = $this->setMessageSent($result->retval[0]->message_id, $result->retval[0]->receiver_id);
-						// If the email has been sent and the DB updated
-						if (!$sent)
-						{
-							$this->_ci->loglib->logError('Error while updating DB');
-						}
-					}
-				}
-				else
-				{
-					$this->_ci->loglib->logError('This person does not have an email account');
-					// Writing errors in tbl_msg_recipient
-					$sme = $this->setMessageError(
-						$result->retval[0]->message_id,
-						$result->retval[0]->receiver_id,
-						'This person does not have an email account',
-						$result->retval[0]->sentinfo
-					);
-					if (!$sme)
-					{
-						$this->_ci->loglib->logError('Error while updating DB');
-					}
-					$sent = true; // Non blocking error
-				}
-			}
-			else
-			{
-				$this->_ci->loglib->logInfo('There are no email to be sent');
-				$sent = false;
-			}
-		}
-		else
-		{
-			$this->_ci->loglib->logError('Something went wrong while getting data from DB');
-			$sent = false;
-		}
-
-		return $sent;
-	}
-
-	/**
-	 * parseMessageText
-	 */
-	public function parseMessageText($text, $data = array())
-	{
-		return $this->_ci->parser->parse_string($text, $data, true);
-	}
-
-	/**
-	 * Gets data for Person from view vw_msg_vars_person
-	 * @param $person_id
-	 */
-	public function getMessageVarsPerson()
-	{
-		$variablesArray = array();
-
-		$variables = $this->_ci->MessageModel->getMessageVarsPerson();
-		if (isError($variables))
-		{
-			return $variables;
-		}
-		elseif (hasData($variables))
-		{
-			$tmpVariablesArray = getData($variables);
-			// Skip person_id
-			for ($i = 1; $i < count($tmpVariablesArray); $i++)
-			{
-				$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}'] = $tmpVariablesArray[$i];
-			}
-		}
-
-		return success($variablesArray);
-	}
-
-	/**
-	 * A person may belongs to more organisation units
-	 */
-	public function getOeKurzbz($sender_id)
-	{
-		$oe_kurzbz = array();
-
-		$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
- 		$benutzer = $this->_ci->BenutzerfunktionModel->getByPersonId($sender_id);
-		if (isError($benutzer))
-		{
-			return $benutzer;
-		}
- 		elseif (hasData($benutzer))
- 		{
- 			foreach (getData($benutzer) as $val)
- 			{
- 				$oe_kurzbz[] = $val->oe_kurzbz;
- 			}
- 		}
-
-		return success($oe_kurzbz);
-	}
-
-	/**
-	 * Admin or commoner?
-	 */
-	public function getIsAdmin($sender_id)
-	{
-		$this->_ci->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
-
- 		return $this->_ci->BenutzerrolleModel->isAdminByPersonId($sender_id);
+		return $updMessageStatusResult;
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
 	/**
-	 * Update the table tbl_msg_recipient
+	 *
 	 */
-	private function _updateMessageRecipient($message_id, $receiver_id, $parameters)
+	private function _getSender($sender_id)
 	{
-		$updated = false;
-
-		// Updates table tbl_msg_recipient
-		$resultUpdate = $this->_ci->RecipientModel->update(array($receiver_id, $message_id), $parameters);
-		// Checks if errors were occurred
-		if (isSuccess($resultUpdate) && is_array($resultUpdate->retval))
+		// By default the sender is defined in message configuration
+		$sender = success($this->_ci->config->item(self::CFG_SYSTEM_PERSON_ID));
+		if ($sender_id != null) // if it was given as parameter
 		{
-			$updated = true;
-		}
-
-		return $updated;
-	}
-
-	/**
-	 * Changes the status of the message from unsent to sent
-	 */
-	private function setMessageSent($message_id, $receiver_id)
-	{
-		$parameters = array('sent' => 'NOW()', 'sentinfo' => null);
-
-		return $this->_updateMessageRecipient($message_id, $receiver_id, $parameters);
-	}
-
-	/**
-	 * Sets the sentInfo with the error
-	 */
-	private function setMessageError($message_id, $receiver_id, $sentInfo, $prevSentInfo = null)
-	{
-		if (!is_null($prevSentInfo) && $prevSentInfo != '')
-		{
-			$sentInfo = $prevSentInfo.SENT_INFO_NEWLINE.$sentInfo;
-		}
-
-		$parameters = array('sent' => null, 'sentinfo' => $sentInfo);
-
-		return $this->_updateMessageRecipient($message_id, $receiver_id, $parameters);
-	}
-
-	/**
-	 * Gets the receivers id that are enabled to read messages for that oe_kurzbz
-	 */
-	private function _getReceiversByOekurzbz($oe_kurzbz)
-	{
-		// Load Benutzerfunktion_model
-		$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-		// Join with table public.tbl_benutzer on field uid
-		$this->_ci->BenutzerfunktionModel->addJoin('public.tbl_benutzer', 'uid');
-		// Get all the valid receivers id using the oe_kurzbz
-		$receivers = $this->_ci->BenutzerfunktionModel->loadWhere(
-			'oe_kurzbz = '.$this->_ci->db->escape($oe_kurzbz).
-			' AND funktion_kurzbz = '.$this->_ci->db->escape($this->_ci->config->item('assistent_function')).
-			' AND (NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW()))'
-		);
-
-		return $receivers;
-	}
-
-	/**
-	 * Gets the receivers id
-	 */
-	private function _getReceivers($receiver_id, $oe_kurzbz = null)
-	{
-		$receivers = null;
-
-		// If no receiver_id is given...
-		if (is_null($receiver_id))
-		{
-			// ...a oe_kurzbz must be specified
-			if (is_null($oe_kurzbz))
+			if (is_numeric($sender_id)) // if it valid -> it is a number
 			{
-				$receivers = $this->_error('', MSG_ERR_INVALID_OU);
+				$sender = success($sender_id); // return it as a success object
 			}
 			else
 			{
-				$receivers = $this->_getReceiversByOekurzbz($oe_kurzbz);
+				// Otherwise returns an error
+				$sender = error('The given sender is not valid', MSG_ERR_INVALID_SENDER);
 			}
 		}
-		// Else if the receiver id is given
-		else
-		{
-			$receivers = $this->_success(array(new stdClass()));
-			$receivers->retval[0]->person_id = $receiver_id;
-		}
 
-		return $receivers;
+		return $sender;
 	}
 
 	/**
-	 * Checks if the given receiver id is a valid person
+	 * Checks if the given receiver ids belong to persons in database
 	 */
-	private function _checkReceiverId($receiver_id)
+	private function _getReceiversByPersonId($receiver_id)
 	{
-		// Load Person_model
 		$this->_ci->load->model('person/Person_model', 'PersonModel');
-		$result = $this->_ci->PersonModel->load($receiver_id);
-		if (hasData($result))
-		{
-			return true;
-		}
 
-		return false;
+		// Reset an eventually already buit query
+		$this->_ci->PersonModel->resetQuery();
+
+		// Get only this columns
+		$this->_ci->PersonModel->addSelect('person_id');
+
+		// Loads from database the person by its person_id
+		$personResult = $this->_ci->PersonModel->load($receiver_id);
+		if (hasData($personResult)) // if data are retrieved
+		{
+			return $personResult; // return them
+		}
+		else // otherwise an error occurred (blocking error or data not found)
+		{
+			return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
+		}
 	}
 
 	/**
-	 * Save a message in DB
-	 **/
-	private function _saveMessage($sender_id, $receiver_id, $subject, $body, $relationmessage_id, $oe_kurzbz)
+	 * Save a new message in DB
+	 */
+	private function _saveMessage($sender_id, $senderOU, $receiver_id, $receiverOU, $subject, $body, $priority, $relationmessage_id)
 	{
-		// Starts db transaction
+		// Starts database transaction
 		$this->_ci->db->trans_start(false);
 
-		// Save Message
-		$msgData = array(
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		$uid = null;
+		$benutzerDB = $this->_ci->BenutzerModel->loadWhere(array('person_id' => $sender_id));
+		if (hasData($benutzerDB))
+		{
+			$uid = getData($benutzerDB)[0]->uid;
+		}
+
+		// Store message information in tbl_msg_message
+		$messageData = array(
 			'person_id' => $sender_id,
 			'subject' => $subject,
 			'body' => $body,
-			'priority' => PRIORITY_NORMAL,
+			'priority' => $priority,
 			'relationmessage_id' => $relationmessage_id,
-			'oe_kurzbz' => $oe_kurzbz
+			'oe_kurzbz' => $senderOU
 		);
-		$result = $this->_ci->MessageModel->insert($msgData);
-		if (isSuccess($result))
+
+		$saveMessageResult = $this->_ci->MessageModel->insert($messageData);
+		if (isSuccess($saveMessageResult))
 		{
-			// Link the message with the receiver
-			$msg_id = $result->retval;
+			$messageId = getData($saveMessageResult); // Gets the message id generated by database
+
+			// Store message information in tbl_msg_recipient
 			$recipientData = array(
 				'person_id' => $receiver_id,
-				'message_id' => $msg_id,
-				'token' => generateToken()
+				'message_id' => $messageId,
+				'token' => generateToken(),
+				'oe_kurzbz' => $receiverOU
 			);
-			$result = $this->_ci->RecipientModel->insert($recipientData);
-			if (isSuccess($result))
+
+			$saveMessageResult = $this->_ci->RecipientModel->insert($recipientData);
+			if (isSuccess($saveMessageResult))
 			{
-				// Save message status
+				// Store message information in tbl_msg_status
 				$statusData = array(
-					'message_id' => $msg_id,
+					'message_id' => $messageId,
 					'person_id' => $receiver_id,
-					'status' => MSG_STATUS_UNREAD
+					'status' => MSG_STATUS_UNREAD,
+					'insertvon' => $uid
 				);
-				$result = $this->_ci->MsgStatusModel->insert($statusData);
+				$saveMessageResult = $this->_ci->MsgStatusModel->insert($statusData);
 			}
 		}
 
-		$this->_ci->db->trans_complete();
+		$this->_ci->db->trans_complete(); // Ends database transaction
 
-		if ($this->_ci->db->trans_status() === false || isError($result))
+		// If the transaction failed...
+		if ($this->_ci->db->trans_status() === false || isError($saveMessageResult))
 		{
-			$this->_ci->db->trans_rollback();
-			$result = $this->_error('An error occurred while saving a message', EXIT_ERROR);
+			$this->_ci->db->trans_rollback(); // ...then rollback
+		}
+		else // otherwise commit...
+		{
+			$this->_ci->db->trans_commit();
+			$saveMessageResult = success($messageId); // ...and returns the message id
+		}
+
+		return $saveMessageResult;
+	}
+
+	/**
+	 * Set the message as sent successfully by setting columns 'sent' and 'sentinfo' of table tbl_msg_recipient
+	 * sent column is set with date of delivery
+	 * sentinfo is set to null
+	 */
+	private function _setSentSuccess($message_id, $receiver_id)
+	{
+		return $this->_ci->RecipientModel->update(array($receiver_id, $message_id), array('sent' => 'NOW()', 'sentinfo' => null));
+	}
+
+	/**
+	 * Set the message as sent with error by setting columns 'sent' and 'sentinfo' of table tbl_msg_recipient
+	 * Stores the type of error in 'sentinfo' column keeping en eventual previous error
+	 * sent column is set to null
+	 */
+	private function _updatedRecipientNoticeEmailInfo($message_id, $receiver_id, $sentInfo, $prevSentInfo)
+	{
+		if (!isEmptyString($prevSentInfo))
+		{
+			$sentInfo .= self::SENT_INFO_NEWLINE.$prevSentInfo;
+		}
+
+		return $this->_ci->RecipientModel->update(array($receiver_id, $message_id), array('sent' => null, 'sentinfo' => $sentInfo));
+	}
+
+	/**
+	 * Returns the notice body. Tries to use the template present in database and then falling back
+	 * on the one present in filesystem. If both fail then an error is returned
+	 */
+	private function _getNoticeBody($dbEmailNoticeTemplate, $fsEmailNoticeTemplate, $viewMessageLink, $subject, $body)
+	{
+		$noticeBody = null; // pessimistic expectation
+
+		if (!isEmptyString($dbEmailNoticeTemplate))
+		{
+			$noticeBody = parseText(
+				$dbEmailNoticeTemplate,
+				array(
+					'href' => $viewMessageLink,
+					'subject' => $subject,
+					'body' => $body
+				)
+			);
 		}
 		else
 		{
-			$this->_ci->db->trans_commit();
-			$result = $this->_success($msg_id);
+			$noticeBody = parseText(
+				$fsEmailNoticeTemplate,
+				array(
+					'href' => $viewMessageLink,
+					'subject' => $subject,
+					'body' => $body
+				)
+			);
 		}
 
-		return $result;
+		if (isEmptyString($noticeBody)) return error('An error occurred while generating the notice body');
+
+		return success($noticeBody);
 	}
 
 	/**
-	 * Wrapper for function error
+	 * Sends notice emails to the recipient of a message
 	 */
-	private function _error($retval, $code)
+	private function _sendNoticeEmails($messageIds)
 	{
-		return error($retval, $code);
+		// Retrieves the messages information using the given message ids array
+		$messagesResult = $this->_ci->RecipientModel->getMessagesById($messageIds);
+		if (isError($messagesResult)) return $messageRecipientResult; // if an error occured then return it
+		if (!hasData($messagesResult)) return error('No data found with the given message ids'); // if no data found then return an error
+
+		$messages = array(); // all the worked messages will be added here
+
+		// Loops through $messagesResult and stores data about a message in $message
+		foreach (getData($messagesResult) as $message)
+		{
+			// If the recipient organisation unit is in the list of organisation units that do not receive notice emails
+			if (array_search($message->receiver_ou, $this->_ci->config->item(self::CFG_OU_RECEIVERS_NO_NOTICE)))
+			{
+				// Then there is no need to send a notice email to this organisation unit
+			}
+			else // otherwise tries to retrieve the right email contact for the message recipient
+			{
+				$message->receiverContact = null; // by default set the recipient contact as null
+
+				// If the message was sent to an organisation unit then retrives degree program email
+				if ($message->receiver_id == $this->_ci->config->item(self::CFG_SYSTEM_PERSON_ID) && !isEmptyString($message->receiver_ou))
+				{
+					$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+					$studiengangResult = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $message->receiver_ou));
+					if (isError($studiengangResult)) return $studiengangResult; // if an error occured then return it
+
+					// Use the degree program email
+					if (hasData($studiengangResult)) $message->receiverContact = getData($studiengangResult)[0]->email;
+				}
+				// If message was sent from FAS and NOT from infocenter
+				elseif (!isEmptyString($message->sender_ou)
+					&& !array_search($message->sender_ou, $this->_ci->config->item(self::CFG_OU_RECEIVERS_NO_NOTICE)))
+				{
+					// If the recipient organisation unit is NOT in the list of organisation units that sent only to private emails
+					if (array_search($message->receiver_ou, $this->_ci->config->item(self::CFG_OU_RECEIVERS_PRIVATE)) === false)
+					{
+						$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+						// And the receiver has an active account for the given organisation unit
+						$benutzerResult = $this->_ci->BenutzerModel->getActiveUserByPersonIdAndOrganisationUnit($message->receiver_id, $message->sender_ou);
+						if (isError($benutzerResult)) return $benutzerResult; // if an error occured then return it
+
+						// Use the uid + domain email
+						if (hasData($benutzerResult)) $message->receiverContact = getData($benutzerResult)[0]->uid .'@'.DOMAIN;
+					}
+
+					// Otherwise try with the private email
+					if (isEmptyString($message->receiverContact))
+					{
+						$privateEmailResult = $this->_getPrivateEmail($message->receiver_id);
+						if (isError($privateEmailResult)) return $privateEmailResult; // if an error occured then return it
+
+						// Use the private email
+						if (hasData($privateEmailResult)) $message->receiverContact = getData($privateEmailResult);
+					}
+				}
+				else // the recipient is a person
+				{
+					$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+					// The recipient has an active account
+					$benutzerResult = $this->_ci->BenutzerModel->loadWhere(array('person_id' => $message->receiver_id, 'aktiv' => true));
+					if (isError($benutzerResult)) return $benutzerResult; // if an error occured then return it
+
+					// If the user is present and active
+					if (hasData($benutzerResult))
+					{
+						$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+						$mitarbeiterResult = $this->_ci->MitarbeiterModel->loadWhere(array('mitarbeiter_uid' => getData($benutzerResult)[0]->uid));
+						if (isError($mitarbeiterResult)) return $mitarbeiterResult; // if an error occured then return it
+
+						// If employee
+						if (hasData($mitarbeiterResult))
+						{
+							$message->receiverContact = getData($benutzerResult)[0]->uid .'@'.DOMAIN; // Use the uid + domain email
+						}
+						else // ...otherwise...
+						{
+							$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+							// ...try to get all the prestudent for this receiver
+							$prestudentResults = $this->_ci->PrestudentModel->getOrganisationunitsByPersonId($message->receiver_id);
+							if (isError($prestudentResults)) return $prestudentResults; // if an error occured then return it
+
+							// If there are presetudent
+							if (hasData($prestudentResults))
+							{
+								$inArray = true;
+								$organisationUnits = getData($prestudentResults);
+
+								// Look if any of the organization units of this prestudent are in the list of the
+								// organization units that will not send the notice email to the internal account
+								foreach ($organisationUnits as $organisationUnit)
+								{
+									// If the recipient organisation unit is NOT in the list of organisation units that sent only to private emails
+									if (array_search($organisationUnit, $this->_ci->config->item(self::CFG_OU_RECEIVERS_PRIVATE)) === false)
+									{
+										$inArray = false;
+										break;
+									}
+								}
+
+								// If the recipient prestudent organization unit is not in in the list of the
+								// organization units that will not send the notice email to the internal account
+								if (!$inArray)
+								{
+									// Then use the private email
+									$privateEmailResult = $this->_getPrivateEmail($message->receiver_id);
+									if (isError($privateEmailResult)) return $privateEmailResult; // if an error occured then return it
+
+									if (hasData($privateEmailResult)) $message->receiverContact = getData($privateEmailResult);
+								}
+								else // Use the most recent UID + domain
+								{
+									$this->_ci->BenutzerModel->resetQuery();
+
+									$this->_ci->BenutzerModel->addOrder('updateamum', 'DESC');
+									$this->_ci->BenutzerModel->addOrder('insertamum', 'DESC');
+
+									$benutzerResult = $this->_ci->BenutzerModel->loadWhere(array('person_id' => $message->receiver_id));
+									if (isError($benutzerResult)) return $benutzerResult; // if an error occured then return it
+
+									$message->receiverContact = getData($benutzerResult)[0]->uid .'@'.DOMAIN; // Use the uid + domain email
+								}
+							}
+						}
+					}
+					else // otherwise use the private email
+					{
+						$privateEmailResult = $this->_getPrivateEmail($message->receiver_id);
+						if (isError($privateEmailResult)) return $privateEmailResult; // if an error occured then return it
+
+						// Use the private email
+						if (hasData($privateEmailResult)) $message->receiverContact = getData($privateEmailResult);
+					}
+				}
+			}
+
+			$messages[] = $message; // add new message to be noticed into the messages array
+		}
+
+		return $this->_sendNoticeEmail($messages);
 	}
 
 	/**
-	 * Wrapper for function success
+	 *
 	 */
-	private function _success($retval, $code = null)
+	private function _getPrivateEmail($person_id)
 	{
-		return success($retval, $code);
+		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$getPrivateEmail = $this->_ci->KontaktModel->getContactByPersonId($person_id, self::EMAIL_KONTAKT_TYPE);
+
+		if (hasData($getPrivateEmail)) return success(getData($getPrivateEmail)[0]->kontakt);
+		else return success();
+
+		return $getPrivateEmail;
+	}
+
+	/**
+	 * Core method to send one or more email notices for one or more messages
+	 */
+	private function _sendNoticeEmail($messages)
+	{
+		// Prefix for all links that will be subsequently generated
+		$prefixLink = $this->_ci->config->item(self::CFG_MESSAGE_SERVER).$this->_ci->config->item(self::CFG_MESSAGE_HTML_VIEW_URL);
+
+		// Loads all the needed templates for HTML and plain text. Main templates from database, fallback templates from file system
+		$dbEmailNoticeTemplateHTML = $this->_loadDbNoticeEmailTemplate(self::NOTICE_TEMPLATE_HTML);
+		$dbEmailNoticeTemplateTXT = $this->_loadDbNoticeEmailTemplate(self::NOTICE_TEMPLATE_TXT);
+		$fsEmailNoticeTemplateHTML = $this->_loadFsNoticeEmailTemplate(self::NOTICE_TEMPLATE_FALLBACK_HTML);
+		$fsEmailNoticeTemplateTXT = $this->_loadFsNoticeEmailTemplate(self::NOTICE_TEMPLATE_FALLBACK_TXT);
+
+		// Loops through all the messages to be sent
+		foreach ($messages as $messageData)
+		{
+			// Checks if this person has a valid email address where to send the notice email
+			if (!isEmptyString($messageData->receiverContact))
+			{
+				// Create a link to the controller to view the message using a token
+				$viewMessageLink = $prefixLink.$messageData->token;
+
+				// Generates notice email body in HTML format
+				$noticeHTMLBody = $this->_getNoticeBody(
+					$dbEmailNoticeTemplateHTML, $fsEmailNoticeTemplateHTML, $viewMessageLink, $messageData->subject, $messageData->body
+				);
+				// If an error occured during the generation then the error itself is returned
+				if (isError($noticeHTMLBody)) return $noticeHTMLBody;
+
+				// Generates notice email body in plain text format
+				$noticeTXTBody = $this->_getNoticeBody(
+					$dbEmailNoticeTemplateTXT, $fsEmailNoticeTemplateTXT, $viewMessageLink, $messageData->subject, $messageData->body
+				);
+				// If an error occured during the generation then the error itself is returned
+				if (isError($noticeTXTBody)) return $noticeTXTBody;
+
+				// Sending email
+				$sent = $this->_ci->maillib->send(
+					null,
+					$messageData->receiverContact,
+					$messageData->subject,
+					getData($noticeHTMLBody),
+					null,
+					null,
+					null,
+					getData($noticeTXTBody)
+				);
+
+				// If errors occurred while sending the email
+				if (!$sent)
+				{
+					// Set in database why this email is NOT going to be send
+					$sse = $this->_updatedRecipientNoticeEmailInfo(
+						$messageData->message_id,
+						$messageData->receiver_id,
+						'An error occurred while sending the notice email', // current info
+						$messageData->sentinfo  // previous info
+					);
+
+					// If database error occurred then return it, otherwise return a logic error
+					return isError($sse) ? $sse : error('An error occurred while updating the recipient notice email info');
+				}
+				else // success!
+				{
+					// Set in database that the notice email was succesfully sent
+					$sss = $this->_setSentSuccess($messageData->message_id, $messageData->receiver_id);
+					if (isError($sss)) return $sss; // If database error occurred then return it
+				}
+			}
+			else // Because was not possible to find a valid contact
+			{
+				$reason = 'Was not possible to find a valid contact for this user'; // default reason
+
+				// In case that the organisation unit does not receive any email notices
+				if (!isEmptyString($messageData->receiver_ou)) $reason = 'This organization unit does not receive email notices';
+
+				// In case that a degree program sent a message to a user without a valid contact or UID
+				if (!isEmptyString($messageData->sender_ou)) $reason = 'Sent from a degree program to a user that does not have a valid UID or a valid contact';
+
+				// Set in database why this email is NOT going to be send
+				$sse = $this->_updatedRecipientNoticeEmailInfo(
+					$messageData->message_id,
+					$messageData->receiver_id,
+					$reason, // current info
+					$messageData->sentinfo // previous info
+				);
+
+				// If database error occurred then return it
+				if (isError($sse)) return $sse;
+			}
+		}
+
+		return success('Notice emails sent successfully');
+	}
+
+	/**
+	 * Sends new message core method, may be wrapped by other methods.
+	 * If success then returns an array of successfully saved message ids
+	 */
+	private function _sendMessage(
+		$receivers, $receiversOU, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime
+	)
+	{
+		// Checks if sender is fine
+		$sender = $this->_getSender($sender_id);
+		if (!hasData($sender)) return $sender;
+
+		// Checks if the sender and receiver organisation unit are valid
+		if (($receiversOU != null && !$this->_ouExists($receiversOU)) || ($senderOU != null && !$this->_ouExists($senderOU)))
+		{
+			return error('The given organisation unit is not valid', MSG_ERR_INVALID_OU);
+		}
+
+		// Checks subjects
+		if (isEmptyString($subject)) return error('The given subject is an empty string', MSG_ERR_INVALID_SUBJECT);
+		// Checks body
+		if (isEmptyString($body)) return error('The given body is an empty string', MSG_ERR_INVALID_BODY);
+
+		$savedMessages = array(); // This array contains all the message ids of the saved messages
+
+		// Looping on receivers
+		foreach (getData($receivers) as $receiver)
+		{
+			// Save message in database
+			$saveMessageResult = $this->_saveMessage(
+				getData($sender), $senderOU, $receiver->person_id, $receiversOU, $subject, $body, $priority, $relationmessage_id
+			);
+			if (isSuccess($saveMessageResult)) // If successfully saved
+			{
+				$savedMessages[] = getData($saveMessageResult); // store the message id of the saved message
+			}
+			else
+			{
+				return $saveMessageResult; // If an error occured while saving
+			}
+		}
+
+		// If the system is configured to send messages immediately
+		if ($this->_ci->config->item(self::CFG_SEND_IMMEDIATELY) === true)
+		{
+			// Looping through saved messages ids
+			foreach ($savedMessages as $message_id)
+			{
+				// Send message notice via email!
+				$sendNotice = $this->_sendNoticeEmails(array($message_id));
+
+				// If an error occurred then return it
+				if (isError($sendNotice)) return $sendNotice;
+			}
+		}
+
+		return success($savedMessages);
+	}
+
+	/**
+	 * Checks if the given organisation unit exists in database
+	 */
+	private function _ouExists($ou)
+	{
+		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		// Reset an eventually already buit query
+		$this->_ci->OrganisationseinheitModel->resetQuery();
+		// Get only this columns
+		$this->_ci->OrganisationseinheitModel->addSelect('oe_kurzbz');
+		// Retrieves the given organisation unit from database
+		$ouResults = $this->_ci->OrganisationseinheitModel->loadWhere(array('oe_kurzbz' => $ou));
+
+		return hasData($ouResults);
+	}
+
+	/**
+	 * Loads a the specified template from database
+	 * Returns null if not found or on failure
+	 */
+	private function _loadDbNoticeEmailTemplate($dbTemplateName)
+	{
+		$emailNoticeTemplate = null;
+
+		$vorlageResult = $this->_ci->vorlagelib->loadVorlagetext($dbTemplateName);
+
+		if (hasData($vorlageResult))
+		{
+			$emailNoticeTemplate = getData($vorlageResult)[0]->text;
+		}
+
+		return $emailNoticeTemplate;
+	}
+
+	/**
+	 * Loads a the specified template from database
+	 */
+	private function _loadFsNoticeEmailTemplate($fsTemplateName)
+	{
+		return $this->_ci->load->view($fsTemplateName, null, true);
 	}
 }
diff --git a/application/libraries/PersonLogLib.php b/application/libraries/PersonLogLib.php
index 299fc8ce2..fe9a82504 100644
--- a/application/libraries/PersonLogLib.php
+++ b/application/libraries/PersonLogLib.php
@@ -76,7 +76,7 @@ class PersonLogLib
 			return $decoded_logs;
 		}
 		else
-			show_error($result->retval);
+			show_error(getError($result));
 	}
 
 	/**
diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
index af642fe9e..dec3d54c0 100644
--- a/application/libraries/PhrasesLib.php
+++ b/application/libraries/PhrasesLib.php
@@ -107,7 +107,7 @@ class PhrasesLib
 					// If no <p> tags required
 					if ($blockTags == 'no')
 					{
-						$tmpText = $textileParser->textileThis($result->retval[$i]->text); // Parse
+						$tmpText = $textileParser->parse($result->retval[$i]->text); // Parse
 
 						// Removes tags <p> and </p> from the beginning and from the end of the string if they are present
 						// NOTE: Those tags are usually, but not always, added by the textile parser
@@ -127,7 +127,7 @@ class PhrasesLib
 					}
 					else
 					{
-						$result->retval[$i]->text = $textileParser->textileThis($result->retval[$i]->text);
+						$result->retval[$i]->text = $textileParser->parse($result->retval[$i]->text);
 					}
 				}
 			}
@@ -165,16 +165,6 @@ class PhrasesLib
     }
 
 	/**
-     * parseVorlagetext() - will parse a Vorlagetext.
-     */
-    public function parseVorlagetext($text, $data = array())
-	{
-        if (isEmptyString($text)) return error('Not a valid text');
-
-		return $this->_ci->parser->parse_string($text, $data, true);
-    }
-
-	/**
 	 * Retrieves a phrases from the the property _phrases with the given parameters
 	 * It also replace parameters inside the phrase if they are provided
 	 * @param string $category Category name which is used to categorize the phrase.
@@ -201,7 +191,7 @@ class PhrasesLib
 				{
 					if (!is_array($parameters)) $parameters = array(); // if params is not an array
 
-					return $this->_ci->parser->parse_string($_phrase->text, $parameters, true); // parsing
+					return parseText($_phrase->text, $parameters); // parsing
 				}
 			}
 		}
diff --git a/application/libraries/TableWidgetLib.php b/application/libraries/TableWidgetLib.php
index 139e5d6cb..dc746b6d5 100644
--- a/application/libraries/TableWidgetLib.php
+++ b/application/libraries/TableWidgetLib.php
@@ -66,7 +66,7 @@ class TableWidgetLib
 	const DATASET_REP_TABULATOR = 'tabulator';
 
 	const PERMISSION_TABLE_METHOD = 'TableWidget'; // Name for fake method to be checked by the PermissionLib
-	const PERMISSION_TYPE = 'rw';
+	const PERMISSION_TYPE = 'r';
 
 	private $_ci; // Code igniter instance
 	private $_tableUniqueId; // unique id for this table widget
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
index 6166b44a9..bc8552c25 100644
--- a/application/libraries/UDFLib.php
+++ b/application/libraries/UDFLib.php
@@ -540,7 +540,7 @@ class UDFLib
 		{
 			if (is_object($udfResults) && isset($udfResults->retval))
 			{
-				show_error($udfResults->retval);
+				show_error(getError($udfResults));
 			}
 			elseif (is_string($udfResults))
 			{
diff --git a/application/libraries/VariableLib.php b/application/libraries/VariableLib.php
index 3d732984f..2f038531b 100644
--- a/application/libraries/VariableLib.php
+++ b/application/libraries/VariableLib.php
@@ -57,7 +57,7 @@ class VariableLib
 
 		if (!isEmptyString($uid) && !isEmptyString($name) && is_numeric($change))
 		{
-			$change = (int) $change;
+			$change = (int)$change;
 			$varres = $this->_ci->VariableModel->getVariables($uid, array($name));
 
 			if (isSuccess($varres))
diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php
index d6c9d6a98..9679dff1c 100644
--- a/application/libraries/VorlageLib.php
+++ b/application/libraries/VorlageLib.php
@@ -188,18 +188,4 @@ class VorlageLib
 		$vorlagetext = $this->ci->VorlageStudiengangModel->update($vorlagestudiengang_id, $data);
 		return $vorlagetext;
 	}
-
-	/**
-	 * parseVorlagetext() - will parse a Vorlagetext.
-	 *
-	 * @param   string  $text	REQUIRED
-	 * @param   array  $data	REQUIRED
-	 * @return  string
-	 */
-	public function parseVorlagetext($text, $data = array())
-	{
-		if (isEmptyString($text)) return error('Not a valid text');
-
-		return $this->ci->parser->parse_string($text, $data, true);
-	}
 }
diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
index 5f3f40e6d..cbb42543f 100644
--- a/application/models/CL/Messages_model.php
+++ b/application/models/CL/Messages_model.php
@@ -1,11 +1,33 @@
 <?php
 
 /**
- * This model extends CI_Model because here is just implemented logic
- * It does not represent a resource (ex. like models that extend DB_Model)
+ * Messages GUI logic
+ * - This model extends CI_Model because here is just implemented logic
+ * - It does not represent a resource (ex. like models that extend DB_Model)
  */
 class Messages_model extends CI_Model
 {
+	const REPLY_SUBJECT_PREFIX = 'Re: '; // reply subject prefix
+	// To quote a reply body message
+	const REPLY_BODY_FORMAT = '<br>
+		<br>
+		<blockquote>
+			<i>
+				On %s %s %s wrote:
+			</i>
+		</blockquote>
+		<blockquote style="border-left:2px solid; padding-left: 8px">
+			%s
+		</blockquote>';
+
+	const NO_AUTH_UID = 'online'; // hard coded uid if no authentication is performed
+
+	// Recipients types
+	const TYPE_PERSONS = 'persons';
+	const TYPE_PRESTUDENTS = 'prestudents';
+
+	const ALT_OE = 'infocenter'; // alternative organisation unit when no one is found for a presetudent
+
 	/**
 	 * Constructor
 	 */
@@ -14,159 +36,618 @@ class Messages_model extends CI_Model
 		parent::__construct();
 
 		// Loads the message library
-		$this->load->library('MessageLib');
-
+		$this->load->library('MessageLib'); // MessageModel loaded here!
 		// Loads the person log library
 		$this->load->library('PersonLogLib');
+		// Loads the widget library
+		$this->load->library('WidgetLib');
 
+		// Loads model MessageToken_model
 		$this->load->model('system/MessageToken_model', 'MessageTokenModel');
+		// Loads model Benutzerrolle_model
+		$this->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
+		// Loads model Prestudent_model
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 	}
 
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
 	/**
-	 * Executes message sending
-	 * @param $sender_id
-	 * @return array wether execution was successfull - error or success
+	 * Set a message as read by its id ($message_id + $person_id)
 	 */
-	public function send($msgVarsData, $relationmessage_id = null, $oe_kurzbz = null, $vorlage_kurzbz = null, $msgVars = null)
+	public function setMessageRead($message_id, $person_id)
 	{
-		$subject = $this->input->post('subject');
-		$body = $this->input->post('body');
+		// Checks parameters
+		if (!is_numeric($message_id) || !is_numeric($person_id)) return error('Invalid setMessageRead parameters');
 
-		$authUser = $this->getAuthUser();
+		// Loads needed models
+		$this->load->model('system/MsgStatus_model', 'MsgStatusModel');
 
-		if (isError($authUser)) return $authUser;
+		$statuResult = $this->MsgStatusModel->loadWhere(
+			array(
+				'message_id' => $message_id,
+				'person_id' => $person_id,
+				'status' => MSG_STATUS_READ
+			)
+		);
 
-		$sender_id = getData($authUser)[0]->person_id;
-
-		// Send message(s)
-		if (hasData($msgVarsData))
+		if (isError($statuResult)) return $statuResult;
+		if (!hasData($statuResult))
 		{
-			for ($i = 0; $i < count(getData($msgVarsData)); $i++)
-			{
-				$parsedText = "";
-				$msgVarsDataArray = $this->replaceKeys((array)getData($msgVarsData)[$i]); // replaces array keys
-
-				// Send without vorlage
-				if (isEmptyString($vorlage_kurzbz))
-				{
-					$parsedText = $this->messagelib->parseMessageText($body, $msgVarsDataArray);
-					$msg = $this->messagelib->sendMessage($sender_id, $msgVarsDataArray['person_id'], $subject, $parsedText, PRIORITY_NORMAL, $relationmessage_id, $oe_kurzbz);
-				}
-				// Send with vorlage
-				else
-				{
-					if (is_array($msgVars))
-					{
-						// Additional message variables
-						foreach ($msgVars as $key => $msgvar)
-						{
-							$msgVarsDataArray[$key] = $msgvar;
-						}
-					}
-					$msg = $this->messagelib->sendMessageVorlage($sender_id, $msgVarsDataArray['person_id'], $vorlage_kurzbz, $oe_kurzbz, $msgVarsDataArray);
-				}
-
-				if (isError($msg)) return $msg;
-
-				// Write log entry
-				$personLog = $this->personloglib->log(
-					$msgVarsDataArray['person_id'],
-					'Action',
-					array(
-						'name' => 'Message sent',
-						'message' => 'Message sent from person '.$sender_id.' to '.$msgVarsDataArray['person_id'].', messageid '.getData($msg),
-						'success' => 'true'
-					),
-					'kommunikation',
-					'core',
-					null,
-					getAuthUID()
-				);
-
-				if (isError($personLog)) return $personLog;
-			}
-
-			return success('Messages sent successfully');
+			// Set date used to insert
+			return $this->MsgStatusModel->insert(
+				array(
+					'message_id' => $message_id,
+					'person_id' => $person_id,
+					'status' => MSG_STATUS_READ,
+					'insertvon' => getAuthUID()
+				)
+			); // insert and return result
 		}
 		else
 		{
-			return $msgVarsData;
+			return success('Already set as read');
 		}
 	}
 
 	/**
-	 * Send a reply
+	 * Prepares data for the view system/messages/ajaxWrite
 	 */
-	public function sendReply($subject, $body, $persons, $relationmessage_id, $token)
+	public function prepareAjaxWrite()
 	{
-		$relationmsg = $this->MessageTokenModel->getMessageByToken($token);
-		if (!hasData($relationmsg) || $relationmessage_id !== getData($relationmsg)[0]->message_id)
-		{
-			show_error('Error while sending reply');
-		}
+		$ouResult = $this->PrestudentModel->getOrganisationunitsByPersonId(getAuthPersonId());
 
-		// Get sender (receiver of previous msg)
-		$sender_id = getData($relationmsg)[0]->receiver_id;
+		if (isError($ouResult)) show_error('An error occurred while loading this page, please contact the site administrator');
 
-		// Get message data of persons
-		$data = $this->MessageTokenModel->getPersonData($persons);
-		if (hasData($data))
+		$ouOptions = '<option value="0">Select...</option>';
+
+		if (hasData($ouResult))
 		{
-			for ($i = 0; $i < count(getData($data)); $i++)
+			foreach (getData($ouResult) as $ou)
 			{
-				$dataArray = (array)getData($data)[$i];
-
-				$msg = $this->messagelib->sendMessage($sender_id, $dataArray['person_id'], $subject, $body, PRIORITY_NORMAL, $relationmessage_id, null);
-				if (isError($msg)) return $msg;
-
-				// Logs person data
-				$personLog = $this->personloglib->log(
-					$sender_id,
-					'Action',
-					array(
-						'name' => 'Message sent',
-						'message' => 'Message sent from person '.$sender_id.' to '.$dataArray['person_id'].', messageid '.getData($msg),
-						'success' => 'true'
-					),
-					'kommunikation',
-					'core',
-					null,
-					'online'
+				$ouOptions .= sprintf(
+					"\n".'<option value="%s">%s</option>',
+					is_numeric($ou->prestudent_id) ? $ou->oe_kurzbz : self::ALT_OE,
+					$ou->bezeichnung . (is_numeric($ou->prestudent_id) ? '' : ' *')
 				);
-
-				// Unpark bewerber after he sends message
-				$personLog = $this->personloglib->unPark($sender_id);
-
-				if (isError($personLog)) return $personLog;
 			}
 		}
 
-		return success('Reply sent');
+		return array('organisationUnitOptions' => $ouOptions);
 	}
 
 	/**
-	 *
+	 * Prepares data for the view system/messages/ajaxWriteReply
 	 */
-	public function getAuthUser()
+	public function prepareAjaxWriteReply($token)
 	{
-		$sender_id = null;
+		if (isEmptyString($token)) show_error('The given token is not valid');
 
-		$this->load->model('person/Person_model', 'PersonModel');
-		$authUser = $this->PersonModel->getByUid(getAuthUID());
+		// Retrieves message using the given token
+		$messageResult = $this->MessageTokenModel->getMessageByToken($token);
+		if (isError($messageResult)) show_error('An error occurred while loading this page, please contact the site administrator');
 
-		if (!hasData($authUser)) $authUser = error('The current logged user person_id is not defined');
+		if (hasData($messageResult))
+		{
+			$message = getData($messageResult)[0]; // Found message data
 
-		return $authUser;
+			// Retrieves message sender information
+			$senderResult = $this->MessageTokenModel->getSenderData($message->sender_id);
+			if (isError($senderResult)) show_error('An error occurred while loading this page, please contact the site administrator');
+
+			if (hasData($senderResult))
+			{
+				$sender = getData($senderResult)[0]; // Found sender data
+
+				$replySubject = self::REPLY_SUBJECT_PREFIX.$message->subject;
+				$replyBody = $this->_getReplyBody($message->body, $sender->vorname, $sender->nachname, $message->sent);
+
+				return array (
+					'receiver' => $sender->vorname.' '.$sender->nachname, // yep! the sender of the sent message is the receiver of the reply message
+					'subject' => $replySubject,
+					'body' => $replyBody,
+					'receiver_id' => $message->sender_id,
+					'relationmessage_id' => $message->message_id,
+					'token' => $token
+				);
+			}
+		}
 	}
 
 	/**
-	 *
+	 * Prepares data for the view system/messages/ajaxRead
+	 * If everything is fine returns a list of received messages (objects)
 	 */
-	public function replaceKeys($data)
+	public function prepareAjaxReadReceived()
+	{
+		// Retrieves received messages for the logged user and its organisation units
+		$receivedMessagesResult = $this->RecipientModel->getReceivedMessages(
+			getAuthPersonId(),
+			$this->config->item(MessageLib::CFG_OU_RECEIVERS)
+		);
+		// If an error occurred return it
+		if (isError($receivedMessagesResult)) return $receivedMessagesResult;
+
+		// If data were found
+		if (hasData($receivedMessagesResult))
+		{
+			$jsonArray = array(); // array that contains all the received messages
+
+			// Collect'em all in the array $jsonArray
+			foreach (getData($receivedMessagesResult) as $receivedMessage)
+			{
+				$jsonRecord = new stdClass();
+				$jsonRecord->message_id = $receivedMessage->message_id;
+				$jsonRecord->subject = $receivedMessage->subject;
+				$jsonRecord->body = $receivedMessage->body;
+				$jsonRecord->from = $receivedMessage->vorname.' '.$receivedMessage->nachname;
+				$sentDate = new DateTime($receivedMessage->sent);
+				$jsonRecord->sent = $sentDate->format('d/m/Y H:i:s');
+				$jsonRecord->status = $receivedMessage->status;
+				$jsonRecord->statusPersonId = $receivedMessage->statuspersonid;
+				$jsonRecord->token = $receivedMessage->token;
+
+				$jsonArray[] = $jsonRecord;
+			}
+
+			return success(json_encode($jsonArray)); // return as an json encoded string
+		}
+
+		return success('No messages were found'); // NOT a blocking error
+	}
+
+	/**
+	 * Prepares data for the view system/messages/ajaxRead
+	 * If everything is fine returns a list of sent messages (objects)
+	 */
+	public function prepareAjaxReadSent()
+	{
+		// Retrieves sent messages from the logged user
+		$sentMessagesResult = $this->RecipientModel->getSentMessages(getAuthPersonId());
+		if (isError($sentMessagesResult)) return $sentMessagesResult; // If an error occurred return it
+
+		if (hasData($sentMessagesResult))
+		{
+			$jsonArray = array();// array that contains all the sent messages
+
+			// Collect'em all in the array $jsonArray
+			foreach (getData($sentMessagesResult) as $sentMessage)
+			{
+				$jsonRecord = new stdClass();
+				$jsonRecord->message_id = $sentMessage->message_id;
+				$jsonRecord->subject = $sentMessage->subject;
+				$jsonRecord->body = $sentMessage->body;
+				$sentDate = new DateTime($sentMessage->sent);
+				$jsonRecord->sent = $sentDate->format('d/m/Y H:i:s');
+				$jsonRecord->status = $sentMessage->status;
+				$jsonRecord->statusPersonId = $sentMessage->statuspersonid;
+				$jsonRecord->token = $sentMessage->token;
+
+				if ($sentMessage->person_id == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID))
+				{
+					$jsonRecord->to = $sentMessage->oe;
+				}
+				else
+				{
+					$jsonRecord->to = $sentMessage->vorname.' '.$sentMessage->nachname;
+				}
+
+				$jsonArray[] = $jsonRecord;
+			}
+
+			return success(json_encode($jsonArray)); // return as an json encoded string
+		}
+
+		return success('No messages were found'); // NOT a blocking error
+	}
+
+	/**
+	 * Prepares data for the view system/messages/htmlRead using a token that identifies a single message
+	 */
+	public function prepareHtmlRead($token)
+	{
+		if (isEmptyString($token)) show_error('The given token is not valid');
+
+		// Retrieves message using the given token
+		$messageResult = $this->MessageTokenModel->getMessageByToken($token);
+		if (isError($messageResult)) show_error(getError($messageResult));
+		if (!hasData($messageResult)) show_error('No message found with the given token');
+
+		$message = getData($messageResult)[0]; // Found message data
+
+		// Set message as read
+		$srmsbtResult = $this->MessageTokenModel->setReadMessageStatusByToken($token);
+		if (isError($srmsbtResult)) show_error(getError($srmsbtResult));
+
+		// Retrieves message sender information
+		$senderResult = $this->MessageTokenModel->getSenderData($message->sender_id);
+		if (isError($senderResult)) show_error(getError($senderResult));
+		if (!hasData($senderResult)) show_error('No sender information found');
+
+		$sender = getData($senderResult)[0]; // Found sender data
+
+		// Check if the receiver is an employee
+		$isEmployee = false; // not by default
+		$isEmployeeResult = $this->MessageTokenModel->isEmployee($message->receiver_id);
+		if (isError($isEmployeeResult)) show_error(getError($isEmployeeResult));
+		if (hasData($isEmployeeResult)) $isEmployee = true;
+
+		// If the sender is not an employee and are present configurations to reply
+		$hrefReply = '';
+		if (!$isEmployee && !isEmptyString($this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL)))
+		{
+			$hrefReply = $this->config->item(MessageLib::CFG_MESSAGE_SERVER).
+				$this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL).
+				$token;
+		}
+
+		return array (
+			'sender' => $sender,
+			'message' => $message,
+			'hrefReply' => $hrefReply
+		);
+	}
+
+	/**
+	 * Prepares data for the view system/messages/htmlWriteReply using a token that identifies a single message
+	 */
+	public function prepareHtmlWriteReply($token)
+	{
+		if (isEmptyString($token)) show_error('The given token is not valid');
+
+		// Retrieves message using the given token
+		$messageResult = $this->MessageTokenModel->getMessageByToken($token);
+		if (isError($messageResult)) show_error(getError($messageResult));
+		if (!hasData($messageResult)) show_error('No message found with the given token');
+
+		$message = getData($messageResult)[0]; // Found message data
+
+		// Retrieves message sender information
+		$senderResult = $this->MessageTokenModel->getSenderData($message->sender_id);
+		if (isError($senderResult)) show_error(getError($senderResult));
+		if (!hasData($senderResult)) show_error('No sender information found');
+
+		$sender = getData($senderResult)[0]; // Found sender data
+
+		$replySubject = self::REPLY_SUBJECT_PREFIX.$message->subject;
+		$replyBody = $this->_getReplyBody($message->body, $sender->vorname, $sender->nachname, $message->sent);
+
+		return array (
+			'receiver' => $sender->vorname.' '.$sender->nachname, // yep! the sender of the sent message is the receiver of the reply message
+			'subject' => $replySubject,
+			'body' => $replyBody,
+			'receiver_id' => $message->sender_id,
+			'relationmessage_id' => $message->message_id,
+			'token' => $token
+		);
+	}
+
+	/**
+	 * Prepares data for the view system/messages/htmlWriteTemplate using person ids as main parameter
+	 * Wrap method to _prepareHtmlWriteTemplate
+	 */
+	public function prepareHtmlWriteTemplatePersons($persons, $message_id = null, $recipient_id = null)
+	{
+		// Retrieves persons information
+		$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($persons);
+
+		return $this->_prepareHtmlWriteTemplate($msgVarsData, $message_id, $recipient_id);
+	}
+
+	/**
+	 * Prepares data for the view system/messages/htmlWriteTemplate using prestudent ids as main parameter
+	 * Wrap method to _prepareHtmlWriteTemplate
+	 */
+	public function prepareHtmlWriteTemplatePrestudents($prestudents, $message_id = null, $recipient_id = null)
+	{
+		// Retrieves prestudents information
+		$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
+
+		return $this->_prepareHtmlWriteTemplate($msgVarsData, $message_id, $recipient_id);
+	}
+
+	/**
+	 * Sends a new message or a reply to a message (if $relationmessage_id is given)
+	 * using the template stored in the subject and body
+	 */
+	public function sendImplicitTemplate($type, $recipients_ids, $subject, $body, $relationmessage_id = null)
+	{
+		// Retrieves the sender id
+		$sender_id = getAuthPersonId();
+		if (!is_numeric($sender_id)) show_error('The current logged user person_id is not defined');
+
+		$msgVarsData = error('No persons nor prestudents were provided');
+		// Retrieves message vars data for the given user/s
+		if ($type == self::TYPE_PERSONS) // if persons were given
+		{
+			$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($recipients_ids);
+		}
+		elseif ($type == self::TYPE_PRESTUDENTS) // otherwise prestudents were given
+		{
+			$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($recipients_ids);
+
+			// Retrieve organisation unit for the recipients
+			$organisationUnitsResult = $this->PrestudentModel->getOrganisationunits($recipients_ids);
+			if (isError($organisationUnitsResult)) return $organisationUnitsResult;
+			if (hasData($organisationUnitsResult)) $senderOUArray = getData($organisationUnitsResult);
+		}
+		if (isError($msgVarsData)) show_error(getError($msgVarsData));
+		if (!hasData($msgVarsData)) show_error('No recipients were given');
+
+		$senderOU = null; // sender organisation unit only for presetudents
+		$receiversCounter = 0; // a counter
+
+		// Looping on receivers data
+		foreach (getData($msgVarsData) as $receiver)
+		{
+			$msgVarsDataArray = $this->_lowerReplaceSpaceArrayKeys((array)$receiver); // replaces array keys
+			$parsedSubject = parseText($subject, $msgVarsDataArray);
+			$parsedBody = parseText($body, $msgVarsDataArray);
+
+			// If exist an organisation unit for this prestudent and it is valid
+			if (isset($senderOUArray[$receiversCounter])
+				&& isset($senderOUArray[$receiversCounter]->oe_kurzbz)
+				&& !isEmptyString($senderOUArray[$receiversCounter]->oe_kurzbz))
+			{
+				$senderOU = $senderOUArray[$receiversCounter]->oe_kurzbz;
+			}
+			else
+			{
+				$senderOU = null;
+			}
+
+			$message = $this->messagelib->sendMessageUser(
+				$msgVarsDataArray['person_id'],	// receiverPersonId
+				$parsedSubject,					// subject
+				$parsedBody,					// body
+				$sender_id,						// sender_id
+				$senderOU,						// senderOU
+				$relationmessage_id,			// relationmessage_id
+				MSG_PRIORITY_NORMAL				// priority
+			);
+
+			if (isError($message)) return $message;
+			if (!hasData($message)) return error('No messages were saved in database');
+
+			// Write log entry only if persons were given
+			if ($type == self::TYPE_PERSONS)
+			{
+				$personLog = $this->_personLog($sender_id, $msgVarsDataArray['person_id'], getData($message)[0]);
+				if (isError($personLog)) return $personLog;
+			}
+
+			$receiversCounter++; // increment the counter
+		}
+
+		return success('Messages sent successfully');
+	}
+
+	/**
+	 * Sends a new message using the given template and information present in parameter prestudents
+	 * Extra variables can be added using parameter $msgVars
+	 */
+	public function sendExplicitTemplate($prestudents, $oe_kurzbz, $vorlage_kurzbz, $msgVars)
+	{
+		// Retrieves the sender id
+		$sender_id = getAuthPersonId();
+		if (!is_numeric($sender_id)) show_error('The current logged user person_id is not defined');
+
+		// Retrieves message vars data for the given user/s
+		$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
+		if (isError($msgVarsData)) show_error(getError($msgVarsData));
+		if (!hasData($msgVarsData)) show_error('No recipients were given');
+
+		$prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
+
+		// Adds the organisation unit to each prestudent
+		if (isEmptyString($oe_kurzbz) && hasData($msgVarsData) && hasData($prestudentsData))
+		{
+			$this->CLMessagesModel->_addOeToPrestudents($msgVarsData, $prestudentsData);
+		}
+
+		foreach (getData($msgVarsData) as $receiver)
+		{
+			$msgVarsDataArray = $this->_lowerReplaceSpaceArrayKeys((array)$receiver); // replaces array keys
+
+			// Additional message variables
+			if (is_array($msgVars)) $msgVarsDataArray = array_merge($msgVarsDataArray, $msgVars);
+
+			$message = $this->messagelib->sendMessageUserTemplate(
+				$msgVarsDataArray['person_id'],			// receiversPersonId
+				$vorlage_kurzbz,						// vorlage
+				$msgVarsDataArray,						// parseData
+				null,									// orgform
+				$sender_id,								// sender_id
+				$oe_kurzbz								// senderOU
+			);
+
+			if (isError($message)) return $message;
+
+			// Write log entry
+			$personLog = $this->_personLog($sender_id, $msgVarsDataArray['person_id'], getData($message)[0]);
+			if (isError($personLog)) return $personLog;
+		}
+
+		return success('Messages sent successfully');
+	}
+
+	/**
+	 * Send a reply to a single recipient for a message identified by a token (no templates are used)
+	 * NOTE: this method could be also called from not authenticated controllers
+	 */
+	public function sendReply($receiver_id, $subject, $body, $relationmessage_id, $token)
+	{
+		// Retrieves message sender information
+		$senderResult = $this->MessageTokenModel->getSenderData($receiver_id);
+		if (isError($senderResult)) show_error(getError($senderResult));
+		if (!hasData($senderResult)) show_error('No sender information found');
+
+		$sender = getData($senderResult)[0]; // Found sender data
+
+		$messageResult = $this->MessageTokenModel->getMessageByToken($token);
+		if (isError($messageResult)) show_error(getError($messageResult));
+		// Security check! It is possible to reply only to a received message!!
+		if (!hasData($messageResult) || $relationmessage_id != getData($messageResult)[0]->message_id)
+		{
+			show_error('An error occurred while sending your message, please contact the site administrator');
+		}
+
+		// If the user is logged then use its person id as sender id, otherwise get the receiver id of the previous message
+		$sender_id = isLogged() ? getAuthPersonId() : getData($messageResult)[0]->receiver_id;
+		if (!is_numeric($sender_id)) return error('The sender id is not valid');
+
+		$message = $this->messagelib->sendMessageUser(
+			$receiver_id,			// receiverPersonId
+			$subject,				// subject
+			$body,					// body
+			$sender_id,				// sender_id, the receiver of the previous message is the sender of the current one
+			null,					// senderOU
+			$relationmessage_id,	// relationmessage_id
+			MSG_PRIORITY_NORMAL		// priority
+		);
+
+		if (isError($message)) return $message;
+		if (!hasData($message)) return error('No messages were saved in database');
+
+		// Write log entry
+		// NOTE: $receiver_id and $sender_id are switched!!! Currently this is a workaround
+		$personLog = $this->_personLog($receiver_id, $sender_id, getData($message)[0]);
+		if (isError($personLog)) return $personLog;
+
+		return success('Messages sent successfully');
+	}
+
+	/**
+	 * Send a message to an organisation unit
+	 */
+	public function sendToOrganisationUnit($receiverOU, $subject, $body)
+	{
+		if (isEmptyString($receiverOU)) return error('Not a valid organisation unit');
+		if (isEmptyString($subject)) return error('Subject is an empty string');
+		if (isEmptyString($body)) return error('Body is an empty string');
+
+		$sender_id = getAuthPersonId();
+		if (!is_numeric($sender_id)) return error('The current logged user person_id is not defined');
+
+		$message = $this->messagelib->sendMessageOU(
+			$receiverOU,			// receiverPersonId
+			$subject,				// subject
+			$body,					// body
+			$sender_id				// sender_id
+		);
+
+		if (isError($message)) return $message;
+		if (!hasData($message)) return error('No messages were saved in database');
+
+		// Write log entry
+		$personLog = $this->_personLog($sender_id, $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID), getData($message)[0], $receiverOU);
+		if (isError($personLog)) return $personLog;
+
+		return success('Messages sent successfully');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods called by controller system/messages/Messages
+
+	/**
+	 * Returns an object that represent a template store in database
+	 * If no templates are found with the given parameter or the given parameter is an empty string,
+	 * then an error is returned
+	 */
+	public function getVorlage($vorlage_kurzbz)
+	{
+		$getVorlage = error('The given vorlage_kurzbz is not valid');
+
+		if (!isEmptyString($vorlage_kurzbz))
+		{
+			$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+			$this->VorlagestudiengangModel->addOrder('version','DESC');
+
+			$getVorlage = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
+		}
+
+		return $getVorlage;
+	}
+
+	/**
+	 * Parse the given given text using data from the given user
+	 * Use the CI parser which performs simple text substitution for pseudo-variable
+	 */
+	public function parseMessageTextPerson($person_id, $text)
+	{
+		$parseMessageText = error('The given person_id is not a valid number');
+
+		if (is_numeric($person_id)) $parseMessageText = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+
+		if (hasData($parseMessageText))
+		{
+			$parseMessageText = success(
+				parseText(
+					$text,
+					$this->_lowerReplaceSpaceArrayKeys((array)getData($parseMessageText)[0])
+				)
+			);
+		}
+
+		return $parseMessageText;
+	}
+
+	/**
+	 * Parse the given given text using data from the given user
+	 * Use the CI parser which performs simple text substitution for pseudo-variable
+	 */
+	public function parseMessageTextPrestudent($prestudent_id, $text)
+	{
+		$parseMessageText = error('The given prestudent_id is not a valid number');
+
+		if (is_numeric($prestudent_id)) $parseMessageText = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+
+		if (hasData($parseMessageText))
+		{
+			$parseMessageText = success(
+				parseText(
+					$text,
+					$this->_lowerReplaceSpaceArrayKeys((array)getData($parseMessageText)[0])
+				)
+			);
+		}
+
+		return $parseMessageText;
+	}
+
+	/**
+	 * Outputs message data for a message (identified my msg id and receiver id) in JSON format
+	 */
+	public function getMessageFromIds($message_id, $receiver_id)
+	{
+		$getMessageFromIds = error('The given message id or receiver id are not valid');
+
+		if (is_numeric($message_id) && is_numeric($receiver_id))
+		{
+			$getMessageFromIds = $this->messagelib->getMessage($message_id, $receiver_id);
+		}
+
+		if (isError($getMessageFromIds) || !hasData($getMessageFromIds))
+		{
+			return array();
+		}
+		else
+		{
+			return array(getData($getMessageFromIds)[0]);
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Replaces data array keys to a lowercase string with underscores instead of spaces
+	 */
+	private function _lowerReplaceSpaceArrayKeys($data)
 	{
 		$tmpData = array();
 
-		// Replaces data array keys to a lowercase without spaces string
 		foreach ($data as $key => $val)
 		{
 			$tmpData[str_replace(' ', '_', strtolower($key))] = $val;
@@ -176,9 +657,9 @@ class Messages_model extends CI_Model
 	}
 
 	/**
-	 *
+	 * Add organisation unit to an array of prestudents (objects)
 	 */
-	public function addOeToPrestudents(&$msgVarsData, $prestudentsData)
+	private function _addOeToPrestudents(&$msgVarsData, $prestudentsData)
 	{
 		for ($i = 0; $i < count(getData($msgVarsData)); $i++)
 		{
@@ -192,4 +673,171 @@ class Messages_model extends CI_Model
 			}
 		}
 	}
+
+	/**
+	 * Perform a person log after a message is sent
+	 */
+	private function _personLog($sender_id, $receiver_id, $message_id, $receiverOU = null)
+	{
+		// In case the message is accessed via ViewMessage controller -> no authentication
+		// If no authentication is performed then use a hard coded uid
+		$loggedUserUID = isLogged() ? getAuthUID() : self::NO_AUTH_UID;
+
+		$message = 'Message sent from person '.$sender_id.' to '.$receiver_id.', message id: '.$message_id;
+		if (!isEmptyString($receiverOU)) $message .= ', receiverOU: '.$receiverOU;
+
+		return $this->personloglib->log(
+			$receiver_id,
+			'Action',
+			array(
+				'name' => 'Message sent',
+				'message' => $message,
+				'success' => 'true'
+			),
+			'kommunikation',
+			'core',
+			null,
+			$loggedUserUID
+		);
+	}
+
+	/**
+	 * Quotes the previous message body
+	 */
+	private function _getReplyBody($body, $receiverName, $receiverSurname, $sentDate)
+	{
+		return sprintf(
+			self::REPLY_BODY_FORMAT,
+			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
+		);
+	}
+
+	/**
+	 * Prepares data for the view system/messages/htmlWriteTemplate using the given parameters
+	 */
+	private function _prepareHtmlWriteTemplate($info, $message_id, $recipient_id)
+	{
+		// Checks that info parameter is valid
+		if (isError($info)) show_error(getError($info));
+		if (!hasData($info)) show_error('No recipients were given');
+
+		// If the message id and recipient id are given, then both they must be valid numbers
+		if ((is_numeric($message_id) && !is_numeric($recipient_id))
+			|| (!is_numeric($message_id) && is_numeric($recipient_id)))
+		{
+			show_error('If given, message id and recipient id both must be valid numbers');
+		}
+
+		// ---------------------------------------------------------------------------------------
+		// Retrieves the recipients information and builds:
+		// - recipientsArray: an array that contains objects with id (person_id) and description (Vorname + Nachname) of recipient
+		// - recipientsList: a string that contains all the recipients descriptions (Vorname + Nachname) separated by ;
+		// - persons: a string that contains HTML input hidden with alla the receivers id (person_id)
+		$recipientsArray = array();
+		$recipientsList = '';
+		$recipients_ids = '';
+
+		foreach (getData($info) as $receiver)
+		{
+			$id = 0;
+			$recipient = new stdClass();
+			$recipient->description = $receiver->Vorname.' '.$receiver->Nachname;
+			$recipientsList .= $receiver->Vorname.' '.$receiver->Nachname.'; ';
+
+			// If it is a prestudent then
+			if (isset($receiver->prestudent_id) && is_numeric($receiver->prestudent_id))
+			{
+				$recipient->id = $receiver->prestudent_id;
+				$id = $receiver->prestudent_id;
+			}
+			else // otherwise it is a person
+			{
+				$recipient->id = $receiver->person_id;
+				$id = $receiver->person_id;
+			}
+
+			$recipients_ids .= '<input type="hidden" name="recipients_ids[]" value="'.$id.'">'."\n";
+
+			$recipientsArray[] = $recipient;
+		}
+
+		// ---------------------------------------------------------------------------------------
+		// Retrieves the message to reply to, if it is specified by parameters $message_id and $recipient_id
+		$replySubject = ''; // message reply subject
+		$replyBody = ''; // message reply body
+		$relationmessage = ''; // input hidden that contains the message id to be replied to
+		// If both are given and they are valid
+		if (is_numeric($message_id) && is_numeric($recipient_id))
+		{
+			// Retrieves a received message from tbl_msg_recipient
+			$messageResult = $this->messagelib->getMessage($message_id, $recipient_id);
+			if (isError($messageResult)) show_error(getError($messageResult));
+			if (!hasData($messageResult)) show_error('The selected message does not exist');
+
+			$message = getData($messageResult)[0];
+
+			$replySubject = self::REPLY_SUBJECT_PREFIX.$message->subject;
+			$replyBody = $this->_getReplyBody($message->body, $receiver->Vorname, $receiver->Nachname, $message->sent);
+			$relationmessage = '<input type="hidden" name="relationmessage_id" value="'.$message_id.'">';
+		}
+
+		// ---------------------------------------------------------------------------------------
+		// Retrieves message vars from database view vw_msg_vars/vw_msg_vars_person
+		$variablesResult = null;
+		$type = '';
+
+		// If data contains a prestudent id
+		// NOTE:
+		// - info is checked at the beginning of this method so it is safe to use getData($info)[0]
+		// - the provided data inside info are all persons or all prestudents, so it is safe to check only the first one
+		if (isset(getData($info)[0]->prestudent_id) && is_numeric(getData($info)[0]->prestudent_id))
+		{
+			$variablesResult = $this->messagelib->getMessageVarsPrestudent();
+			$type = '<input type="hidden" id="type" name="type" value="'.self::TYPE_PRESTUDENTS.'">';
+		}
+		else
+		{
+			$variablesResult = $this->messagelib->getMessageVarsPerson();
+			$type = '<input type="hidden" id="type" name="type" value="'.self::TYPE_PERSONS.'">';
+		}
+		if (isError($variablesResult)) show_error(getError($variablesResult));
+
+		// Then builds an array that contains objects with id (person_id) and description (Vorname + Nachname) of recipient
+		$variables = array();
+		foreach (getData($variablesResult) as $id => $description)
+		{
+			$tmpVar = new stdClass();
+			$tmpVar->id = $id;
+			$tmpVar->description = $description;
+
+			$variables[] = $tmpVar;
+		}
+
+		// ---------------------------------------------------------------------------------------
+		// Retrieves the sender id
+		$sender_id = getAuthPersonId();
+		if (!is_numeric($sender_id)) show_error('The current logged user person_id is not defined');
+
+		// ---------------------------------------------------------------------------------------
+ 		// Organisation units and a boolean (true if the sender is administrator) are used to get the templates
+		$organisationUnits = $this->messagelib->getOeKurzbz($sender_id);
+		if (isError($organisationUnits)) show_error(getError($organisationUnits));
+		$senderIsAdmin = $this->BenutzerrolleModel->isAdminByPersonId($sender_id);
+		if (isError($senderIsAdmin)) show_error(getError($senderIsAdmin));
+
+		// ---------------------------------------------------------------------------------------
+		// Returns data as an array
+		return array (
+			'recipientsList' => $recipientsList,
+			'subject' => $replySubject,
+			'body' => $replyBody,
+			'variables' => $variables,
+			'organisationUnits' => getData($organisationUnits),
+			'senderIsAdmin' => getData($senderIsAdmin),
+			'recipientsArray' => $recipientsArray,
+			'recipients_ids' => $recipients_ids,
+			'relationmessage_id' => $relationmessage,
+			'type' => $type
+		);
+	}
 }
diff --git a/application/models/accounting/Konto_model.php b/application/models/accounting/Konto_model.php
index d76b2bd46..cbd7a6f2d 100644
--- a/application/models/accounting/Konto_model.php
+++ b/application/models/accounting/Konto_model.php
@@ -22,8 +22,7 @@ class Konto_model extends DB_Model
 		$this->addJoin('wawi.tbl_konto_kostenstelle', 'konto_id');
 		$konten = $this->loadWhere(array('kostenstelle_id' => $kostenstelle_id));
 
-		if ($konten->error)
-			return error($konten->retval);
+		if ($konten->error) return $konten;
 
 		return $konten;
 	}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 44b8a0881..8725cd98d 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -60,14 +60,14 @@ class Vertrag_model extends DB_Model
         {
             if ($this->LehreinheitmitarbeiterModel->hasVertrag($mitarbeiter_uid, $lehreinheit_id))
             {
-                return success(null);   // Exit if Lehrauftrag already has Vertrag
+            	return error('Lehrauftrag existiert bereits');	// Exit if Lehrauftrag already has Vertrag
             }
         }
         elseif ($vertragstyp_kurzbz == 'Betreuung')
         {
             if ($this->ProjektbetreuerModel->hasVertrag($person_id, $projektarbeit_id))
             {
-                return success(null);   // Exit if Projektbetreuung already has Vertrag
+                return error('Lehrauftrag existiert bereits');   // Exit if Projektbetreuung already has Vertrag
             }
         }
 
diff --git a/application/models/accounting/Vertragvertragsstatus_model.php b/application/models/accounting/Vertragvertragsstatus_model.php
index c2bd9cc7d..609394321 100644
--- a/application/models/accounting/Vertragvertragsstatus_model.php
+++ b/application/models/accounting/Vertragvertragsstatus_model.php
@@ -52,19 +52,21 @@ class Vertragvertragsstatus_model extends DB_Model
 
     /**
      * Set Vertragsstatus for the given Vertrag and Mitarbeiter.
-     * @param $vertrag_id
-     * @param $vertragsstatus_kurzbz
-     * @param $mitarbeiter_uid
-     * @return array|null           On success object, retval is true. Null if status already exist for this vertrag.
+     * @param integer $vertrag_id
+	 * @param string $mitarbeiter_uid
+     * @param string $vertragsstatus_kurzbz
+     * @return object	On success, return success object.
+	 * 					If status already exists or earlier status is missing, return error object.
      */
     public function setStatus($vertrag_id, $mitarbeiter_uid, $vertragsstatus_kurzbz){
 
         // Check if vertrag has already this status
         $result = $this->hasStatus($vertrag_id, $mitarbeiter_uid, $vertragsstatus_kurzbz);
-
+        
+		// If status is already set, return error message
         if (hasData($result))
         {
-            return success(null); // return null if status is already set
+            return error('Fehler: Status bereits vorhanden.');
         }
 
         // If new status should be 'akzeptiert', the latest status has to be 'erteilt'
@@ -72,10 +74,11 @@ class Vertragvertragsstatus_model extends DB_Model
         {
             $result = $this->getLastStatus($vertrag_id, $mitarbeiter_uid);
             $last_status = getData($result)[0]->vertragsstatus_kurzbz;
-
+	
+			// If latest status is not 'erteilt', return error message
             if ($last_status != 'erteilt')
             {
-                return success(null); // return null if latest status is not 'erteilt'
+                return error('Fehler: Vor Status \'angenommen\' muss erst Status \'erteilt\' gesetzt sein.');
             }
         }
 
diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php
index 20f942865..707e8af36 100644
--- a/application/models/codex/Bisverwendung_model.php
+++ b/application/models/codex/Bisverwendung_model.php
@@ -15,7 +15,7 @@ class Bisverwendung_model extends DB_Model
     /**
      * Get latest (active) Verwendung of the user.
      * @param string $uid
-     * @param bool $active If false, returns latest Verwendung no matter if actual or not (ignores ending/beginning date).
+     * @param bool $active If false, returns latest Verwendung no matter if it is still actual.
      * @return array
      */
 	public function getLast($uid, $active = true)
@@ -28,14 +28,14 @@ class Bisverwendung_model extends DB_Model
                 mitarbeiter_uid = '. $this->escape($uid). '
                 AND ( beginn <= NOW() OR beginn IS NULL )
                 AND ( ende >= NOW() OR ende IS NULL )
-                ORDER BY ende DESC NULLS LAST, beginn DESC NULLS LAST
+                ORDER BY ende DESC NULLS FIRST, beginn DESC NULLS LAST
             ';
         }
         else
         {
             $condition =  '
                 mitarbeiter_uid = '. $this->escape($uid). '
-                ORDER BY ende DESC NULLS LAST, beginn DESC NULLS LAST
+                ORDER BY ende DESC NULLS FIRST, beginn DESC NULLS LAST
             ';
         }
 
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index b30e175c3..fe9db5330 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -186,8 +186,7 @@ class Akte_model extends DB_Model
 
 		$dokumente = $this->loadWhere($where);
 
-		if($dokumente->error)
-			return error($dokumente->retval);
+		if($dokumente->error) return $dokumente;
 
 		return success($dokumente->retval);
 	}
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 32673d10d..b40897d82 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -214,7 +214,7 @@ class Prestudent_model extends DB_Model
 
 		if ($lastStatus->error)
 		{
-			return error($lastStatus->retval);
+			return $lastStatus;
 		}
 
 		if (count($lastStatus->retval) > 0)
@@ -222,7 +222,7 @@ class Prestudent_model extends DB_Model
 			//get Studiengangname from Studienplan and -ordnung
 			$studienordnung = $this->PrestudentstatusModel->getStudienordnungFromPrestudent($prestudent_id);
 			if ($studienordnung->error)
-				return error($studienordnung->retval);
+				return $studienordnung;
 
 			if (count($studienordnung->retval) > 0)
 			{
@@ -239,7 +239,7 @@ class Prestudent_model extends DB_Model
 			$language = $this->SpracheModel->load($lastStatus->retval[0]->sprache);
 
 			if ($language->error)
-				return error($language->retval);
+				return $language;
 
 			if (count($language->retval) > 0)
 				$lastStatus->retval[0]->sprachedetails = $language->retval[0];
@@ -257,7 +257,7 @@ class Prestudent_model extends DB_Model
 				)
 			);
 			if ($bewerbungstermin->error)
-				return error($bewerbungstermin->retval);
+				return $bewerbungstermin;
 
 			if (count($bewerbungstermin->retval) > 0)
 			{
@@ -521,4 +521,35 @@ class Prestudent_model extends DB_Model
 			}
 		}
 	}
+
+	/**
+	 * Get organisation units for all the prestudents of a person
+	 */
+	public function getOrganisationunitsByPersonId($person_id)
+	{
+		$query = 'SELECT o.oe_kurzbz,
+						o.bezeichnung,
+						(CASE
+							WHEN sg.typ = \'b\' THEN ps.prestudent_id
+							WHEN sg.typ = \'m\' THEN p.prestudent_id
+            				ELSE NULL
+       					END) AS prestudent_id
+					FROM public.tbl_prestudent p
+			  		JOIN public.tbl_studiengang sg USING(studiengang_kz)
+					JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+			   LEFT JOIN (
+				   			SELECT prestudent_id
+							  FROM public.tbl_prestudentstatus
+							 WHERE status_kurzbz = \'Bewerber\'
+						) ps USING(prestudent_id)
+				   WHERE p.person_id = ?
+				GROUP BY o.oe_kurzbz,
+						o.bezeichnung,
+						sg.typ,
+						ps.prestudent_id,
+						p.prestudent_id
+				ORDER BY o.bezeichnung';
+
+		return $this->execQuery($query, array($person_id));
+	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 719ddf884..d579037e1 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -123,7 +123,7 @@ class Prestudentstatus_model extends DB_Model
 
 		if ($lastStatus->error)
 		{
-			return error($lastStatus->retval);
+			return $lastStatus;
 		}
 
 		if (count($lastStatus->retval) > 0)
@@ -158,7 +158,7 @@ class Prestudentstatus_model extends DB_Model
 
 		if ($lastStatus->error)
 		{
-			return error($lastStatus->retval);
+			return $lastStatus;
 		}
 
 		if (count($lastStatus->retval) > 0)
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 1235769ac..4941ba9bd 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -65,7 +65,7 @@ class Lehrveranstaltung_model extends DB_Model
 				$result = $this->StudiensemesterModel->getAusbildungssemesterByStudiensemesterAndStudiengang($studiensemester_kurzbz, $studiengang_kz_item);
 
 				if (isError($result))
-					return error($result->retval);
+					return error(getError($result));
 
 				foreach ($result->retval as $semester)
 				{
@@ -104,7 +104,7 @@ class Lehrveranstaltung_model extends DB_Model
 
 		if (count($studiengang_kz_arr) > 0)
 			$query .= " AND tbl_lehrveranstaltung.studiengang_kz IN (". implode(", ", $studiengang_kz_arr).")";
-		
+
 		if (count($lehrveranstaltung_id_arr) > 0)
 		{
 			$query .= " AND tbl_lehrveranstaltung.lehrveranstaltung_id IN (". implode(', ', $lehrveranstaltung_id_arr).")";
@@ -144,7 +144,7 @@ class Lehrveranstaltung_model extends DB_Model
 		WHERE
 			vw_student_lehrveranstaltung.studiensemester_kurzbz=?
 		AND
-			vw_student_lehrveranstaltung.lehrveranstaltung_id=? 
+			vw_student_lehrveranstaltung.lehrveranstaltung_id=?
 		ORDER BY nachname, vorname, person_id, tbl_bisio.bis DESC";
 
 		return $this->execQuery($query, array($studiensemester_kurzbz, $lehrveranstaltung_id));
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index dc5b95779..a21811bb4 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -18,4 +18,19 @@ class Benutzer_model extends DB_Model
 		return $this->loadWhere(array('person_id' => $person_id, 'aktiv' => true));
 	}
 
+	/**
+	 *
+	 */
+	public function getActiveUserByPersonIdAndOrganisationUnit($person_id, $oe_kurzbz)
+	{
+		$sql = 'SELECT b.uid
+				  FROM public.tbl_benutzer b
+				  JOIN public.tbl_prestudent ps USING (person_id)
+				  JOIN public.tbl_studiengang sg USING (studiengang_kz)
+				 WHERE ps.person_id = ?
+				   AND sg.oe_kurzbz = ?
+				   AND b.aktiv = TRUE';
+
+		return $this->execQuery($sql, array($person_id, $oe_kurzbz));
+	}
 }
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
index ceb427687..fb9b51c1a 100644
--- a/application/models/person/Benutzerfunktion_model.php
+++ b/application/models/person/Benutzerfunktion_model.php
@@ -11,16 +11,20 @@ class Benutzerfunktion_model extends DB_Model
 		$this->dbTable = 'public.tbl_benutzerfunktion';
 		$this->pk = 'benutzerfunktion_id';
 	}
-	
+
 	/**
 	 * Get the Benutzerfunktion using the person_id
 	 */
-	public function getByPersonId($person_id)
+	public function getActiveFunctionsByPersonId($person_id)
 	{
-		// Join with the table 
-		$this->addJoin('public.tbl_benutzer', 'uid');
-		
-		return $this->loadWhere(array('person_id' => $person_id));
+		$query = 'SELECT bf.*
+					FROM public.tbl_benutzerfunktion bf
+					JOIN public.tbl_benutzer b USING (uid)
+            WHERE b.person_id = ?
+              AND (bf.datum_von IS NULL OR bf.datum_von <= now())
+              AND (bf.datum_bis IS NULL OR bf.datum_bis >= now())';
+
+        return $this->execQuery($query, array($person_id));
 	}
 
 	/**
diff --git a/application/models/person/Kontakt_model.php b/application/models/person/Kontakt_model.php
index 88a44cbc8..3f27604e8 100644
--- a/application/models/person/Kontakt_model.php
+++ b/application/models/person/Kontakt_model.php
@@ -8,17 +8,17 @@ class Kontakt_model extends DB_Model
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable = "public.tbl_kontakt";
-		$this->pk = "kontakt_id";
+		$this->dbTable = 'public.tbl_kontakt';
+		$this->pk = 'kontakt_id';
 	}
-	
+
 	public function getWholeKontakt($kontakt_id, $person_id = null, $kontakttyp = null)
     {
 		$result = null;
-		
-		$this->addJoin("public.tbl_standort", "standort_id", "LEFT");
-		$this->addJoin("public.tbl_firma", "firma_id", "LEFT");
-		
+
+		$this->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+
 		if (isset($kontakt_id))
 		{
 			$result = $this->load($kontakt_id);
@@ -26,22 +26,37 @@ class Kontakt_model extends DB_Model
 		else
 		{
 			$parametersArray = array();
-			
+
 			if (!is_null($person_id))
 			{
-				$parametersArray["person_id"] = $person_id;
+				$parametersArray['person_id'] = $person_id;
 			}
 			if (!is_null($kontakttyp))
 			{
-				$parametersArray["kontakttyp"] = $kontakttyp;
+				$parametersArray['kontakttyp'] = $kontakttyp;
 			}
-			
+
 			if (count($parametersArray) > 0)
 			{
 				$result = $this->loadWhere($parametersArray);
 			}
 		}
-		
+
 		return $result;
     }
-}
\ No newline at end of file
+
+	/**
+	 *
+	 */
+	public function getContactByPersonId($person_id, $kontakttyp)
+	{
+		$sql = 'SELECT kontakt
+				  FROM public.tbl_kontakt
+				 WHERE zustellung = TRUE
+				   AND person_id = ?
+				   AND kontakttyp = ?
+			  ORDER BY updateamum, insertamum';
+
+		return $this->execQuery($sql, array($person_id, $kontakttyp));
+	}
+}
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 1291427b6..d8ddb381c 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -158,8 +158,7 @@ class Person_model extends DB_Model
 
 		$person = $this->load($person_id);
 
-		if($person->error)
-			return error($person->retval);
+		if($person->error) return $person;
 
 		//return null if not found
 		if(count($person->retval) < 1)
@@ -170,14 +169,13 @@ class Person_model extends DB_Model
 		$this->KontaktModel->addOrder('kontakttyp');
 		$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustellung' => true) : array('person_id' => $person_id);
 		$kontakte = $this->KontaktModel->loadWhere($where);
-		if($kontakte->error)
-			return error($kontakte->retval);
+		if($kontakte->error) return $kontakte;
+
 		$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustelladresse' => true) : array('person_id' => $person_id);
 		$this->AdresseModel->addSelect('public.tbl_adresse.*, bis.tbl_nation.kurztext AS nationkurztext');
 		$this->AdresseModel->addJoin('bis.tbl_nation', 'tbl_adresse.nation = tbl_nation.nation_code', 'LEFT');
 		$adressen = $this->AdresseModel->loadWhere($where);
-		if($adressen->error)
-			return error($adressen->retval);
+		if($adressen->error) return $adressen;
 
 		$stammdaten = $person->retval[0];
 		$stammdaten->kontakte = $kontakte->retval;
@@ -207,28 +205,47 @@ class Person_model extends DB_Model
 	 */
 	public function getLanguage($uid)
 	{
-		$language = DEFAULT_LANGUAGE;
-
+		$this->addSelect('public.tbl_person.sprache');
 		$this->addJoin('public.tbl_benutzer', 'person_id');
+		$this->addJoin('public.tbl_sprache', 'sprache');
 		$this->addOrder('public.tbl_person.updateamum', 'DESC');
 		$this->addOrder('public.tbl_person.insertvon', 'DESC');
 
-		$persons = $this->loadWhere(array('uid' => $uid));
+		return $this->loadWhere(array('uid' => $uid, 'content' => true));
+	}
 
-		if (hasData($persons))
+	/**
+	 * Checks if a person has a Bewerberstatus and reihungstestangetreten = true
+	 * @param $person_id
+	 * @param $studiensemester_kurzbz
+	 * @return array
+	 */
+	public function hasBewerber($person_id, $studiensemester_kurzbz, $studiengangtyp = null)
+	{
+		$parametersArray = array($person_id, $studiensemester_kurzbz);
+
+		$qry = "SELECT count(*) AS anzahl_bewerber FROM public.tbl_person
+				JOIN public.tbl_prestudent USING (person_id)
+				JOIN public.tbl_prestudentstatus ON tbl_prestudentstatus.prestudent_id = tbl_prestudent.prestudent_id";
+
+		if (isset($studiengangtyp))
 		{
-			for ($i = 0; $i < count($persons->retval); $i++)
-			{
-				$person = $persons->retval[$i];
-
-				if (!isEmptyString($person->sprache))
-				{
-					$language = $person->sprache;
-					break;
-				}
-			}
+			$qry .= " JOIN lehre.tbl_studienplan USING(studienplan_id)
+					 JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+					 JOIN public.tbl_studiengang ON tbl_studienordnung.studiengang_kz = tbl_studiengang.studiengang_kz";
 		}
 
-		return $language;
+		$qry .=	" WHERE person_id = ?
+				AND studiensemester_kurzbz = ?
+				AND tbl_prestudentstatus.status_kurzbz = 'Bewerber'
+				AND reihungstestangetreten";
+
+		if (isset($studiengangtyp))
+		{
+			$parametersArray[] = $studiengangtyp;
+			$qry .= " AND tbl_studiengang.typ = ?";
+		}
+
+		return $this->execQuery($qry, $parametersArray);
 	}
 }
diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php
index 2398bf57a..cd3d8f7d9 100644
--- a/application/models/system/MessageToken_model.php
+++ b/application/models/system/MessageToken_model.php
@@ -37,17 +37,7 @@ class MessageToken_model extends DB_Model
 				 WHERE r.token = ?
 				 LIMIT 1';
 
-		$result = $this->db->query($sql, array(MSG_STATUS_DELETED, $token));
-
-		// If no errors occurred
-		if ($result)
-		{
-			return success($result->result());
-		}
-		else
-		{
-			return error($this->db->error());
-		}
+		return $this->execQuery($sql, array(MSG_STATUS_DELETED, $token));
 	}
 
 	/**
@@ -74,25 +64,24 @@ class MessageToken_model extends DB_Model
 				 WHERE r.token = ?
 				 LIMIT 1';
 
-		$msgs = $this->db->query($sql, array(MSG_STATUS_ARCHIVED, $token));
+		$msgsResult = $this->execQuery($sql, array(MSG_STATUS_ARCHIVED, $token));
 
 		// If no errors occurred
-		if ($msgs)
+		if (isSuccess($msgsResult))
 		{
-			$msgs_result = $msgs->result();
 			// If at least a record is present
-			if (count($msgs_result) > 0)
+			if (hasData($msgsResult))
 			{
-				$msg = $msgs_result[0];
+				$msg = getData($msgsResult)[0];
+				$msgStatusResult = error();
 
-				$msgStatusResult = false; // pessimistic expectation
+				$this->load->model('system/MsgStatus_model', 'MsgStatusModel');
 
 				// If the status of the message is unread
 				if ($msg->status == MSG_STATUS_UNREAD)
 				{
 					// Insert the read status
-					$msgStatusResult = $this->db->insert(
-						'public.tbl_msg_status',
+					$msgStatusResult = $this->MsgStatusModel->insert(
 						array(
 							'message_id' => $msg->message_id,
 							'person_id' => $msg->receiver_id,
@@ -108,31 +97,23 @@ class MessageToken_model extends DB_Model
 				// If the status of the message is read
 				else if ($msg->status == MSG_STATUS_READ)
 				{
-					// Update updateamum to current date
-					$this->db->set('updateamum', 'NOW()');
-
-					$this->db->where('message_id', $msg->message_id);
-					$this->db->where('person_id', $msg->receiver_id);
-					$this->db->where('status', MSG_STATUS_READ);
-
-					$msgStatusResult = $this->db->update('public.tbl_msg_status');
+					$msgStatusResult = $this->MsgStatusModel->update(
+						array(
+							'message_id' => $msg->message_id,
+							'person_id' => $msg->receiver_id,
+							'status' => MSG_STATUS_READ
+						),
+						array('updateamum' => 'NOW()')
+					);
 				}
 
-				// If some of the previous DB manipulation (update or insert) has failed
-				if (!$msgStatusResult)
-				{
-					return error($this->db->error());
-				}
+				return $msgStatusResult;
 			}
-
-			return success($msgs_result);
 		}
 		else
 		{
-			return error($this->db->error());
+			return $msgsResult;
 		}
-
-		return success($result->result());
 	}
 
 	/**
@@ -152,45 +133,7 @@ class MessageToken_model extends DB_Model
 			 LEFT JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid)
 				 WHERE p.person_id = ?';
 
-		$result = $this->db->query($sql, array($person_id));
-
-		// If no errors occurred
-		if ($result)
-		{
-			return success($result->result());
-		}
-		else
-		{
-			return error($this->db->error());
-		}
-	}
-
-	/**
-	 * Get data of a person
-	 */
-	public function getPersonData($person_id)
-	{
-		$sql = 'SELECT person_id,
-					   vorname as "Vorname",
-					   nachname as "Nachname",
-					   anrede as "Anrede",
-					   titelpost as "TitelPost",
-					   titelpre as "TitelPre",
-					   vornamen as "Vornamen"
-				  FROM public.tbl_person
-				 WHERE person_id %s ?';
-
-		$result = $this->db->query(sprintf($sql, is_array($person_id) ? 'IN' : '='), array($person_id));
-
-		// If no errors occurred
-		if ($result)
-		{
-			return success($result->result());
-		}
-		else
-		{
-			return error($this->db->error());
-		}
+		return $this->execQuery($sql, array($person_id));
 	}
 
 	/**
@@ -200,35 +143,12 @@ class MessageToken_model extends DB_Model
 	{
 		$sql = 'SELECT m.mitarbeiter_uid
 				  FROM public.tbl_person p
-			 LEFT JOIN public.tbl_benutzer b USING(person_id)
-			 LEFT JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid)
+			 	  JOIN public.tbl_benutzer b USING(person_id)
+			 	  JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid)
 				 WHERE p.person_id = ?
 				   AND b.aktiv = TRUE';
 
-		$result = $this->db->query($sql, array($person_id));
-
-		// If no errors occurred
-		if ($result)
-		{
-			// If data are present
-			if (is_array($result->result()) && count($result->result()) > 0)
-			{
-				$personresults = $result->result();
-				$person = $personresults[0];
-
-				// If it is an employee
-				if ($person->mitarbeiter_uid != null)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-		else
-		{
-			return error($this->db->error());
-		}
+		return $this->execQuery($sql, array($person_id));
 	}
 
 	/**
@@ -254,28 +174,6 @@ class MessageToken_model extends DB_Model
 		     LIMIT 1
 		';
 
-		$result = $this->db->query($sql, array($oe_kurzbz));
-		if ($result) // If no errors occurred
-		{
-			$result_arr = $result->result();
-			// If data are present
-			if (is_array($result_arr)
-				&& count($result_arr) > 0
-				&& is_object($result_arr[0])
-				&& isset($result_arr[0]->oe_kurzbz))
-			{
-				return success($result_arr[0]->oe_kurzbz);
-			}
-			else
-			{
-				return error();
-			}
-		}
-		else
-		{
-			return error($this->db->error());
-		}
-
-		return $result;
+		return $this->execQuery($sql, array($oe_kurzbz));
 	}
 }
diff --git a/application/models/system/PersonLock_model.php b/application/models/system/PersonLock_model.php
index 1d106b789..f0aadd327 100644
--- a/application/models/system/PersonLock_model.php
+++ b/application/models/system/PersonLock_model.php
@@ -29,8 +29,7 @@ class PersonLock_model extends DB_Model
 
 		$result = $this->loadWhere($lockdata);
 
-		if ($result->error)
-			return error($result->retval);
+		if ($result->error) return $result;
 
 		if (count($result->retval) > 0)
 			return success($result->retval);
@@ -49,8 +48,7 @@ class PersonLock_model extends DB_Model
 	{
 		$locked = $this->checkIfLocked($person_id, $app);
 
-		if ($locked->error)
-			return error($locked->retval);
+		if ($locked->error) return $locked;
 
 		//insert only if not already locked
 		if ($locked->retval === null)
@@ -77,8 +75,7 @@ class PersonLock_model extends DB_Model
 		foreach ($locks->retval as $lock)
 		{
 			$result = $this->delete($lock->lock_id);
-			if ($result->error)
-				return error($result->retval);
+			if ($result->error) return $result;
 
 			$deleted[] = $lock;
 		}
diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
index 654a9a883..d74d03243 100644
--- a/application/models/system/Recipient_model.php
+++ b/application/models/system/Recipient_model.php
@@ -25,7 +25,8 @@ class Recipient_model extends DB_Model
 						 ks.kontakt,
 						 p.nachname,
 						 p.vorname,
-						 b.uid
+						 b.uid,
+						 mr.sent
 					FROM public.tbl_msg_recipient mr INNER JOIN public.tbl_msg_message mm USING (message_id)
 						INNER JOIN public.tbl_person p ON (mm.person_id = p.person_id)
 						LEFT JOIN public.tbl_benutzer b ON (mr.person_id = b.person_id)
@@ -56,11 +57,13 @@ class Recipient_model extends DB_Model
 						m.oe_kurzbz,
 						s.status,
 						s.statusinfo,
-						s.insertamum as statusamum
+						s.insertamum as statusamum,
+						b.uid
 				  FROM public.tbl_msg_recipient r JOIN public.tbl_msg_message m USING (message_id)
 						JOIN (
 							SELECT * FROM public.tbl_msg_status WHERE status < ? ORDER BY insertamum DESC, status DESC
-						) s ON (r.message_id = s.message_id AND r.person_id = s.person_id)
+						) s ON (r.message_id = s.message_id AND r.person_id = s.person_id),
+						LEFT JOIN public.tbl_benutzer b USING(person_id)
 				 WHERE r.token = ?
 				 LIMIT 1';
 
@@ -196,74 +199,24 @@ class Recipient_model extends DB_Model
 	}
 
 	/**
-	 * getMessages
+	 * Gets all messages for which notice emails are still not sent
 	 *
-	 * Gets all the messages to be sent
-	 *
-	 * @param kontaktType specifies the type of the kontakt to get
-	 * @param sent specifies the status of the messages to get (NULL never sent, otherwise the shipping date)
-	 * @param limit specifies the number of messages to get
-	 * @param message_id specifies a single message
+	 * @param kontaktType specifies the type of the kontakt to get (email,...)
+	 * @param limit specifies the max number of messages to get
+	 * @param since specifies from which date messages have to be retrieved
 	 */
-	public function getMessages($kontaktType, $sent, $limit = null, $message_id = null)
+	public function getNotSentMessages($limit, $since)
 	{
-		$query = 'SELECT mm.message_id,
-						 ks.kontakt as sender,
-						 kr.kontakt as receiver,
-						 mu.mitarbeiter_uid as employeeContact,
-						 ms.mitarbeiter_uid as senderemployeeContact,
-						 mr.person_id as receiver_id,
-						 mr.token,
-						 mm.subject,
-						 mm.body,
-						 mr.sentinfo
-					FROM public.tbl_msg_recipient mr INNER JOIN public.tbl_msg_message mm USING (message_id)
-						LEFT JOIN (
-							SELECT person_id, kontakt FROM public.tbl_kontakt WHERE kontakttyp = ?
-						) ks ON (ks.person_id = mm.person_id)
-						LEFT JOIN (
-							SELECT person_id, kontakt FROM public.tbl_kontakt WHERE kontakttyp = ?
-						) kr ON (kr.person_id = mr.person_id)
-						LEFT JOIN (
-							SELECT b.person_id,
-								   m.mitarbeiter_uid
-							  FROM public.tbl_benutzer b INNER JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid)
-							 WHERE b.aktiv = TRUE
-						) mu ON (mu.person_id = mr.person_id)
-						LEFT JOIN (
-							SELECT b.person_id,
-								   m.mitarbeiter_uid
-							  FROM public.tbl_benutzer b INNER JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid)
-							 WHERE b.aktiv = TRUE
-						) ms ON (ms.person_id = mm.person_id)';
+		$query = 'SELECT mm.message_id
+					FROM public.tbl_msg_recipient mr
+					JOIN public.tbl_msg_message mm USING (message_id)
+				   WHERE mr.sent IS NULL
+				   	 AND mr.sentinfo IS NULL
+				     AND mm.insertamum > ?
+				ORDER BY mr.insertamum ASC
+				   LIMIT ?';
 
-		$parametersArray = array($kontaktType, $kontaktType);
-
-		if (is_null($sent) || $sent == '')
-		{
-			$query .= ' WHERE mr.sent IS NULL';
-		}
-		else
-		{
-			array_push($parametersArray, $sent);
-			$query .= ' WHERE mr.sent = ?';
-		}
-
-		if (!is_null($message_id))
-		{
-			array_push($parametersArray, $message_id);
-			$query .= ' AND mm.message_id = ?';
-		}
-
-		$query .= ' ORDER BY mr.insertamum ASC';
-
-		if (!is_null($limit))
-		{
-			$query .= ' LIMIT ?';
-			array_push($parametersArray, $limit);
-		}
-
-		return $this->execQuery($query, $parametersArray);
+		return $this->execQuery($query, array($since, $limit));
 	}
 
 	/**
@@ -307,4 +260,137 @@ class Recipient_model extends DB_Model
 
 		return $this->execQuery($sql, $parametersArray);
 	}
+
+	/**
+	 * - Gets the directly recieved messages using the given person id
+	 * - Gets the recieved messages from an organisation unit where this person plays a role given by the parameter functions
+	 */
+	public function getReceivedMessages($person_id, $functions)
+	{
+		$sql = '-- Messages sent directly to the person
+				SELECT mr.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						p.vorname,
+						p.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						mr.token
+				  FROM public.tbl_msg_recipient mr
+				  JOIN public.tbl_msg_message mm ON (mm.message_id = mr.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mr.message_id AND ms.person_id = mr.person_id)
+				  JOIN public.tbl_person p ON (p.person_id = mm.person_id)
+				 WHERE mr.person_id = ?
+			  GROUP BY mr.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						p.vorname,
+						p.nachname,
+						ms.person_id,
+						mr.token
+				 UNION
+				-- Messages sent to a person that belongs to the recipient organisation unit
+				SELECT mrou.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						pr.vorname,
+						pr.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						mrou.token
+				  FROM public.tbl_person p
+				  JOIN public.tbl_benutzer b ON (b.person_id = p.person_id)
+				  JOIN (
+					  	SELECT uid, oe_kurzbz
+						  FROM public.tbl_benutzerfunktion
+						 WHERE (datum_von IS NULL OR datum_von <= NOW())
+					  	   AND (datum_bis IS NULL OR datum_bis >= NOW())
+						   AND funktion_kurzbz IN ?
+						) bf ON (bf.uid = b.uid)
+				  JOIN public.tbl_msg_recipient mrou ON (mrou.oe_kurzbz = bf.oe_kurzbz)
+				  JOIN public.tbl_msg_message mm ON (mm.message_id = mrou.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mrou.message_id AND ms.person_id = mrou.person_id)
+				  JOIN public.tbl_person pr ON (pr.person_id = mm.person_id)
+				 WHERE p.person_id = ?
+			  GROUP BY mrou.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						pr.vorname,
+						pr.nachname,
+						ms.person_id,
+						mrou.token
+			  ORDER BY sent DESC';
+
+		return $this->execQuery($sql, array($person_id, $functions, $person_id));
+	}
+
+	/**
+	 * Gets all the sent message by the given person
+	 */
+	public function getSentMessages($person_id)
+	{
+		$sql = 'SELECT mm.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						p.person_id,
+						p.vorname,
+						p.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						oe.bezeichnung AS oe,
+						mr.token
+				  FROM public.tbl_msg_message mm
+				  JOIN public.tbl_msg_recipient mr ON (mr.message_id = mm.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mm.message_id AND ms.person_id = mr.person_id)
+				  JOIN public.tbl_person p ON (p.person_id = mr.person_id)
+			 LEFT JOIN public.tbl_organisationseinheit oe ON (oe.oe_kurzbz = mr.oe_kurzbz)
+				 WHERE mm.person_id = ?
+			  GROUP BY mm.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						p.person_id,
+						p.vorname,
+						p.nachname,
+						ms.person_id,
+						oe.bezeichnung,
+						mr.token
+			  ORDER BY sent DESC';
+
+		return $this->execQuery($sql, array($person_id));
+	}
+
+	/**
+	 *
+	 */
+	public function getMessagesById($messageIds)
+	{
+		$sql = 'SELECT mm.message_id,
+						mm.person_id AS sender_id,
+						mm.subject,
+						mm.body,
+						mm.relationmessage_id,
+						mm.oe_kurzbz AS sender_ou,
+						mr.person_id AS receiver_id,
+						mr.token,
+						mr.sent,
+						mr.sentinfo,
+						mr.oe_kurzbz AS receiver_ou
+				  FROM public.tbl_msg_message mm
+				  JOIN public.tbl_msg_recipient mr ON (mr.message_id = mm.message_id)
+				 WHERE mm.message_id IN ?';
+
+		return $this->execQuery($sql, array($messageIds));
+	}
 }
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
index 1fcb5b274..875fc8876 100644
--- a/application/models/system/Variable_model.php
+++ b/application/models/system/Variable_model.php
@@ -24,30 +24,32 @@ class Variable_model extends DB_Model
 	 */
 	public function getVariables($uid, $names = null)
 	{
-		if (isEmptyString($uid) || (isset($names) && !is_array($names)))
+		if (isEmptyString($uid))
 			$result = error('wrong parameters passed');
 		else
 		{
 			$vardata = array();
+			$parametersArray = array($uid);
 
 			$qry = "SELECT name, wert FROM public.tbl_variable WHERE uid = ?";
 
-			if (isset($names))
+			if (!isEmptyArray($names))
 			{
-				$qry .= " AND name IN ('".implode(',', $names)."')";
+				$qry .= " AND name IN ?";
+				$parametersArray[] = $names;
 			}
 			$qry .= ";";
 
-			$varresults = $this->execQuery($qry, array($uid));
+			$varresults = $this->execQuery($qry, $parametersArray);
 
 			if (hasData($varresults))
 			{
 				$varresults = getData($varresults);
-					foreach ($varresults as $varresult)
-					{
-						if (isset($varresult->wert))
-							$vardata[$varresult->name] = $varresult->wert;
-					}
+				foreach ($varresults as $varresult)
+				{
+					if (isset($varresult->wert))
+						$vardata[$varresult->name] = $varresult->wert;
+				}
 			}
 
 			$vardefaults = $this->VariablennameModel->getDefaults($names);
@@ -56,7 +58,6 @@ class Variable_model extends DB_Model
 			{
 				$vardefaults = getData($vardefaults);
 
-
 				foreach ($vardefaults as $vardefault)
 				{
 					if (!isset($vardata[$vardefault->name]) && isset($vardefault->defaultwert))
diff --git a/application/views/crm/statusEdit.php b/application/views/crm/statusEdit.php
index 5fee3ee92..5f0353acf 100644
--- a/application/views/crm/statusEdit.php
+++ b/application/views/crm/statusEdit.php
@@ -1,89 +1,89 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'StatusEdit'));
-	
-	$s = $status;
-?>
-
-		<div class="row">
-			<div class="span4">
-				<h2>Status: <?php echo $s->status_kurzbz; ?></h2>
-				<form method="post" action="../saveStatus">
-					<table>
-						<tr>
-							<td colspan="2">
-								beschreibung:<br/><br/>
-								<input type="text" name="beschreibung" value="<?php echo $s->beschreibung; ?>" /><br/>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								Anmerkung:<br/><br/>
-								<textarea name="anmerkung"><?php echo $s->anmerkung; ?></textarea><br/>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								Bezeichnung mehrsprachig:<br/><br/>
-								
-								<?php
-									$val = '';
-									$i = 0;
-								?>
-								
-								<?php foreach ($sprache as $sp): ?>
-									<?php echo $sp->sprache; ?>:<br/>
-									<?php
-										if (!isset($s->bezeichnung_mehrsprachig[$i]))
-										{
-											$val = '';
-										}
-										else
-										{
-											$val = $s->bezeichnung_mehrsprachig[$i];
-										}
-										$i++;
-									?>
-									<input type="text" name="bezeichnung_mehrsprachig[]" value="<?php echo $val; ?>" /><br/>
-								<?php endforeach ?>
-								
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2" align="center">
-								<button type="submit">Save</button>
-							</td>
-						</tr>
-					</table>
-					<input type="hidden" name="status_kurzbz" value="<?php echo $s->status_kurzbz; ?>" />
-				</form>
-			</div>
-		</div>
-	</body>
-	
-	<?php
-		if (!is_null($update))
-		{
-	?>
-			<script>
-				parent.document.getElementById("StatusgrundLeft").contentWindow.location.reload(true);
-			</script>
-	<?php
-		}
-	?>
-	
-</html>
+<?php
+	$this->load->view('templates/header', array('title' => 'StatusEdit'));
+	
+	$s = $status;
+?>
+
+		<div class="row">
+			<div class="span4">
+				<h2>Status: <?php echo $s->status_kurzbz; ?></h2>
+				<form method="post" action="../saveStatus">
+					<table>
+						<tr>
+							<td colspan="2">
+								beschreibung:<br/><br/>
+								<input type="text" name="beschreibung" value="<?php echo $s->beschreibung; ?>" /><br/>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								Anmerkung:<br/><br/>
+								<textarea name="anmerkung"><?php echo $s->anmerkung; ?></textarea><br/>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								Bezeichnung mehrsprachig:<br/><br/>
+								
+								<?php
+									$val = '';
+									$i = 0;
+								?>
+								
+								<?php foreach ($sprache as $sp): ?>
+									<?php echo $sp->sprache; ?>:<br/>
+									<?php
+										if (!isset($s->bezeichnung_mehrsprachig[$i]))
+										{
+											$val = '';
+										}
+										else
+										{
+											$val = $s->bezeichnung_mehrsprachig[$i];
+										}
+										$i++;
+									?>
+									<input type="text" name="bezeichnung_mehrsprachig[]" value="<?php echo $val; ?>" /><br/>
+								<?php endforeach ?>
+								
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="center">
+								<button type="submit">Save</button>
+							</td>
+						</tr>
+					</table>
+					<input type="hidden" name="status_kurzbz" value="<?php echo $s->status_kurzbz; ?>" />
+				</form>
+			</div>
+		</div>
+	</body>
+	
+	<?php
+		if (!is_null($update))
+		{
+	?>
+			<script>
+				parent.document.getElementById("StatusgrundLeft").contentWindow.location.reload(true);
+			</script>
+	<?php
+		}
+	?>
+	
+</html>
diff --git a/application/views/crm/statusgrund.php b/application/views/crm/statusgrund.php
index e79fa5d05..d4a31aa53 100644
--- a/application/views/crm/statusgrund.php
+++ b/application/views/crm/statusgrund.php
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html lang="de_AT">
-
-	<head>
-		<title>VileSci - Statusgrund</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	</head>
-
-	<frameset cols="30%, *">
-		<frame src="Statusgrund/listStatus" id="StatusgrundLeft" name="StatusgrundLeft" frameborder="1" />
-		<noframes>
-			<body bgcolor="#FFFFFF">
-				This application works only with a frames-enabled browser.<br />
-			</body>
-		</noframes>
-		<frameset rows="30%, *">
-			<frame src="" id="StatusgrundTop" name="StatusgrundTop" frameborder="1" />
-			<noframes>
-				<body bgcolor="#FFFFFF">
-					This application works only with a frames-enabled browser.<br />
-				</body>
-			</noframes>
-			<frame src="" id="StatusgrundBottom" name="StatusgrundBottom" frameborder="1" />
-			<noframes>
-				<body bgcolor="#FFFFFF">
-					This application works only with a frames-enabled browser.<br />
-				</body>
-			</noframes>
-		</frameset>
-	</frameset>
-
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
+<html lang="de_AT">
+
+	<head>
+		<title>VileSci - Statusgrund</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	</head>
+
+	<frameset cols="30%, *">
+		<frame src="Statusgrund/listStatus" id="StatusgrundLeft" name="StatusgrundLeft" frameborder="1" />
+		<noframes>
+			<body bgcolor="#FFFFFF">
+				This application works only with a frames-enabled browser.<br />
+			</body>
+		</noframes>
+		<frameset rows="30%, *">
+			<frame src="" id="StatusgrundTop" name="StatusgrundTop" frameborder="1" />
+			<noframes>
+				<body bgcolor="#FFFFFF">
+					This application works only with a frames-enabled browser.<br />
+				</body>
+			</noframes>
+			<frame src="" id="StatusgrundBottom" name="StatusgrundBottom" frameborder="1" />
+			<noframes>
+				<body bgcolor="#FFFFFF">
+					This application works only with a frames-enabled browser.<br />
+				</body>
+			</noframes>
+		</frameset>
+	</frameset>
+
+</html>
diff --git a/application/views/crm/statusgrundEdit.php b/application/views/crm/statusgrundEdit.php
index ddbd1ff0a..9fa91b6d5 100644
--- a/application/views/crm/statusgrundEdit.php
+++ b/application/views/crm/statusgrundEdit.php
@@ -1,107 +1,107 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'StatusgrundEdit'));
-
-	$sg = $statusgrund;
-?>
-
-		<div class="row">
-			<div class="span4">
-				<h2>Statusgrund: <?php echo $sg->status_kurzbz; ?></h2>
-				<form method="post" action="<?php echo site_url("crm/Statusgrund/saveGrund"); ?>">
-					<table>
-						<tr>
-							<td colspan="2">
-								Bezeichnung mehrsprachig:<br/><br/>
-								<?php
-									$i = 0;
-									$val = "";
-								?>
-								<?php foreach ($sprache as $s): ?>
-									<?php echo $s->sprache; ?>:<br/>
-									<?php
-										if (!isset($sg->bezeichnung_mehrsprachig[$i]))
-										{
-											$val = "";
-										}
-										else
-										{
-											$val = $sg->bezeichnung_mehrsprachig[$i];
-										}
-										$i++;
-									?>
-									<input type="text" name="bezeichnung_mehrsprachig[]" value="<?php echo $val; ?>" /><br/>
-								<?php endforeach ?>
-
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								Beschreibung:<br/><br/>
-								<?php
-									$i = 0;
-									$val = "";
-								?>
-								<?php foreach ($sprache as $s): ?>
-									<?php echo $s->sprache; ?>:<br/>
-									<?php
-										if (!isset($sg->beschreibung[$i]))
-										{
-											$val = "";
-										}
-										else
-										{
-											$val = $sg->beschreibung[$i];
-										}
-										$i++;
-									?>
-									<textarea name="beschreibung[]"><?php echo $val; ?></textarea><br/>
-								<?php endforeach ?>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td>
-								Aktiv:
-							</td>
-							<td>
-								<input type="checkbox" name="aktiv" <?php echo isset($sg->aktiv) && $sg->aktiv === true ? "checked" : ""; ?> />
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2" align="center">
-								<button type="submit">Save</button>
-							</td>
-						</tr>
-					</table>
-					<input type="hidden" name="statusgrund_id" value="<?php echo isset($sg->statusgrund_id) ? $sg->statusgrund_id : ""; ?>" />
-				</form>
-			</div>
-		</div>
-	</body>
-
-	<?php
-		if (!is_null($update))
-		{
-	?>
-			<script>
-				parent.document.getElementById("StatusgrundTop").contentWindow.location.reload(true);
-			</script>
-	<?php
-		}
-	?>
-
-</html>
+<?php
+	$this->load->view('templates/header', array('title' => 'StatusgrundEdit'));
+
+	$sg = $statusgrund;
+?>
+
+		<div class="row">
+			<div class="span4">
+				<h2>Statusgrund: <?php echo $sg->status_kurzbz; ?></h2>
+				<form method="post" action="<?php echo site_url("crm/Statusgrund/saveGrund"); ?>">
+					<table>
+						<tr>
+							<td colspan="2">
+								Bezeichnung mehrsprachig:<br/><br/>
+								<?php
+									$i = 0;
+									$val = "";
+								?>
+								<?php foreach ($sprache as $s): ?>
+									<?php echo $s->sprache; ?>:<br/>
+									<?php
+										if (!isset($sg->bezeichnung_mehrsprachig[$i]))
+										{
+											$val = "";
+										}
+										else
+										{
+											$val = $sg->bezeichnung_mehrsprachig[$i];
+										}
+										$i++;
+									?>
+									<input type="text" name="bezeichnung_mehrsprachig[]" value="<?php echo $val; ?>" /><br/>
+								<?php endforeach ?>
+
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								Beschreibung:<br/><br/>
+								<?php
+									$i = 0;
+									$val = "";
+								?>
+								<?php foreach ($sprache as $s): ?>
+									<?php echo $s->sprache; ?>:<br/>
+									<?php
+										if (!isset($sg->beschreibung[$i]))
+										{
+											$val = "";
+										}
+										else
+										{
+											$val = $sg->beschreibung[$i];
+										}
+										$i++;
+									?>
+									<textarea name="beschreibung[]"><?php echo $val; ?></textarea><br/>
+								<?php endforeach ?>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td>
+								Aktiv:
+							</td>
+							<td>
+								<input type="checkbox" name="aktiv" <?php echo isset($sg->aktiv) && $sg->aktiv === true ? "checked" : ""; ?> />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="center">
+								<button type="submit">Save</button>
+							</td>
+						</tr>
+					</table>
+					<input type="hidden" name="statusgrund_id" value="<?php echo isset($sg->statusgrund_id) ? $sg->statusgrund_id : ""; ?>" />
+				</form>
+			</div>
+		</div>
+	</body>
+
+	<?php
+		if (!is_null($update))
+		{
+	?>
+			<script>
+				parent.document.getElementById("StatusgrundTop").contentWindow.location.reload(true);
+			</script>
+	<?php
+		}
+	?>
+
+</html>
diff --git a/application/views/crm/statusgrundNew.php b/application/views/crm/statusgrundNew.php
index bd2ebe7d7..ffcd18429 100644
--- a/application/views/crm/statusgrundNew.php
+++ b/application/views/crm/statusgrundNew.php
@@ -1,66 +1,66 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'StatusgrundNew'));
-?>
-
-		<div class="row">
-			<div class="span4">
-				<h2>Neuer Statusgrund</h2>
-				<form method="post" action="<?php echo site_url("crm/Statusgrund/insGrund"); ?>">
-					<table>
-						<tr>
-							<td colspan="2">
-								Bezeichnung mehrsprachig:<br/><br/>
-
-								<?php foreach ($sprache as $s): ?>
-									<?php echo $s->sprache; ?>:<br/>
-									<input type="text" name="bezeichnung_mehrsprachig[]" value="" /><br/>
-								<?php endforeach ?>
-
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								Beschreibung:<br/><br/>
-
-								<?php foreach ($sprache as $s): ?>
-									<?php echo $s->sprache; ?>:<br/>
-									<textarea name="beschreibung[]"></textarea><br/>
-								<?php endforeach ?>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td>
-								Aktiv:
-							</td>
-							<td>
-								<input type="checkbox" name="aktiv" />
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2" align="center">
-								<button type="submit">Save</button>
-							</td>
-						</tr>
-					</table>
-					<input type="hidden" name="status_kurzbz" value="<?php echo $status_kurzbz; ?>" />
-				</form>
-			</div>
-		</div>
-	</body>
-
-</html>
+<?php
+	$this->load->view('templates/header', array('title' => 'StatusgrundNew'));
+?>
+
+		<div class="row">
+			<div class="span4">
+				<h2>Neuer Statusgrund</h2>
+				<form method="post" action="<?php echo site_url("crm/Statusgrund/insGrund"); ?>">
+					<table>
+						<tr>
+							<td colspan="2">
+								Bezeichnung mehrsprachig:<br/><br/>
+
+								<?php foreach ($sprache as $s): ?>
+									<?php echo $s->sprache; ?>:<br/>
+									<input type="text" name="bezeichnung_mehrsprachig[]" value="" /><br/>
+								<?php endforeach ?>
+
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								Beschreibung:<br/><br/>
+
+								<?php foreach ($sprache as $s): ?>
+									<?php echo $s->sprache; ?>:<br/>
+									<textarea name="beschreibung[]"></textarea><br/>
+								<?php endforeach ?>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td>
+								Aktiv:
+							</td>
+							<td>
+								<input type="checkbox" name="aktiv" />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="center">
+								<button type="submit">Save</button>
+							</td>
+						</tr>
+					</table>
+					<input type="hidden" name="status_kurzbz" value="<?php echo $status_kurzbz; ?>" />
+				</form>
+			</div>
+		</div>
+	</body>
+
+</html>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 15de019e5..0408366a7 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -144,12 +144,13 @@ $this->load->view(
                 </div>
             </div>
             <div class="col-md-offset-2 col-md-4 col-xs-6">
-                <div class="input-group">
-                    <input id="password" type="password" class="form-control" placeholder="CIS-Passwort">
-                    <span class="input-group-btn">
-                        <button id="accept-lehrauftraege" class="btn btn-primary pull-right">Lehrauftrag annehmen</button>
-                    </span>
-                </div>
+				<div class="input-group">
+					<input id="username" type="hidden" value=""><!-- this is to prevent Chrome autofilling a random input field with the username-->
+					<input id="password" type="password" autocomplete="new-password" class="form-control" placeholder="CIS-Passwort">
+						<span class="input-group-btn">
+							<button id="accept-lehrauftraege" class="btn btn-primary pull-right">Lehrauftrag annehmen</button>
+						</span>
+				</div>
             </div>
         </div>
 		<br>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index 7b9443edb..e172cc83a 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -182,7 +182,8 @@ FROM
             (SELECT
                  uid
              FROM
-                 public.tbl_benutzer
+			 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma 
+                    ON tbl_benutzer.uid = ma.mitarbeiter_uid 
              WHERE
                  person_id = tmp_projektbetreuung.person_id
                ORDER BY aktiv DESC, updateaktivam DESC      -- accept inactive as some person_ids have no active, but order them last
@@ -296,7 +297,6 @@ $filterWidgetArray = array(
     'tableUniqueId' => 'acceptLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
     'datasetRepresentation' => 'tabulator',
-    'reloadDataset' => true,    // reload query on page refresh
     'columnsAliases' => array(  // TODO: use phrasen
         'Status',   // alias for row_index, because row_index is formatted to display the status icons
 		'LV- / Projektbezeichnung',
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 5e1ae27b6..0fb1bfc7e 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -187,7 +187,8 @@ FROM
             (SELECT
                  uid
              FROM
-                 public.tbl_benutzer
+                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma 
+                    ON tbl_benutzer.uid = ma.mitarbeiter_uid
              WHERE
                  person_id = tmp_projektbetreuung.person_id
                ORDER BY aktiv DESC, updateaktivam DESC      -- accept inactive as some person_ids have no active, but order them last
@@ -304,7 +305,6 @@ $filterWidgetArray = array(
     'tableUniqueId' => 'approveLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_erteilen',
     'datasetRepresentation' => 'tabulator',
-    'reloadDataset' => true,    // reload query on page refresh
     'columnsAliases' => array(  // TODO: use phrasen
         'Status', // alias for row_index, because row_index is formatted to display the status icons
         'Personalnummer',
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index ba7b0d4f6..e167941d7 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -53,7 +53,6 @@ $tableWidgetArray = array(
 	'tableUniqueId' => 'cancelledLehrauftrag',
 	'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
 	'datasetRepresentation' => 'tabulator',
-	'reloadDataset' => true,    // reload query on page refresh
 	'columnsAliases' => array(  // TODO: use phrasen
 		'Status',
 		'Studiensemester',
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index ca671fbd4..4f605277b 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -219,7 +219,8 @@ FROM
             (SELECT
                  uid
              FROM
-                 public.tbl_benutzer
+                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma 
+                    ON tbl_benutzer.uid = ma.mitarbeiter_uid
              WHERE
                  person_id = tmp_projektbetreuung.person_id
                ORDER BY aktiv DESC, updateaktivam DESC      -- accept inactive as some person_ids have no active, but order them last
@@ -336,7 +337,6 @@ $filterWidgetArray = array(
 	'tableUniqueId' => 'orderLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_bestellen',
     'datasetRepresentation' => 'tabulator',
-    'reloadDataset' => true,    // reload query on page refresh
     'columnsAliases' => array(  // TODO: use phrasen
         'Status', // alias for row_index, because row_index is formatted to display the status icons
         'Personalnummer',
diff --git a/application/views/system/fas_udf.php b/application/views/system/fas_udf.php
index d4a01b9e9..3efc61abc 100644
--- a/application/views/system/fas_udf.php
+++ b/application/views/system/fas_udf.php
@@ -1,150 +1,150 @@
-<?php $this->load->view("templates/header", array("title" => "UDF", "widgetsCSS" => true)); ?>
-
-	<body style="background-color: #eff0f1;">
-
-<?php
-	if ($result != null)
-	{
-		if (isSuccess($result))
-		{
-?>
-		<div style="color: black;">
-			Saved!
-		</div>
-
-		<br>
-<?php
-		}
-		else
-		{
-?>
-		<div style="color: red;">
-			Error while saving!
-		</div>
-		<br>
-		<div style="color: red;">
-<?php
-		$errors = $result->retval;
-		if(is_array($errors))
-		{
-			foreach ($errors as $error)
-			{
-				foreach ($error as $fieldError)
-				{
-					echo $fieldError->code . ': ' . $fieldError->retval . '<br>';
-				}
-			}
-		}
-		else
-			echo $result->retval;
-?>
-		</div>
-
-		<br>
-		<br>
-		<br>
-<?php
-		}
-	}
-?>
-		<form action="<?php echo site_url('system/FAS_UDF/saveUDF'); ?>" method="POST">
-
-			<div class="div-table">
-				<div class="div-row">
-					<div class="div-cell" style="font-size: 20px; font-weight: bold;">
-						Zusatzfelder
-					</div>
-				</div>
-				<div class="div-row">
-					<div class="div-cell">
-						&nbsp;
-					</div>
-				</div>
-				<div class="div-row">
-				<?php
-					if (isset($personUdfs))
-					{
-				?>
-					<div class="div-cell">
-						<?php
-							echo $this->udflib->UDFWidget(
-								array(
-									UDFLib::SCHEMA_ARG_NAME => 'public',
-									UDFLib::TABLE_ARG_NAME => 'tbl_person',
-									UDFLib::UDFS_ARG_NAME => $personUdfs
-								)
-							);
-						?>
-					</div>
-					<div class="div-cell" style="width: 40px;">
-						&nbsp;
-					</div>
-				<?php
-					}
-				?>
-				<?php
-					if (isset($prestudentUdfs))
-					{
-				?>
-					<div class="div-cell">
-						<?php
-							echo $this->udflib->UDFWidget(
-								array(
-									UDFLib::SCHEMA_ARG_NAME => 'public',
-									UDFLib::TABLE_ARG_NAME => 'tbl_prestudent',
-									UDFLib::UDFS_ARG_NAME => $prestudentUdfs
-								)
-							);
-						?>
-					</div>
-				<?php
-					}
-				?>
-				</div>
-				<div class="div-row">
-					<div class="div-cell">
-						&nbsp;
-					</div>
-				</div>
-				<div class="div-row halign-right">
-				<?php
-					if (isset($personUdfs) && isset($prestudentUdfs))
-					{
-				?>
-					<div class="div-cell">
-						&nbsp;
-					</div>
-					<div class="div-cell">
-						&nbsp;
-					</div>
-				<?php
-					}
-				?>
-					<div class="div-cell halign-right">
-						<input type="submit" value="&nbsp;Speichern&nbsp;">
-					</div>
-				</div>
-			</div>
-
-		<?php
-			if (isset($personUdfs))
-			{
-		?>
-			<input type="hidden" name="person_id" value="<?php echo $personUdfs['person_id']; ?>">
-		<?php
-			}
-		?>
-		<?php
-			if (isset($prestudentUdfs))
-			{
-		?>
-			<input type="hidden" name="prestudent_id" value="<?php echo $prestudentUdfs['prestudent_id']; ?>">
-		<?php
-			}
-		?>
-
-		</form>
-
-	</body>
-
-<?php $this->load->view("templates/footer"); ?>
+<?php $this->load->view("templates/header", array("title" => "UDF", "widgetsCSS" => true)); ?>
+
+	<body style="background-color: #eff0f1;">
+
+<?php
+	if ($result != null)
+	{
+		if (isSuccess($result))
+		{
+?>
+		<div style="color: black;">
+			Saved!
+		</div>
+
+		<br>
+<?php
+		}
+		else
+		{
+?>
+		<div style="color: red;">
+			Error while saving!
+		</div>
+		<br>
+		<div style="color: red;">
+<?php
+		$errors = $result->retval;
+		if(is_array($errors))
+		{
+			foreach ($errors as $error)
+			{
+				foreach ($error as $fieldError)
+				{
+					echo $fieldError->code . ': ' . $fieldError->retval . '<br>';
+				}
+			}
+		}
+		else
+			echo $result->retval;
+?>
+		</div>
+
+		<br>
+		<br>
+		<br>
+<?php
+		}
+	}
+?>
+		<form action="<?php echo site_url('system/FAS_UDF/saveUDF'); ?>" method="POST">
+
+			<div class="div-table">
+				<div class="div-row">
+					<div class="div-cell" style="font-size: 20px; font-weight: bold;">
+						Zusatzfelder
+					</div>
+				</div>
+				<div class="div-row">
+					<div class="div-cell">
+						&nbsp;
+					</div>
+				</div>
+				<div class="div-row">
+				<?php
+					if (isset($personUdfs))
+					{
+				?>
+					<div class="div-cell">
+						<?php
+							echo $this->udflib->UDFWidget(
+								array(
+									UDFLib::SCHEMA_ARG_NAME => 'public',
+									UDFLib::TABLE_ARG_NAME => 'tbl_person',
+									UDFLib::UDFS_ARG_NAME => $personUdfs
+								)
+							);
+						?>
+					</div>
+					<div class="div-cell" style="width: 40px;">
+						&nbsp;
+					</div>
+				<?php
+					}
+				?>
+				<?php
+					if (isset($prestudentUdfs))
+					{
+				?>
+					<div class="div-cell">
+						<?php
+							echo $this->udflib->UDFWidget(
+								array(
+									UDFLib::SCHEMA_ARG_NAME => 'public',
+									UDFLib::TABLE_ARG_NAME => 'tbl_prestudent',
+									UDFLib::UDFS_ARG_NAME => $prestudentUdfs
+								)
+							);
+						?>
+					</div>
+				<?php
+					}
+				?>
+				</div>
+				<div class="div-row">
+					<div class="div-cell">
+						&nbsp;
+					</div>
+				</div>
+				<div class="div-row halign-right">
+				<?php
+					if (isset($personUdfs) && isset($prestudentUdfs))
+					{
+				?>
+					<div class="div-cell">
+						&nbsp;
+					</div>
+					<div class="div-cell">
+						&nbsp;
+					</div>
+				<?php
+					}
+				?>
+					<div class="div-cell halign-right">
+						<input type="submit" value="&nbsp;Speichern&nbsp;">
+					</div>
+				</div>
+			</div>
+
+		<?php
+			if (isset($personUdfs))
+			{
+		?>
+			<input type="hidden" name="person_id" value="<?php echo $personUdfs['person_id']; ?>">
+		<?php
+			}
+		?>
+		<?php
+			if (isset($prestudentUdfs))
+			{
+		?>
+			<input type="hidden" name="prestudent_id" value="<?php echo $prestudentUdfs['prestudent_id']; ?>">
+		<?php
+			}
+		?>
+
+		</form>
+
+	</body>
+
+<?php $this->load->view("templates/footer"); ?>
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 91a24c463..0c7030059 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -274,7 +274,6 @@
 		'filter_id' => $this->input->get('filter_id'),
 		'requiredPermissions' => 'infocenter',
 		'datasetRepresentation' => 'tablesorter',
-		'reloadDataset' => ($this->input->get('reloadDataset')=='true'?true:false),
 		'customMenu' => true,
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index ab4e3533e..11b8ef094 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -22,7 +22,7 @@
 			'customJSs' => array(
 				'public/js/bootstrapper.js',
 				'public/js/tablesort/tablesort.js',
-				'public/js/messaging/messageList.js',
+				'public/js/infocenter/messageList.js',
 				'public/js/infocenter/infocenterDetails.js'
 			),
 			'phrases' => array(
@@ -154,7 +154,7 @@
 							<div class="panel-body">
 								<div class="row" id="messagelist">
 									<?php
-									$this->load->view('system/messages/messageList.php', $messages);
+									$this->load->view('system/infocenter/messageList.php', $messages);
 									?>
 								</div>
 							</div>
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 87a9f78d6..729fabb04 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -135,7 +135,7 @@
 						 FROM tbl_prestudentstatus spss
 						WHERE spss.prestudent_id = pss.prestudent_id
 						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >
 						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
@@ -236,7 +236,6 @@
 		'filter_id' => $this->input->get('filter_id'),
 		'requiredPermissions' => 'infocenter',
 		'datasetRepresentation' => 'tablesorter',
-		'reloadDataset' => ($this->input->get('reloadDataset')=='true'?true:false),
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
 		'columnsAliases' => array(
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index 652ab4887..22b122bb0 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -204,7 +204,6 @@
 		'filter_id' => $this->input->get('filter_id'),
 		'requiredPermissions' => 'infocenter',
 		'datasetRepresentation' => 'tablesorter',
-		'reloadDataset' => ($this->input->get('reloadDataset')=='true'?true:false),
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
 		'columnsAliases' => array(
diff --git a/application/views/system/infocenter/logs.php b/application/views/system/infocenter/logs.php
index de97d5055..8005bf4f7 100644
--- a/application/views/system/infocenter/logs.php
+++ b/application/views/system/infocenter/logs.php
@@ -1,19 +1,19 @@
-<table id="logtable" class="table table-bordered table-hover">
-	<thead>
-	<tr>
-		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
-		<th><?php echo  ucfirst($this->p->t('global', 'aktivitaet')) ?></th>
-		<th>User</th>
-	</tr>
-	</thead>
-	<tbody>
-	<?php foreach ($logs as $log): ?>
-		<tr data-toggle="tooltip"
-			title="<?php echo isset($log->logdata->message) ? $log->logdata->message : '' ?>">
-			<td><?php echo date_format(date_create($log->zeitpunkt), 'd.m.Y H:i:s') ?></td>
-			<td><?php echo isset($log->logdata->name) ? $log->logdata->name : '' ?></td>
-			<td><?php echo $log->insertvon ?></td>
-		</tr>
-	<?php endforeach ?>
-	</tbody>
+<table id="logtable" class="table table-bordered table-hover">
+	<thead>
+	<tr>
+		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'aktivitaet')) ?></th>
+		<th>User</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($logs as $log): ?>
+		<tr data-toggle="tooltip"
+			title="<?php echo isset($log->logdata->message) ? $log->logdata->message : '' ?>">
+			<td><?php echo date_format(date_create($log->zeitpunkt), 'd.m.Y H:i:s') ?></td>
+			<td><?php echo isset($log->logdata->name) ? $log->logdata->name : '' ?></td>
+			<td><?php echo $log->insertvon ?></td>
+		</tr>
+	<?php endforeach ?>
+	</tbody>
 </table>
\ No newline at end of file
diff --git a/application/views/system/messages/messageList.php b/application/views/system/infocenter/messageList.php
similarity index 97%
rename from application/views/system/messages/messageList.php
rename to application/views/system/infocenter/messageList.php
index d666e32fe..18b859314 100644
--- a/application/views/system/messages/messageList.php
+++ b/application/views/system/infocenter/messageList.php
@@ -1,37 +1,37 @@
-<?php
-$msgExists = count($messages) > 0;
-$widthColumn = $msgExists === true ? 8 : 12;
-?>
-<div class="col-lg-<?php echo $widthColumn ?>">
-	<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
-		<thead>
-		<tr>
-			<th><?php echo  ucfirst($this->p->t('global','gesendetAm')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','sender')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','empfaenger')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','betreff')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','gelesenAm')) ?></th>
-		</tr>
-		</thead>
-		<tbody>
-		<?php foreach ($messages as $message): ?>
-			<tr id="<?php echo $message->message_id.'_'.$message->repersonid ?>" style="cursor: pointer">
-				<td><?php echo isset($message->insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?></td>
-				<td><?php echo $message->sevorname.' '.$message->senachname ?></td>
-				<td><?php echo $message->revorname.' '.$message->renachname ?></td>
-				<td><?php echo $message->subject ?></td>
-				<td><?php echo isset($message->statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?></td>
-			</tr>
-		<?php endforeach; ?>
-		</tbody>
-	</table>
-</div>
-<?php if ($msgExists === true): ?>
-<div class="col-lg-4">
-	<br>
-	<div class="text-center"><label for="msgbody" id="msgsubject"></label></div>
-	<div>
-		<textarea id="msgbody"></textarea>
-	</div>
-</div>
-<?php endif; ?>
+<?php
+$msgExists = count($messages) > 0;
+$widthColumn = $msgExists === true ? 8 : 12;
+?>
+<div class="col-lg-<?php echo $widthColumn ?>">
+	<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
+		<thead>
+		<tr>
+			<th><?php echo  ucfirst($this->p->t('global','gesendetAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','sender')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','empfaenger')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','betreff')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','gelesenAm')) ?></th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php foreach ($messages as $message): ?>
+			<tr id="<?php echo $message->message_id.'_'.$message->repersonid ?>" style="cursor: pointer">
+				<td><?php echo isset($message->insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?></td>
+				<td><?php echo $message->sevorname.' '.$message->senachname ?></td>
+				<td><?php echo $message->revorname.' '.$message->renachname ?></td>
+				<td><?php echo $message->subject ?></td>
+				<td><?php echo isset($message->statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?></td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+</div>
+<?php if ($msgExists === true): ?>
+<div class="col-lg-4">
+	<br>
+	<div class="text-center"><label for="msgbody" id="msgsubject"></label></div>
+	<div>
+		<textarea id="msgbody"></textarea>
+	</div>
+</div>
+<?php endif; ?>
diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
index 13f7bb6e1..b28f7939a 100644
--- a/application/views/system/infocenter/notizen.php
+++ b/application/views/system/infocenter/notizen.php
@@ -1,20 +1,20 @@
-<table id="notiztable" class="table table-bordered table-hover">
-	<thead>
-	<tr>
-		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
-		<th><?php echo  ucfirst($this->p->t('global', 'notiz')) ?></th>
-		<th>User</th>
-	</tr>
-	</thead>
-	<tbody>
-	<?php foreach ($notizen as $notiz): ?>	
-		<tr data-toggle="tooltip"
-			title="<?php echo isset($notiz->text) ? html_escape($notiz->text) : '' ?>" style="cursor: pointer">
-			<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><?php echo $notiz->verfasser_uid ?></td>
-			<td style="display: none" class="hiddennotizid"><?php echo $notiz->notiz_id ?></td>
-		</tr>
-	<?php endforeach ?>
-	</tbody>
+<table id="notiztable" class="table table-bordered table-hover">
+	<thead>
+	<tr>
+		<th><?php echo  ucfirst($this->p->t('global', 'datum')) ?></th>
+		<th><?php echo  ucfirst($this->p->t('global', 'notiz')) ?></th>
+		<th>User</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($notizen as $notiz): ?>	
+		<tr data-toggle="tooltip"
+			title="<?php echo isset($notiz->text) ? html_escape($notiz->text) : '' ?>" style="cursor: pointer">
+			<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><?php echo $notiz->verfasser_uid ?></td>
+			<td style="display: none" class="hiddennotizid"><?php echo $notiz->notiz_id ?></td>
+		</tr>
+	<?php endforeach ?>
+	</tbody>
 </table>
\ No newline at end of file
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index 2b481692e..a80439bfe 100644
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -113,7 +113,7 @@
 		</table>
 		<div class="row">
 			<div class="col-xs-6">
-				<form id="sendmsgform" method="post" action="<?php echo site_url('/system/Messages/write'); ?>" target="_blank">
+				<form id="sendmsgform" method="post" action="<?php echo site_url('/system/messages/Messages/writeTemplate'); ?>" target="_blank">
 					<input type="hidden" name="person_id" value="<?php echo $stammdaten->person_id ?>">
 					<a id="sendmsglink" href="javascript:void(0);">
 						<i class="fa fa-envelope"></i>&nbsp;<?php echo $this->p->t('ui','nachrichtSenden'); ?>
diff --git a/application/views/system/logs/logsViewerData.php b/application/views/system/logs/logsViewerData.php
index 14cd2902e..13a4207ab 100644
--- a/application/views/system/logs/logsViewerData.php
+++ b/application/views/system/logs/logsViewerData.php
@@ -14,7 +14,6 @@
 		',
 		'requiredPermissions' => 'admin',
 		'datasetRepresentation' => 'tablesorter',
-		'reloadDataset' => true,
 		'columnsAliases' => array(
 			'Log id',
 			'Request id',
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
new file mode 100644
index 000000000..1ed1b7f40
--- /dev/null
+++ b/application/views/system/messages/ajaxRead.php
@@ -0,0 +1,61 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Read personal messages',
+			'jquery' => true,
+			'jqueryui' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'sbadmintemplate' => true,
+			'momentjs' => true,
+			'tabulator' => true,
+			'ajaxlib' => true,
+			'dialoglib' => true,
+			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/read.js')
+		)
+	);
+?>
+	<body>
+
+		<fieldset>
+
+			<span id="toggleMessages" class="toggle">
+
+				<input type="radio" name="toggleMessages" id="received" checked>
+				<label for="received">
+
+					<?php echo $this->p->t('global', 'received'); ?>
+
+				</label>
+
+				<input type="radio" name="toggleMessages" id="sent">
+				<label for="sent">
+
+					<?php echo ucfirst($this->p->t('global', 'gesendet')); ?>
+
+				</label>
+
+			</span>
+
+			<span class="buttonsSpacer"></span>
+
+			<span>
+				<input id="writeMessage" type="button" value="<?php echo $this->p->t('ui', 'nachrichtSenden'); ?>">
+
+				<input id="replyMessage" type="button" value="<?php echo $this->p->t('global', 'reply'); ?>">
+			</span>
+
+		</fieldset>
+
+
+		<div id="lstMessagesPanel"></div>
+
+		<div id="readMessagePanel"></div>
+
+	</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
new file mode 100644
index 000000000..fe9b9e897
--- /dev/null
+++ b/application/views/system/messages/ajaxWrite.php
@@ -0,0 +1,100 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Write a new message',
+			'jquery' => true,
+			'jqueryui' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'sbadmintemplate' => true,
+			'ajaxlib' => true,
+			'dialoglib' => true,
+			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/write.js')
+		)
+	);
+?>
+	<body>
+		<div id="wrapper">
+			<div id="page-wrapper">
+				<div class="container-fluid">
+					<div class="row">
+						<div class="col-lg-12">
+							<h3 class="page-header">
+
+								<?php echo $this->p->t('ui', 'nachrichtSenden'); ?>
+
+							</h3>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfieldcol-left">
+								<label>
+
+									<?php echo $this->p->t('global', 'empfaenger'); ?>:
+
+								</label>
+							</div>
+							<div class="col-lg-11 msgfieldcol-right">
+								<select id="organisationUnit">
+
+									<?php echo $organisationUnitOptions; ?>
+
+								</select>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfield msgfieldcol-left">
+								<label>
+
+									<?php echo $this->p->t('global', 'betreff'); ?>:
+
+								</label>
+							</div>
+							&nbsp;
+							<div class="col-lg-7">
+								<input id="subject" class="form-control" type="text" value="">
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-12">
+							<label>
+
+								<?php echo $this->p->t('global', 'nachricht'); ?>:
+
+							</label>
+							<textarea id="body"></textarea>
+
+							<br>
+
+							<div>
+
+								<?php echo $this->p->t('ui', 'altRecipientNote'); ?>
+
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-12 text-right">
+							<button id="sendButton" class="btn btn-default" type="button">
+
+								<?php echo $this->p->t('ui', 'senden'); ?>
+
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
new file mode 100644
index 000000000..3721565e9
--- /dev/null
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -0,0 +1,101 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Reply to a message',
+			'jquery' => true,
+			'jqueryui' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'sbadmintemplate' => true,
+			'ajaxlib' => true,
+			'dialoglib' => true,
+			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/writeReply.js')
+		)
+	);
+?>
+	<body>
+		<div id="wrapper">
+			<div id="page-wrapper">
+				<div class="container-fluid">
+					<div class="row">
+						<div class="col-lg-12">
+							<h3 class="page-header">
+
+								<?php echo $this->p->t('ui', 'nachrichtSenden'); ?>
+
+							</h3>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'empfaenger')); ?>:
+
+								</label>
+							</div>
+							<div class="col-lg-11 msgfieldcol-right">
+
+								<?php echo $receiver; ?>
+
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfield msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+								</label>
+							</div>
+							&nbsp;
+							<div class="col-lg-7">
+
+								<input id="subject" name="subject" type="text" value="<?php echo $subject; ?>">
+
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-12">
+							<label>
+
+								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+							</label>
+							<textarea id="body">
+
+								<?php echo $body; ?>
+
+							</textarea>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-12 text-right">
+
+							<input id="receiver_id" type="hidden" value="<?php echo $receiver_id; ?>">
+							<input id="relationmessage_id" type="hidden" value="<?php echo $relationmessage_id; ?>">
+							<input id="token" type="hidden" value="<?php echo $token; ?>">
+
+							<button id="sendButton" class="btn btn-default" type="button">
+
+								<?php echo  $this->p->t('ui', 'senden'); ?>
+
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/messageReplySent.php b/application/views/system/messages/htmlMessageSentError.php
similarity index 59%
rename from application/views/system/messages/messageReplySent.php
rename to application/views/system/messages/htmlMessageSentError.php
index 88fc945b0..90191fcf0 100644
--- a/application/views/system/messages/messageReplySent.php
+++ b/application/views/system/messages/htmlMessageSentError.php
@@ -2,12 +2,12 @@
 	$this->load->view(
 		'templates/FHC-Header',
 		array(
-			'title' => 'MessageSent',
+			'title' => 'Message sent failure - Fehler beim Senden der Nachricht',
 			'jquery' => true,
 			'bootstrap' => true,
 			'fontawesome' => true,
 			'sbadmintemplate' => true,
-			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageSent.css')
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
 		)
 	);
 ?>
@@ -20,47 +20,31 @@
 				<div class="row">
 
 					<div class="col-xs-6">
-						<h3 class="page-header text-right">Thank you for getting in touch!</h3>
+						<h3 class="page-header text-right"></h3>
 					</div>
 
 					<div class="col-xs-6">
-						<h3 class="page-header">Danke für die Kontaktaufnahme!</h3>
+						<h3 class="page-header"></h3>
 					</div>
 
 				</div>
 
 				<div class="row">
 					<div class="col-lg-12">
+
 						<div class="panel panel-success">
 							<div class="panel-heading">
 								<div class="row">
 									<div class="col-xs-6 text-right">
-										Message sent successfully!
+										An error occurred while sending your message, please try later.
 									</div>
 									<div class="col-xs-6">
-										Nachricht erfolgreich versandt!
+										Beim Senden Ihrer Nachricht ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.
 									</div>
 								</div>
 							</div>
+
 							<div class="panel-body">
-								<div class="row">
-									<div class="col-xs-6 text-right">
-										<span class="rwd-line">
-											Thank you for your message.
-										</span>
-										<span class="rwd-line">
-											We will get back to you shortly.
-										</span>
-									</div>
-									<div class="col-xs-6">
-										<span class="rwd-line">
-											Herzlichen Dank für Ihre Nachricht.
-										</span>
-										<span class="rwd-line">
-											Wir werden uns schnellstmöglich um Ihr Anliegen kümmern.
-										</span>
-									</div>
-								</div>
 
 								<br>
 
@@ -72,18 +56,12 @@
 										Sie können dieses Fenster schließen.
 									</div>
 								</div>
+
 								<br>
-								<div class="row">
-									<div class="col-xs-6 text-right">
-										Your InfoCenter@FHTW Team
-									</div>
-									<div class="col-xs-6">
-										Ihr InfoCenter@FHTW Team
-									</div>
-								</div>
-								<br>
+
 							</div>
 						</div>
+
 						<div class="row">
 							<div class="col-xs-12 text-center">
 								<p class="signatureblock">
@@ -93,6 +71,7 @@
 								</p>
 							</div>
 						</div>
+
 					</div>
 				</div>
 			</div>
diff --git a/application/views/system/messages/messageSent.php b/application/views/system/messages/htmlMessageSentSuccess.php
similarity index 92%
rename from application/views/system/messages/messageSent.php
rename to application/views/system/messages/htmlMessageSentSuccess.php
index 674ccd5a0..48409a5f4 100644
--- a/application/views/system/messages/messageSent.php
+++ b/application/views/system/messages/htmlMessageSentSuccess.php
@@ -2,12 +2,12 @@
 	$this->load->view(
 		'templates/FHC-Header',
 		array(
-			'title' => 'MessageSent',
+			'title' => 'Message sent successfully - Nachricht erfolgreich versandt!',
 			'jquery' => true,
 			'bootstrap' => true,
 			'fontawesome' => true,
 			'sbadmintemplate' => true,
-			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageSent.css')
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
 		)
 	);
 ?>
@@ -17,11 +17,6 @@
 		<div id="page-wrapper">
 			<div class="container-fluid">
 
-			<?php
-				if ($success)
-				{
-			?>
-
 				<div class="row">
 
 					<div class="col-xs-6">
@@ -79,11 +74,6 @@
 
 					</div>
 				</div>
-
-			<?php
-				}
-			?>
-
 			</div>
 		</div>
 	</div>
diff --git a/application/views/system/messages/messageHTML.php b/application/views/system/messages/htmlRead.php
similarity index 65%
rename from application/views/system/messages/messageHTML.php
rename to application/views/system/messages/htmlRead.php
index 0ae6c3866..5413af9f4 100644
--- a/application/views/system/messages/messageHTML.php
+++ b/application/views/system/messages/htmlRead.php
@@ -1,75 +1,104 @@
-	<?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'MessageSent',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageReply.css')
-		)
-	);
-	?>
-	<body>
-		<div id="wrapper">
-			<div id="page-wrapper">
-				<div class="container-fluid">
-					<div class="row">
-						<div class="col-xs-12">
-							<h3 class="page-header text-center">You have a new message</h3>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-xs-12">
-							<div class="panel panel-success">
-								<div class="panel-heading text-center">
-									<?php echo $message->subject; ?>
-								</div>
-								<div class="panel-body">
-									<table class="table table-condensed table-bordered" id="msgtable" align="center">
-										<tr>
-											<td width="80px">
-												<b>From:</b>
-											</td>
-											<td>
-												<?php echo $sender->vorname.' '.$sender->nachname; ?>
-											</td>
-										</tr>
-										<tr>
-											<td width="80px">
-												<b>Subject:</b>
-											</td>
-											<td>
-												<?php echo $message->subject; ?>
-											</td>
-										</tr>
-										<tr>
-											<td width="80px">
-												<b>Message:</b>
-											</td>
-											<td>
-												<?php echo $message->body; ?>
-											</td>
-										</tr>
-									</table>
-								</div>
-								<div class="panel-footer">
-									<div class="row">
-										<div class="col-xs-12 text-center">
-											<?php if ($isEmployee === false && $href != ''): ?>
-												<button class="btn btn-default" id="replybutton" onclick="location.href='<?php echo $href; ?>';">
-													<i class="fa fa-reply"></i>&nbsp;Reply
-												</button>
-											<?php endif; ?>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<?php $this->load->view("templates/FHC-Footer"); ?>
\ No newline at end of file
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Read message - Lies die Nachricht',
+			'jquery' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'sbadmintemplate' => true,
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
+		)
+	);
+?>
+	<body>
+		<div id="wrapper">
+			<div id="page-wrapper">
+				<div class="container-fluid">
+					<div class="row">
+						<div class="col-xs-12">
+							<h3 class="page-header text-center">
+
+								<?php echo ucfirst($this->p->t('ui', 'newMessage')); ?>:
+
+							</h3>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-xs-12">
+							<div class="panel panel-success">
+								<div class="panel-heading text-center">
+
+									<?php echo $message->subject; ?>
+
+								</div>
+								<div class="panel-body">
+									<table class="table table-condensed table-bordered" id="msgtable" align="center">
+										<tr>
+											<td width="80px">
+												<b>
+
+													<?php echo ucfirst($this->p->t('ui', 'from')); ?>:
+
+												</b>
+											</td>
+											<td>
+
+												<?php echo $sender->vorname.' '.$sender->nachname; ?>
+
+											</td>
+										</tr>
+										<tr>
+											<td width="80px">
+												<b>
+
+													<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+												</b>
+											</td>
+											<td>
+
+												<?php echo $message->subject; ?>
+
+											</td>
+										</tr>
+										<tr>
+											<td width="80px">
+												<b>
+
+													<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+												</b>
+											</td>
+											<td>
+
+												<?php echo $message->body; ?>
+
+											</td>
+										</tr>
+									</table>
+								</div>
+								<div class="panel-footer">
+									<div class="row">
+										<div class="col-xs-12 text-center">
+
+											<?php if (!isEmptyString($hrefReply)): ?>
+
+												<button class="btn btn-default" id="replybutton" onclick="location.href='<?php echo $hrefReply; ?>';">
+													<i class="fa fa-reply"></i>&nbsp;<?php echo ucfirst($this->p->t('global', 'reply')); ?>
+												</button>
+
+											<?php endif; ?>
+
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
new file mode 100644
index 000000000..fa3390bfa
--- /dev/null
+++ b/application/views/system/messages/htmlWriteReply.php
@@ -0,0 +1,93 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Reply to a message',
+			'jquery' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'tinymce' => true,
+			'sbadmintemplate' => true,
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWriteReply.js')
+		)
+	);
+?>
+	<body>
+		<div id="wrapper">
+			<div id="page-wrapper">
+				<div class="container-fluid">
+					<div class="row">
+						<div class="col-lg-12">
+							<h3 class="page-header">
+
+								<?php echo ucfirst($this->p->t('ui', 'nachrichtSenden')); ?>
+
+							</h3>
+						</div>
+					</div>
+					<form id="sendForm" method="post" action="<?php echo site_url('system/messages/ViewMessage/sendReply'); ?>">
+						<div class="row">
+							<div class="form-group">
+								<div class="col-lg-1 msgfieldcol-left">
+									<label>
+
+										<?php echo ucfirst($this->p->t('global', 'empfaenger')); ?>:
+
+									</label>
+								</div>
+								<div class="col-lg-11 msgfieldcol-right">
+
+									<?php echo $receiver; ?>
+
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="form-group">
+								<div class="col-lg-1 msgfield msgfieldcol-left">
+									<label>
+
+										<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+									</label>
+								</div>
+								&nbsp;
+								<div class="col-lg-7">
+									<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>" name="subject">
+								</div>
+							</div>
+						</div>
+						<br>
+						<div class="row">
+							<div class="col-lg-12">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+								</label>
+								<textarea id="bodyTextArea" name="body"><?php echo $body; ?></textarea>
+							</div>
+						</div>
+						<br>
+						<div class="row">
+							<div class="col-lg-12 text-right">
+								<button id="sendButton" class="btn btn-default" type="button">
+
+									<?php echo $this->p->t('ui', 'senden'); ?>
+
+								</button>
+							</div>
+						</div>
+
+						<input type="hidden" name="receiver_id" value="<?php echo $receiver_id; ?>">
+						<input type="hidden" name="relationmessage_id" value="<?php echo $relationmessage_id; ?>">
+						<input type="hidden" name="token" value="<?php echo $token; ?>">
+
+					</form>
+				</div>
+			</div>
+		</div>
+	</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
new file mode 100644
index 000000000..b6876dc91
--- /dev/null
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -0,0 +1,170 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Write a new message or reply using templates',
+			'jquery' => true,
+			'jqueryui' => true,
+			'bootstrap' => true,
+			'ajaxlib' => true,
+			'fontawesome' => true,
+			'tinymce' => true,
+			'sbadmintemplate' => true,
+			'dialoglib' => true,
+			'widgets' => true,
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWrite.js')
+		)
+	);
+?>
+<body>
+	<div id="wrapper">
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+
+							<?php echo ucfirst($this->p->t('ui', 'nachrichtSenden')); ?>
+
+						</h3>
+					</div>
+				</div>
+				<form id="sendForm" method="post" action="<?php echo site_url('/system/messages/Messages/sendImplicitTemplate'); ?>">
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'empfaenger')); ?>:
+
+								</label>
+							</div>
+							<div class="col-lg-11 msgfieldcol-right">
+								<?php echo $recipientsList; ?>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfield msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+								</label>
+							</div>
+							&nbsp;
+							<div class="col-lg-7">
+								<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>" name="subject">
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-9">
+							<label>
+
+								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+							</label>
+							<textarea id="bodyTextArea" name="body">
+
+								<?php echo $body; ?>
+
+							</textarea>
+						</div>
+						<div class="col-lg-3">
+							<div class="form-group">
+								<label>
+
+									<?php echo ucfirst($this->p->t('ui', 'felder')); ?>:
+
+								</label>
+
+								<?php
+									echo $this->widgetlib->widget(
+										'MultipleDropdown_widget',
+										array('elements' => success($variables)),
+										array(
+											'name' => 'variables[]',
+											'id' => 'variables',
+											'size' => 27,
+											'multiple' => true
+										)
+									);
+								?>
+
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-xs-3">
+
+							<?php
+								echo $this->widgetlib->widget(
+									'Vorlage_widget',
+									array('oe_kurzbz' => $organisationUnits, 'isAdmin' => $senderIsAdmin),
+									array('name' => 'vorlage', 'id' => 'vorlageDnD')
+								);
+							?>
+
+						</div>
+						<div class="col-lg-7 col-xs-9 text-right">
+							<button id="sendButton" class="btn btn-default" type="button">
+
+								<?php echo $this->p->t('ui', 'senden'); ?>
+
+							</button>
+						</div>
+					</div>
+						<hr>
+						<div class="row">
+							<div class="col-lg-12">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'vorschau')); ?>:
+
+								</label>
+							</div>
+						</div>
+						<div class="well" id="templatePreviewDiv">
+							<div class="row">
+								<div class="col-sm-12" style="display: inline">
+									<div class="form-group form-inline">
+										<div class="input-group">
+										<?php
+											echo $this->widgetlib->widget(
+												'Dropdown_widget',
+												array('elements' => success($recipientsArray), 'emptyElement' => ucfirst($this->p->t('global', 'empfaenger')).'...'),
+												array(
+													'name' => 'recipients[]',
+													'id' => 'recipients'
+												)
+											);
+										?>
+											<span class="input-group-btn">
+												<a class="btn btn-default" href="#templatePreviewDiv" id="refresh">
+													<?php echo ucfirst($this->p->t('ui', 'refresh')); ?>
+												</a>
+											</span>
+										</div>
+									</div>
+								</div>
+							</div>
+							<br>
+							<textarea id="tinymcePreview"></textarea>
+						</div>
+
+					<?php echo $recipients_ids; ?>
+					<?php echo $relationmessage_id; ?>
+					<?php echo $type; ?>
+
+				</form>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/messageForm.php b/application/views/system/messages/messageForm.php
deleted file mode 100644
index d1436a492..000000000
--- a/application/views/system/messages/messageForm.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class="row">
-	<div class="form-group">
-		<div class="col-lg-1 msgfieldcol-left">
-			<label>Receiver:</label>
-		</div>
-		<div class="col-lg-11 msgfieldcol-right">
-			<?php
-			for ($i = 0; $i < count($receivers); $i++)
-			{
-				$receiver = $receivers[$i];
-				// Every 10 recipients a new line
-				if ($i > 1 && $i % 10 == 0)
-				{
-					echo '<br>';
-				}
-				echo $receiver->Vorname." ".$receiver->Nachname."; ";
-			}
-			?>
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="form-group">
-		<div class="col-lg-1 msgfield msgfieldcol-left">
-			<label>Subject:</label>
-		</div>&nbsp;
-		<?php
-		$subject = '';
-		if (isset($message))
-		{
-			$subject = 'Re: '.$message->subject;
-		}
-		?>
-		<div class="col-lg-7">
-			<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>"
-				   name="subject">
-		</div>
-	</div>
-</div>
-<br>
-<div class="row">
-	<div class="col-lg-<?php echo isset($variables) ? 10 : 12 ?>">
-		<label>Message:</label>
-		<?php
-		$body = '';
-		if (isset($message))
-		{
-			if (isset($receivers[0]))
-				$body .= '<p></p><p></p><blockquote><i>On '.date_format(date_create($message->sent), 'd.m.Y H:i').' '.$receivers[0]->Vorname.' '.$receivers[0]->Nachname.' wrote:'.'</i></blockquote>';
-			$body .= '<blockquote style="border-left:2px solid; padding-left: 8px">';
-			$body .= $message->body.'</blockquote>';
-		}
-		?>
-		<textarea id="bodyTextArea" name="body"><?php echo $body; ?></textarea>
-	</div>
-	<?php
-	if (isset($variables)):
-		?>
-		<div class="col-lg-2">
-			<div class="form-group">
-				<label>Fields:</label>
-				<select id="variables" class="form-control" size="14" multiple="multiple">
-					<?php
-					foreach ($variables as $key => $val)
-					{
-						?>
-						<option value="<?php echo $key; ?>"><?php echo $val; ?></option>
-						<?php
-					}
-					?>
-				</select>
-			</div>
-		</div>
-	<?php endif; ?>
-</div>
-<br>
-<div class="row">
-	<div class="col-lg-<?php echo isset($variables) ? 10 : 12 ?> text-right">
-		<button id="sendButton" class="btn btn-default" type="button">Send</button>
-	</div>
-</div>
\ No newline at end of file
diff --git a/application/views/system/messages/messageWrite.php b/application/views/system/messages/messageWrite.php
deleted file mode 100644
index 93caaf861..000000000
--- a/application/views/system/messages/messageWrite.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => 'Write a message',
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'ajaxlib' => true,
-		'fontawesome' => true,
-		'tinymce' => true,
-		'sbadmintemplate' => true,
-		'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageWrite.css'),
-		'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWrite.js')
-	)
-);
-?>
-<body>
-	<div id="wrapper">
-		<div id="page-wrapper">
-			<div class="container-fluid">
-				<div class="row">
-					<div class="col-lg-12">
-						<h3 class="page-header"><?php echo ucfirst($this->p->t('ui', 'nachrichtSenden')); ?></h3>
-					</div>
-				</div>
-				<form id="sendForm" method="post" action="<?php echo site_url('/system/Messages/send'); ?>">
-					<div class="row">
-						<div class="form-group">
-							<div class="col-lg-1 msgfieldcol-left">
-								<label><?php echo ucfirst($this->p->t('global', 'empfaenger')).':'; ?></label>
-							</div>
-							<div class="col-lg-11 msgfieldcol-right">
-								<?php
-									for ($i = 0; $i < count($recipients); $i++)
-									{
-										$receiver = $recipients[$i];
-										// Every 10 recipients a new line
-										if ($i > 1 && $i % 10 == 0)
-										{
-											echo '<br>';
-										}
-										echo $receiver->Vorname." ".$receiver->Nachname."; ";
-									}
-								?>
-							</div>
-						</div>
-					</div>
-					<div class="row">
-						<div class="form-group">
-							<div class="col-lg-1 msgfield msgfieldcol-left">
-								<label><?php echo ucfirst($this->p->t('global', 'betreff')).':'; ?></label>
-							</div>&nbsp;
-							<?php
-								$subject = '';
-								if (isset($message))
-								{
-									$subject = 'Re: '.$message->subject;
-								}
-							?>
-							<div class="col-lg-7">
-								<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>" name="subject">
-							</div>
-						</div>
-					</div>
-					<br>
-					<div class="row">
-						<div class="col-lg-10">
-							<label><?php echo ucfirst($this->p->t('global', 'nachricht')).':'; ?></label>
-							<?php
-								$body = '';
-								if (isset($message))
-								{
-									$body = $message->body;
-								}
-							?>
-							<textarea id="bodyTextArea" name="body"><?php echo $body; ?></textarea>
-						</div>
-						<?php
-							if (isset($variables))
-							{
-						?>
-								<div class="col-lg-2">
-									<div class="form-group">
-										<label><?php echo ucfirst($this->p->t('ui', 'felder')).':'; ?></label>
-										<select id="variables" class="form-control" size="14" multiple="multiple">
-											<?php
-												foreach ($variables as $key => $val)
-												{
-											?>
-													<option value="<?php echo $key; ?>"><?php echo $val; ?></option>
-											<?php
-												}
-											?>
-										</select>
-									</div>
-								</div>
-						<?php
-							}
-						?>
-					</div>
-					<br>
-					<div class="row">
-						<div class="col-xs-3">
-							<?php
-								echo $this->widgetlib->widget(
-									'Vorlage_widget',
-									array('oe_kurzbz' => $oe_kurzbz, 'isAdmin' => $isAdmin),
-									array('name' => 'vorlage', 'id' => 'vorlageDnD')
-								);
-							?>
-						</div>
-						<div class="col-lg-7 col-xs-9 text-right">
-							<button id="sendButton" class="btn btn-default" type="button"><?php echo  $this->p->t('ui', 'senden'); ?></button>
-						</div>
-					</div>
-					<?php
-						if (isset($recipients) && count($recipients) > 0)
-						{
-					?>
-							<hr>
-							<div class="row">
-								<div class="col-lg-12">
-									<label><?php echo ucfirst($this->p->t('global', 'vorschau')).':'; ?></label>
-								</div>
-							</div>
-							<div class="well">
-								<div class="row">
-									<div class="col-lg-5">
-										<div class="form-grop form-inline">
-											<label><?php echo ucfirst($this->p->t('global', 'empfaenger')).': '; ?></label>
-											<select id="recipients">
-												<?php
-													if (count($recipients) > 1) echo '<option value="-1">Select...</option>';
-
-													foreach ($recipients as $receiver)
-													{
-												?>
-														<option value="<?php echo $receiver->person_id; ?>">
-															<?php echo $receiver->Vorname." ".$receiver->Nachname; ?>
-														</option>
-												<?php
-													}
-												?>
-											</select>
-											&nbsp;
-											<strong><a href="#" id="refresh">Refresh</a></strong>
-										</div>
-									</div>
-									<div class="col-lg-2">
-
-									</div>
-								</div>
-								<br>
-								<textarea id="tinymcePreview"></textarea>
-							</div>
-					<?php
-						}
-					?>
-
-					<?php
-						foreach ($recipients as $receiver)
-						{
-							echo '<input type="hidden" name="persons[]" value="'.$receiver->person_id.'">'."\n";
-						}
-					?>
-
-					<?php
-						if (isset($message))
-						{
-					?>
-							<input type="hidden" name="relationmessage_id" value="<?php echo $message->message_id; ?>">
-					<?php
-						}
-					?>
-
-				</form>
-			</div>
-		</div>
-	</div>
-</body>
-
-<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/messageWriteReply.php b/application/views/system/messages/messageWriteReply.php
deleted file mode 100644
index 344871b2d..000000000
--- a/application/views/system/messages/messageWriteReply.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => 'MessageReply',
-		'jquery' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'tinymce' => true,
-		'sbadmintemplate' => true,
-		'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageWrite.css'),
-		'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWriteReply.js')
-	)
-);
-?>
-<body>
-	<?php
-		$href = site_url('/ViewMessage/sendReply');
-	?>
-	<div id="wrapper">
-		<div id="page-wrapper">
-			<div class="container-fluid">
-				<div class="row">
-					<div class="col-lg-12">
-						<h3 class="page-header">Send message</h3>
-					</div>
-				</div>
-				<form id="sendForm" method="post" action="<?php echo $href; ?>">
-					<?php
-						$this->load->view('system/messages/messageForm.php');
-
-						for ($i = 0; $i < count($receivers); $i++)
-						{
-							$receiver = $receivers[$i];
-							$receiverid = $receiver->person_id;
-							$fieldname = 'persons[]';
-
-							echo '<input type="hidden" name="'.$fieldname.'" value="'.$receiverid.'">'."\n";
-						}
-					?>
-
-					<?php
-						if (isset($message))
-						{
-					?>
-								<input type="hidden" name="relationmessage_id" value="<?php echo $message->message_id; ?>">
-					<?php
-						}
-						if (isset($token))
-						{
-					?>
-								<input type="hidden" name="token" value="<?php echo $token; ?>">
-					<?php
-						}
-					?>
-
-				</form>
-			</div>
-		</div>
-	</div>
-</body>
-
-<?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/phrases/phrases.php b/application/views/system/phrases/phrases.php
index 2409fcc83..f884cd04e 100644
--- a/application/views/system/phrases/phrases.php
+++ b/application/views/system/phrases/phrases.php
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html lang="de_AT">
-
-<head>
-	<title>VileSci - Phrasen</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-
-<frameset rows="30%,*">
-  	<frame src="Phrases/table" id="PhrasesTop" name="PhrasesTop" frameborder="0" />
-  	<frame src="Phrases/edit" id="PhrasesBottom" name="PhrasesBottom" frameborder="0" />
-	<noframes>
-		<body bgcolor="#FFFFFF">
-			This application works only with a frames-enabled browser.<br />
-			<a href="PhrasesList">Use without frames</a>
-		</body>
-	</noframes>
-</frameset>
-
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
+<html lang="de_AT">
+
+<head>
+	<title>VileSci - Phrasen</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+
+<frameset rows="30%,*">
+  	<frame src="Phrases/table" id="PhrasesTop" name="PhrasesTop" frameborder="0" />
+  	<frame src="Phrases/edit" id="PhrasesBottom" name="PhrasesBottom" frameborder="0" />
+	<noframes>
+		<body bgcolor="#FFFFFF">
+			This application works only with a frames-enabled browser.<br />
+			<a href="PhrasesList">Use without frames</a>
+		</body>
+	</noframes>
+</frameset>
+
+</html>
diff --git a/application/views/system/phrases/phrasesEdit.php b/application/views/system/phrases/phrasesEdit.php
index d967dee83..19710b957 100644
--- a/application/views/system/phrases/phrasesEdit.php
+++ b/application/views/system/phrases/phrasesEdit.php
@@ -1,17 +1,17 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'PhrasesEdit'));
-?>
-<div class="row">
-	<div class="span4">
-	  <h2>Phrase: <?php echo $phrase->phrase_id; ?></h2>
-<form method="post" action="../save">
-	Bezeichnung: <input type="text" name="phrase" value="<?php echo $phrase->phrase; ?>" />
-	<input type="hidden" name="phrase_id" value="<?php echo $phrase->phrase_id; ?>" />
-	<button type="submit">Save</button>
-</form>
-
-</div>
-</div>
-
-</body>
-</html>
+<?php
+	$this->load->view('templates/header', array('title' => 'PhrasesEdit'));
+?>
+<div class="row">
+	<div class="span4">
+	  <h2>Phrase: <?php echo $phrase->phrase_id; ?></h2>
+<form method="post" action="../save">
+	Bezeichnung: <input type="text" name="phrase" value="<?php echo $phrase->phrase; ?>" />
+	<input type="hidden" name="phrase_id" value="<?php echo $phrase->phrase_id; ?>" />
+	<button type="submit">Save</button>
+</form>
+
+</div>
+</div>
+
+</body>
+</html>
diff --git a/application/views/system/phrases/phrasesinhaltList.php b/application/views/system/phrases/phrasesinhaltList.php
index f212d440f..5f496a503 100644
--- a/application/views/system/phrases/phrasesinhaltList.php
+++ b/application/views/system/phrases/phrasesinhaltList.php
@@ -1,54 +1,54 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'PhrasenInhaltList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '5:{sorter:false}'));
-?>
-
-<div class="row">
-  <div class="span4">
-	<h2>Phrase Inhalt - <?php echo $phrase; ?></h2>
-	<form method="post" action="../newText" target="PhrasesBottom">
-	  <input type="hidden" name="phrase_id" value="<?php echo $phrase_id; ?>"/>
-	  <button type="submit">Neu</button>
-	</form>
-
-	<table id="t1" class="tablesorter">
-	  <thead>
-		<tr><th class='table-sortable:default'>ID</th>
-			<th class='table-sortable:default'>Sprache</th>
-			<th class='table-sortable:default'>OrgEinheit</th>
-			<th class='table-sortable:default'>OrgForm</th>
-			<th class='table-sortable:default'>Text</th>
-			<th>Beschreibung</th>
-			<th></th>
-			<th></th>
-		</tr>
-	  </thead>
-	  <tbody>
-		<?php foreach ($phrase_inhalt as $v): ?>
-			<tr><td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom"><?php echo $v->phrasentext_id; ?></a></td>
-				<td><?php echo $v->sprache; ?></td>
-				<td><?php echo $v->orgeinheit_kurzbz; ?></td>
-				<td><?php echo $v->orgform_kurzbz; ?></td>
-				<td><?php echo $v->text; ?></td>
-				<td><?php echo $v->description; ?></td>
-				<td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom">edit</a></td>
-				<td>
-					<a href="javascript:void(0);" onclick="delPhrasentext(<?php echo $v->phrasentext_id; ?>, <?php echo $phrase_id; ?>)">delete</a>
-				</td>
-			</tr>
-		<?php endforeach ?>
-	  </tbody>
-	</table>
-  </div>
-</div>
-<script>
-function delPhrasentext(id,pid)
-{
-	var c = confirm("Wirklich löschen?");
-	if (c == true)
-		window.location.href = "../deltext/"+id+"/"+pid;
-}
-</script>
-
-<?php
-	$this->load->view('templates/footer');
-?>
+<?php
+	$this->load->view('templates/header', array('title' => 'PhrasenInhaltList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '5:{sorter:false}'));
+?>
+
+<div class="row">
+  <div class="span4">
+	<h2>Phrase Inhalt - <?php echo $phrase; ?></h2>
+	<form method="post" action="../newText" target="PhrasesBottom">
+	  <input type="hidden" name="phrase_id" value="<?php echo $phrase_id; ?>"/>
+	  <button type="submit">Neu</button>
+	</form>
+
+	<table id="t1" class="tablesorter">
+	  <thead>
+		<tr><th class='table-sortable:default'>ID</th>
+			<th class='table-sortable:default'>Sprache</th>
+			<th class='table-sortable:default'>OrgEinheit</th>
+			<th class='table-sortable:default'>OrgForm</th>
+			<th class='table-sortable:default'>Text</th>
+			<th>Beschreibung</th>
+			<th></th>
+			<th></th>
+		</tr>
+	  </thead>
+	  <tbody>
+		<?php foreach ($phrase_inhalt as $v): ?>
+			<tr><td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom"><?php echo $v->phrasentext_id; ?></a></td>
+				<td><?php echo $v->sprache; ?></td>
+				<td><?php echo $v->orgeinheit_kurzbz; ?></td>
+				<td><?php echo $v->orgform_kurzbz; ?></td>
+				<td><?php echo $v->text; ?></td>
+				<td><?php echo $v->description; ?></td>
+				<td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom">edit</a></td>
+				<td>
+					<a href="javascript:void(0);" onclick="delPhrasentext(<?php echo $v->phrasentext_id; ?>, <?php echo $phrase_id; ?>)">delete</a>
+				</td>
+			</tr>
+		<?php endforeach ?>
+	  </tbody>
+	</table>
+  </div>
+</div>
+<script>
+function delPhrasentext(id,pid)
+{
+	var c = confirm("Wirklich löschen?");
+	if (c == true)
+		window.location.href = "../deltext/"+id+"/"+pid;
+}
+</script>
+
+<?php
+	$this->load->view('templates/footer');
+?>
diff --git a/application/views/system/vorlage/templates.php b/application/views/system/vorlage/templates.php
index c2130c267..7767962ce 100644
--- a/application/views/system/vorlage/templates.php
+++ b/application/views/system/vorlage/templates.php
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html lang="de_AT">
-
-<head>
-	<title>VileSci - Vorlage</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-
-<frameset rows="30%,*">
-  	<frame src="Vorlage/table" id="VorlageTop" name="VorlageTop" frameborder="0" />
-  	<frame src="Vorlage/edit" id="VorlageBottom" name="VorlageBottom" frameborder="0" />
-	<noframes>
-		<body bgcolor="#FFFFFF">
-			This application works only with a frames-enabled browser.<br />
-			<a href="VorlageList">Use without frames</a>
-		</body>
-	</noframes>
-</frameset>
-
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
+<html lang="de_AT">
+
+<head>
+	<title>VileSci - Vorlage</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+
+<frameset rows="30%,*">
+  	<frame src="Vorlage/table" id="VorlageTop" name="VorlageTop" frameborder="0" />
+  	<frame src="Vorlage/edit" id="VorlageBottom" name="VorlageBottom" frameborder="0" />
+	<noframes>
+		<body bgcolor="#FFFFFF">
+			This application works only with a frames-enabled browser.<br />
+			<a href="VorlageList">Use without frames</a>
+		</body>
+	</noframes>
+</frameset>
+
+</html>
diff --git a/application/views/system/vorlage/templatetextPreview.php b/application/views/system/vorlage/templatetextPreview.php
index 2f53868a9..1f5b6948d 100644
--- a/application/views/system/vorlage/templatetextPreview.php
+++ b/application/views/system/vorlage/templatetextPreview.php
@@ -1,3 +1,3 @@
-<?php
-	echo $text;
+<?php
+	echo $text;
 ?>
\ No newline at end of file
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 3c1327d5f..5eec10f43 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -18,6 +18,7 @@
 	$addons = isset($addons) ? $addons : false;
 	$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
 	$bootstrap = isset($bootstrap) ? $bootstrap : false;
+	$captcha = isset($captcha) ? $captcha : false;
 	$dialoglib = isset($dialoglib) ? $dialoglib : false;
 	$filterwidget = isset($filterwidget) ? $filterwidget : false;
 	$fontawesome = isset($fontawesome) ? $fontawesome : false;
@@ -33,6 +34,7 @@
 	$tablewidget = isset($tablewidget) ? $tablewidget : false;
 	$tabulator = isset($tabulator) ? $tabulator : false;
 	$tinymce = isset($tinymce) ? $tinymce : false;
+	$widgets = isset($widgets) ? $widgets : false;
 ?>
 
 <!-- Header start -->
@@ -63,10 +65,7 @@
 			if ($fontawesome === true) generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
 
 			// PivotUI CSS
-			if ($pivotui === true)
-			{
-				generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
-			}
+			if ($pivotui === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
 
 			// SB Admin 2 template CSS
 			if ($sbadmintemplate === true)
@@ -75,6 +74,9 @@
 				generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
 			}
 
+			// Securimage CSS
+			if ($captcha === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
+
 			// Table sorter CSS
 			if ($tablesorter === true)
 			{
@@ -89,6 +91,9 @@
 				generateCSSsInclude('public/css/Tabulator.css');
 			}
 
+			// Tinymce CSS
+			if ($tinymce === true) generateCSSsInclude('public/css/TinyMCE.css');
+
 			// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
@@ -104,9 +109,13 @@
 			// NavigationWidget CSS
 			if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
 
+			// HTML Widget CSS
+			if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
+
 			// Eventually required CSS
 			generateCSSsInclude($customCSSs); // Eventually required CSS
 
+
 			// --------------------------------------------------------------------------------------------------------
 			// Javascripts
 
@@ -132,19 +141,28 @@
 			}
 
 			// jQuery checkboxes
-			if ($jquerycheckboxes === true)
-			{
-				generateJSsInclude('vendor/rmariuzzo/jquery-checkboxes/dist/jquery.checkboxes-1.0.7.min.js');
-			}
-
-			// Bootstrap JS
-			if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
-
+			// NOTE: keep it after jQuery includes
+			if ($jquerycheckboxes === true) generateJSsInclude('vendor/rmariuzzo/jquery-checkboxes/dist/jquery.checkboxes-1.0.7.min.js');
 			// jQuery treetable
 			// NOTE: keep it after jQuery includes
 			if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');
 
-			// MomentJS
+			// Bootstrap JS
+			if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
+
+			// SB Admin 2 template JS
+			if ($sbadmintemplate === true)
+			{
+				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
+				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
+				generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
+				generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
+			}
+
+			// Securimage JS
+			if ($captcha === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js');
+
+			// Moment JS
 			if ($momentjs === true)
 			{
 				generateJSsInclude('vendor/moment/momentjs/min/moment.min.js');
@@ -152,11 +170,8 @@
 				generateJSsInclude('vendor/moment/momentjs/locale/en-ie.js');
 			}
 
-			// PivotUI CSS
-			if ($pivotui === true)
-			{
-				generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js');
-			}
+			// PivotUI JS
+			if ($pivotui === true) generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js');
 
 			// Table sorter JS
 			if ($tablesorter === true)
@@ -176,15 +191,6 @@
 			// Tinymce JS
 			if ($tinymce === true) generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js');
 
-			// SB Admin 2 template JS
-			if ($sbadmintemplate === true)
-			{
-				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
-				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
-				generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
-				generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
-			}
-
 			// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
index 063351e07..fa2cc127a 100644
--- a/application/views/templates/header.php
+++ b/application/views/templates/header.php
@@ -18,28 +18,26 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
 !isset($widgetsCSS) ? $widgetsCSS = false : $widgetsCSS = $widgetsCSS;
 !isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
 
-if ($tablesort || $jquery_checkboxes || $jquery_custom)
-	$jqueryV1 = true;
+if ($tablesort || $jquery_checkboxes || $jquery_custom) $jqueryV1 = true;
 
-if($datepicker)
-	$jqueryui = true;
+if($datepicker) $jqueryui = true;
 
-if($jqueryui)
-	$jqueryV2 = true;
+if($jqueryui) $jqueryV2 = true;
 
-if($jqueryV1 && $jqueryV2)
-	show_error("Two JQuery versions used: composer and include folder version");
+if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and include folder version");
 
 ?>
+
 <!DOCTYPE HTML>
 <html>
 <head>
 	<title><?php echo $title; ?></title>
 	<meta charset="UTF-8">
 	<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url('skin/images/Vilesci.ico'); ?>" />
-	<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/vilesci.css'); ?>" />
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/vilesci.css'); ?>" />
+
 <?php if($tablesort) : ?>
-	<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/tablesort.css'); ?>" />
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/tablesort.css'); ?>" />
 <?php endif ?>
 
 <?php if($jqueryV1) : ?>
@@ -62,7 +60,7 @@ if($jqueryV1 && $jqueryV2)
 <?php endif ?>
 
 <?php if($jquery_custom) : ?>
-	<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/jquery-ui-1.9.2.custom.min.css'); ?>" />
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/jquery-ui-1.9.2.custom.min.css'); ?>" />
 <?php endif ?>
 
 <?php if($tablesort && !empty($tableid)) : ?>
@@ -99,17 +97,21 @@ if($jqueryV1 && $jqueryV2)
 <?php if($tinymce) : ?>
 	<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
 <?php endif ?>
+
 <?php if($textile) : ?>
 	<script type="text/javascript" src="<?php echo base_url('vendor/borgar/textile-js/lib/textile.min.js');?>"></script>
 <?php endif ?>
+
 <?php if($jsoneditor) : ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.css');?>" />
 	<script type="text/javascript" src="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.js');?>"></script>
 <?php endif ?>
+
 <?php if($jsonforms) : ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/json-forms/dist/css/brutusin-json-forms.min.css'); ?>" />
 	<script type="text/javascript" src="<?php echo base_url('vendor/json-forms/dist/js/brutusin-json-forms.min.js'); ?>"></script>
 <?php endif ?>
+
 <?php if($widgetsCSS) : ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/widgets.css'); ?>" />
 <?php endif ?>
diff --git a/application/views/templates/mailHTML.php b/application/views/templates/mailHTML.php
index c2e072f68..32d544c5a 100644
--- a/application/views/templates/mailHTML.php
+++ b/application/views/templates/mailHTML.php
@@ -1,12 +1,12 @@
 <html>
 	<head>
-		<title>This is not the email template, this is a tribute</title>
+		<title>Notification of personal message reception</title>
 	</head>
 	<body>
 		<div class="container">
-			<h2>Neue Nachricht vorhanden</h2>
+			<h2>A new message is available</h2>
 			<div class="body">
-				<a href="{href}">Klicken Sie hier, um die Nachricht anzuzeigen</a>
+				<a href="{href}">Click here to view the message</a>
 			</div>
 		</div>
 	</body>
diff --git a/application/views/templates/mailTXT.php b/application/views/templates/mailTXT.php
index cd55aeb06..09634e6ae 100644
--- a/application/views/templates/mailTXT.php
+++ b/application/views/templates/mailTXT.php
@@ -1,3 +1,7 @@
-Follow the following link to read the message.
+Notification of personal message reception
 
-{href}
\ No newline at end of file
+A new message is available
+
+Click here to view the message
+
+{href}
diff --git a/application/views/templates/vilesci.php b/application/views/templates/vilesci.php
index 0d55734c7..4f54a9dc8 100644
--- a/application/views/templates/vilesci.php
+++ b/application/views/templates/vilesci.php
@@ -1,42 +1,42 @@
-<!doctype html>
-<html>
-<head>
-    <title><?php echo $this->template->title->default("Default title"); ?></title>
-    <meta charset="utf-8">
-    <meta name="description" content="<?php echo $this->template->description; ?>">
-    <meta name="author" content="">
-    <?php echo $this->template->meta; ?>
-    <?php echo $this->template->stylesheet; ?>
-</head>
-<body>
-
-<?php 
-    // This is an example to show that you can load stuff from inside the template file
-    echo $this->template->widget("navigation", array('title' => 'Project name'));
-?>
-
-<div class="container" style="margin-top: 60px;">
-
-  <?php
-    // This is the main content partial
-    echo $this->template->content;
-  ?>
-
-  <hr>
-
-  <footer>
-    <p>
-        <?php 
-            // Show the footer partial, and prepend copyright message
-            echo $this->template->footer->prepend("&copy; Special Company 2012 - ");
-        ?>
-    </p>
-  </footer>
-
-</div>
-
-<script src="//code.jquery.com/jquery-latest.min.js"></script>
-<?php echo $this->template->javascript; ?>
-
-</body>
+<!doctype html>
+<html>
+<head>
+    <title><?php echo $this->template->title->default("Default title"); ?></title>
+    <meta charset="utf-8">
+    <meta name="description" content="<?php echo $this->template->description; ?>">
+    <meta name="author" content="">
+    <?php echo $this->template->meta; ?>
+    <?php echo $this->template->stylesheet; ?>
+</head>
+<body>
+
+<?php 
+    // This is an example to show that you can load stuff from inside the template file
+    echo $this->template->widget("navigation", array('title' => 'Project name'));
+?>
+
+<div class="container" style="margin-top: 60px;">
+
+  <?php
+    // This is the main content partial
+    echo $this->template->content;
+  ?>
+
+  <hr>
+
+  <footer>
+    <p>
+        <?php 
+            // Show the footer partial, and prepend copyright message
+            echo $this->template->footer->prepend("&copy; Special Company 2012 - ");
+        ?>
+    </p>
+  </footer>
+
+</div>
+
+<script src="//code.jquery.com/jquery-latest.min.js"></script>
+<?php echo $this->template->javascript; ?>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php
index c1bdbf5c8..d9faf1978 100644
--- a/application/views/widgets/dropdown.php
+++ b/application/views/widgets/dropdown.php
@@ -11,7 +11,7 @@
 						$align = "valign-top";
 					}
 			?>
-				<div class="div-cell width-150px <?php echo $align; ?>">
+				<div class="div-cell <?php echo $align; ?>">
 					<label
 						for="<?php echo ${HTMLWidget::HTML_ARG_NAME}[HTMLWidget::HTML_ID]; ?>"
 						<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::REQUIRED); ?>
@@ -22,7 +22,7 @@
 			<?php
 				}
 			?>
-			<div class="div-cell width-150px">
+			<div class="div-cell">
 				<select
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_ID); ?>
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_NAME); ?>
@@ -37,11 +37,11 @@
 					<?php
 						$elements = ${DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME};
 						$selectedElements = ${DropdownWidget::SELECTED_ELEMENT};
-						
+
 						foreach($elements as $element)
 						{
 							$selected = '';
-							
+
 							if (is_array($selectedElements))
 							{
 								foreach($selectedElements as $selectedElement)
@@ -71,4 +71,4 @@
 		</div>
 	</div>
 
-<?php HTMLWidget::printEndBlock(${HTMLWidget::HTML_ARG_NAME}); ?>
\ No newline at end of file
+<?php HTMLWidget::printEndBlock(${HTMLWidget::HTML_ARG_NAME}); ?>
diff --git a/application/widgets/Dropdown_widget.php b/application/widgets/Dropdown_widget.php
new file mode 100644
index 000000000..7d275cc2f
--- /dev/null
+++ b/application/widgets/Dropdown_widget.php
@@ -0,0 +1,19 @@
+<?php
+
+class Dropdown_widget extends DropdownWidget
+{
+	public function display($widgetData)
+	{
+		$elements = $widgetData['elements'];
+		$emptyElement = $widgetData['emptyElement'];
+
+		$this->setElementsArray(
+			$elements,
+			true,
+			$emptyElement,
+			'No data present'
+		);
+
+		$this->loadDropDownView($widgetData);
+	}
+}
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index f02fb7950..1cef91c15 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -188,7 +188,7 @@ class FilterWidget extends Widget
 		$this->_datasetName = null;
 		$this->_filterKurzbz = null;
 		$this->_filterId = null;
-		$this->_reloadDataset = null;
+		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_query = null;
 		$this->_additionalColumns = null;
 		$this->_columnsAliases = null;
diff --git a/application/widgets/MultipleDropdown_widget.php b/application/widgets/MultipleDropdown_widget.php
new file mode 100644
index 000000000..bef5c15b1
--- /dev/null
+++ b/application/widgets/MultipleDropdown_widget.php
@@ -0,0 +1,20 @@
+<?php
+
+class MultipleDropdown_widget extends DropdownWidget
+{
+	public function display($widgetData)
+	{
+		$elements = $widgetData['elements'];
+
+		$this->setElementsArray(
+			$elements,
+			false,
+			'',
+			'No data present'
+		);
+
+		$this->setMultiple();
+
+		$this->loadDropDownView($widgetData);
+	}
+}
diff --git a/application/widgets/Nation_widget.php b/application/widgets/Nation_widget.php
index c99ac9fef..94a028ba7 100644
--- a/application/widgets/Nation_widget.php
+++ b/application/widgets/Nation_widget.php
@@ -1,21 +1,21 @@
-<?php
-
-class Nation_widget extends DropdownWidget
-{
-	public function display($widgetData)
-	{
-		// Nation
-		$this->load->model('codex/Nation_model', 'NationModel');
-		$this->NationModel->addOrder('nation_code');
-
-		$this->addSelectToModel($this->NationModel, 'nation_code', 'kurztext');
-
-		$this->setElementsArray(
-			$this->NationModel->load(),
-			true,
-			$this->p->t('ui', 'bitteEintragWaehlen')
-		);
-
-		$this->loadDropDownView($widgetData);
-	}
-}
+<?php
+
+class Nation_widget extends DropdownWidget
+{
+	public function display($widgetData)
+	{
+		// Nation
+		$this->load->model('codex/Nation_model', 'NationModel');
+		$this->NationModel->addOrder('nation_code');
+
+		$this->addSelectToModel($this->NationModel, 'nation_code', 'kurztext');
+
+		$this->setElementsArray(
+			$this->NationModel->load(),
+			true,
+			$this->p->t('ui', 'bitteEintragWaehlen')
+		);
+
+		$this->loadDropDownView($widgetData);
+	}
+}
diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
index 97bc29d5e..5a000601f 100644
--- a/application/widgets/TableWidget.php
+++ b/application/widgets/TableWidget.php
@@ -116,7 +116,7 @@ class TableWidget extends Widget
 
 		// Initialize class properties
 		$this->_requiredPermissions = null;
-		$this->_reloadDataset = null;
+		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_query = null;
 		$this->_additionalColumns = null;
 		$this->_columnsAliases = null;
diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php
index 9c9abe430..9ec13250f 100644
--- a/application/widgets/Vorlage_widget.php
+++ b/application/widgets/Vorlage_widget.php
@@ -63,7 +63,7 @@ class Vorlage_widget extends DropdownWidget
 					FROM tbl_vorlagestudiengang vs INNER JOIN tbl_vorlage v USING(vorlage_kurzbz)
 				) templates';
 		$alias = 'templates';
-		$fields = array("templates.vorlage_kurzbz AS id", "UPPER(templates.oe_kurzbz) || ' - ' || templates.bezeichnung || ' - V' || templates.version AS description");
+	    $fields = array("templates.vorlage_kurzbz AS id", "templates.bezeichnung AS description");
 		$where = 'templates.aktiv = TRUE
 				AND templates.subject IS NOT NULL
 				AND templates.text IS NOT NULL
diff --git a/application/widgets/Zgv_widget.php b/application/widgets/Zgv_widget.php
index f0af7b256..518217185 100644
--- a/application/widgets/Zgv_widget.php
+++ b/application/widgets/Zgv_widget.php
@@ -1,21 +1,21 @@
-<?php
-
-class Zgv_widget extends DropdownWidget
-{
-	public function display($widgetData)
-	{
-		// Zgv
-		$this->load->model('codex/Zgv_model', 'ZgvModel');
-		$this->ZgvModel->addOrder('zgv_bez');
-
-		$this->addSelectToModel($this->ZgvModel, 'zgv_code', 'zgv_bez');
-
-		$this->setElementsArray(
-			$this->ZgvModel->load(),
-			true,
-			$this->p->t('ui', 'bitteEintragWaehlen')
-		);
-
-		$this->loadDropDownView($widgetData);
-	}
-}
+<?php
+
+class Zgv_widget extends DropdownWidget
+{
+	public function display($widgetData)
+	{
+		// Zgv
+		$this->load->model('codex/Zgv_model', 'ZgvModel');
+		$this->ZgvModel->addOrder('zgv_bez');
+
+		$this->addSelectToModel($this->ZgvModel, 'zgv_code', 'zgv_bez');
+
+		$this->setElementsArray(
+			$this->ZgvModel->load(),
+			true,
+			$this->p->t('ui', 'bitteEintragWaehlen')
+		);
+
+		$this->loadDropDownView($widgetData);
+	}
+}
diff --git a/application/widgets/html/DropdownWidget.php b/application/widgets/html/DropdownWidget.php
index ca3e30163..eba79900d 100644
--- a/application/widgets/html/DropdownWidget.php
+++ b/application/widgets/html/DropdownWidget.php
@@ -17,32 +17,32 @@ class DropdownWidget extends HTMLWidget
 	const SELECTED_ELEMENT = 'selectedElement';
 	// Default HTML value
 	const HTML_DEFAULT_VALUE = 'null';
-	
+
 	const SIZE = 'size'; // size of the dropdown
 	const MULTIPLE = 'multiple'; // multiple attribute
-	
+
 	// Alias of $this->_args[HTMLWidget::HTML_ARG_NAME] for a better code readability
     protected $htmlParameters;
-	
+
 	/**
-	 * 
+	 *
 	 */
 	public function __construct($name, $args = array(), $htmlArgs = array())
 	{
 		parent::__construct($name, $args, $htmlArgs);
-		
+
 		// If the selectd element is not set then set it to HTML_DEFAULT_VALUE
 		if (!isset($this->_args[DropdownWidget::SELECTED_ELEMENT]))
 		{
 			$this->_args[DropdownWidget::SELECTED_ELEMENT] = DropdownWidget::HTML_DEFAULT_VALUE;
 		}
-		
+
 		$this->htmlParameters =& $this->_args[HTMLWidget::HTML_ARG_NAME]; // Reference for a better code readability
-		
+
 		// By default is not a multiple dropdown
 		unset($this->htmlParameters[DropdownWidget::MULTIPLE]);
 	}
-	
+
     /**
      * Set this dropdown as multiple:
      * - Setting the multiple attribute
@@ -53,23 +53,23 @@ class DropdownWidget extends HTMLWidget
 		$this->htmlParameters[DropdownWidget::MULTIPLE] = DropdownWidget::MULTIPLE;
 		$this->htmlParameters[HTMLWidget::HTML_NAME] .= '[]';
     }
-    
+
     /**
      * Checks if this object is a multiple dropdown
 	 */
     public function isMultipleDropdown()
     {
 		$isMultipleDropdown = false;
-		
+
 		if (isset($this->htmlParameters[DropdownWidget::MULTIPLE])
 			&& $this->htmlParameters[DropdownWidget::MULTIPLE] == DropdownWidget::MULTIPLE)
 		{
 			$isMultipleDropdown = true;
 		}
-		
+
 		return $isMultipleDropdown;
     }
-    
+
     /**
 	 * Add the correct select to the model used to load a list of elemets for this dropdown
 	 * @param model $model the model used to load elements
@@ -88,7 +88,7 @@ class DropdownWidget extends HTMLWidget
 			)
 		);
 	}
-    
+
 	/**
 	 * Set the array used to populate the dropdown
 	 * @param array $elements list used to populate this dropdown
@@ -102,12 +102,12 @@ class DropdownWidget extends HTMLWidget
 	)
 	{
 		$tmpElements = array();
-		
+
 		if (isError($elements))
 		{
 			if (is_object($elements) && isset($elements->retval))
 			{
-				show_error($elements->retval);
+				show_error(getError($elements));
 			}
 			else if (is_string($elements))
 			{
@@ -133,11 +133,11 @@ class DropdownWidget extends HTMLWidget
 			{
 				$tmpElements = $elements->retval;
 			}
-			
+
 			$this->_args[DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME] = $tmpElements;
 		}
 	}
-	
+
 	/**
      * Adds an element to the beginning of the array
      */
@@ -146,17 +146,17 @@ class DropdownWidget extends HTMLWidget
 		$element = new stdClass();
 		$element->{DropdownWidget::ID_FIELD} = $id;
 		$element->{DropdownWidget::DESCRIPTION_FIELD} = $stdDescription;
-		
+
 		if (!hasData($elements))
 		{
 			$element->{DropdownWidget::DESCRIPTION_FIELD} = $noDataDescription;
 		}
-		
+
 		array_unshift($elements->retval, $element);
-		
+
 		return $elements->retval;
 	}
-	
+
 	/**
 	 * Loads the dropdown view with all the elements to be displayed
 	 */
@@ -164,4 +164,4 @@ class DropdownWidget extends HTMLWidget
 	{
 		$this->view('widgets/dropdown', $this->_args);
 	}
-}
\ No newline at end of file
+}
diff --git a/cis/index.php b/cis/index.php
index 60c9aceeb..a6ec16786 100644
--- a/cis/index.php
+++ b/cis/index.php
@@ -70,13 +70,14 @@ if(defined('CIS_CHECK_PASSWORD_CHANGE') && CIS_CHECK_PASSWORD_CHANGE==true)
  */
 function validURLCheck($param)
 {
-	if(strstr($param,'://'))
+	if (strstr($param,':') || strstr($param,'//'))
 	{
 		// Der APP_ROOT muss in der URL vorkommen, sonfern es kein relativer Pfad ist
 		// HTTPS und HTTP
 		if(mb_strpos($param, APP_ROOT)!==0
 			&& mb_strpos(mb_str_replace("http://","https://", $param), APP_ROOT)!==0
-			&& mb_strpos(mb_str_replace("https://","http://", $param), APP_ROOT)!==0)
+			&& mb_strpos(mb_str_replace("https://","http://", $param), APP_ROOT)!==0
+			&& $param != 'about:blank')
 		{
 			$text="Dies ist eine automatische Mail.\nEs wurde eine mögliche XSS Attacke durchgefuehrt:\n";
 			$text.="\nFolgende URL wurde versucht aufzurufen: \n".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'];
@@ -170,7 +171,7 @@ $db = new basis_db();
 	<script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
-	<link rel="stylesheet" type="text/css" href="../vendor/twbs/bootstrap/dist/css/bootstrap.min.css">	
+	<link rel="stylesheet" type="text/css" href="../vendor/twbs/bootstrap/dist/css/bootstrap.min.css">
 </head>
 <script type="text/javascript">
 function changeSprache(sprache)
diff --git a/cis/private/lehre/benotungstool/anwesenheitsliste.php b/cis/private/lehre/benotungstool/anwesenheitsliste.php
deleted file mode 100644
index 2a5845c7f..000000000
--- a/cis/private/lehre/benotungstool/anwesenheitsliste.php
+++ /dev/null
@@ -1,832 +0,0 @@
-<?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>.
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-include_once('../../../../include/Excel/excel.php');
-
-if (!$db = new basis_db())
-	die('Fehler beim Herstellen der Datenbankverbindung');
-
-$user = get_uid();
-
-if(!check_lektor($user))
-	die('Sie haben keine Berechtigung fuer diesen Bereich');
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-if(isset($_GET['uebung_id']) && is_numeric($_GET['uebung_id']))
-{
-	$uebung_id = $_GET['uebung_id'];
-	$uebung_obj = new uebung($uebung_id);
-	$lehreinheit_obj = new lehreinheit($uebung_obj->lehreinheit_id);
-}
-else
-{
-	if(!isset($_GET['all']))
-			die('Fehlerhafte Parameteruebergabe');
-	else
-	{
-		$lehreinheit_id = $_GET['lehreinheit_id'];
-		$lehreinheit_obj = new lehreinheit($lehreinheit_id);
-	}
-}
-
-//Abgabedatei ausliefern
-if (isset($_GET["download_abgabe"])){
-	$file=$_GET["download_abgabe"];
-	$uebung_id = $_GET["uebung_id"];
-	$uid = $_GET['uid'];
-	$ueb = new uebung();
-	$ueb->load_studentuebung($uid, $uebung_id);
-	$ueb->load_abgabe($ueb->abgabe_id);
-	$filename = BENOTUNGSTOOL_PATH."abgabe/".$ueb->abgabedatei;
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="'.$file.'"');
-	readfile($filename);
-	exit;
-}
-/*
-$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE
-		tbl_lehreinheit.lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER)." AND
-		mitarbeiter_uid=".$db->db_add_param($user);
-*/
-$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE
-		tbl_lehreinheit.lehrveranstaltung_id in(Select lehrveranstaltung_id from lehre.tbl_lehreinheit where lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER).") AND
-		mitarbeiter_uid=".$db->db_add_param($user);
-
-if(!$result = $db->db_query($qry))
-	die('Fehler beim laden der Berechtigung');
-
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($user);
-
-if(!($db->db_num_rows($result)>0 || $rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lehreinheit_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lehreinheit_obj->studiengang_kz)))
-	die('Sie haben keine Berechtigung f&uuml;r diesen Bereich');
-
-// Beteiligte Gruppen laden
-$gruppen = '';
-$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER);
-if($result_gruppen = $db->db_query($qry_gruppen))
-{
-	$i=0;
-	while($row_gruppen = $db->db_fetch_object($result_gruppen))
-	{
-		if($row_gruppen->gruppe_kurzbz=='')
-			$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-		else
-			$gruppen.=$row_gruppen->gruppe_kurzbz;
-		$i++;
-		if($i<$db->db_num_rows($result_gruppen))
-			$gruppen.=', ';
-		else
-			$gruppen.=' ';
-	}
-}
-
-if(isset($_GET['output']) && $_GET['output']=='xls')
-{
-	if(isset($_GET['all']))
-	{
-		//EXCEL VERSION / ALLE Kreuzerllisten
-		$le_obj = new lehreinheit();
-		$le_obj->load($lehreinheit_id);
-
-		$lv_obj = new lehrveranstaltung();
-		$lv_obj->load($le_obj->lehrveranstaltung_id);
-
-		// Creating a workbook
-		$workbook = new Spreadsheet_Excel_Writer();
-		$workbook->setVersion(8);
-		// sending HTTP headers
-		$workbook->send("Kreuzerlliste_Gesamt_".$lv_obj->lehreverzeichnis. "_" . date("d_m_Y") . ".xls");
-
-		// Creating a worksheet
-		$worksheet =& $workbook->addWorksheet("Kreuzerltool");
-		$worksheet->setInputEncoding('utf-8');
-
-		$format_bold =& $workbook->addFormat();
-		$format_bold->setBold();
-
-		$format_title =& $workbook->addFormat();
-		$format_title->setBold();
-		// let's merge
-		$format_title->setAlign('merge');
-
-
-
-		$worksheet->write(0,0,'Gesamtübersicht '.$lv_obj->bezeichnung.' vom '.date('d.m.Y'), $format_bold);
-		$maxlength = array();
-
-		//Ueberschrift
-		$i=0;
-		$worksheet->write(1,$i,"Vorname", $format_title);
-		$maxlength[$i]=strlen('Vorname');
-		$worksheet->write(1,++$i,"Nachname", $format_title);
-		$maxlength[$i]=strlen('Nachname');
-		$worksheet->write(1,++$i,"Matrikelnr", $format_title);
-		$maxlength[$i]=strlen('Matrikelnr');
-		$worksheet->write(1,++$i,"Gruppe", $format_title);
-		$maxlength[$i]=strlen('Gruppe');
-		$ueb_obj = new uebung();
-		$ueb_obj->load_uebung($lehreinheit_id);
-		foreach($ueb_obj->uebungen as $row_ueb)
-		{
-			$worksheet->write(1,++$i,$row_ueb->bezeichnung, $format_title);
-			$maxlength[$i]=strlen($row_ueb->bezeichnung);
-		}
-		$worksheet->write(1,++$i,"Summe", $format_title);
-		$maxlength[$i]=8;
-		$worksheet->write(1,++$i,"Mitarbeit insgesamt", $format_title);
-		$maxlength[$i]=strlen('Mitarbeit insgesamt');
-		$worksheet->write(1,++$i,"Punkte insgesamt", $format_title);
-		$maxlength[$i]=strlen('Punkte insgesamt');
-		$worksheet->write(1,++$i,"Unterschrift", $format_title);
-		$maxlength[$i]=strlen('Unterschrift')+5;
-
-		if(isset($_GET['gruppe']) && $_GET['gruppe']!='')
-		{
-			$gruppe = $_GET['gruppe'];
-			$qry = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheitgruppe_id=".$db->db_add_param($gruppe);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					if($row->gruppe_kurzbz!='')
-					{
-						$gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz;
-						$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz=".$db->db_add_param($row->gruppe_kurzbz)." AND studiensemester_kurzbz = ".$db->db_add_param($stsem)." ORDER BY nachname, vorname";
-					}
-					else
-					{
-						$gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe;
-						$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student
-									 WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)."
-									 AND semester=".$db->db_add_param($row->semester).
-									 ($row->verband!=''?" AND verband=".$db->db_add_param($row->verband):'').
-									 ($row->gruppe!=''?" AND gruppe=".$db->db_add_param($row->gruppe):'').
-									 " ORDER BY nachname, vorname";
-					}
-
-				}
-				else
-					die('Gruppe konnte nicht ermittelt werden');
-			}
-			else
-				die('Gruppe konnte nicht ermittelt werden');
-		}
-		else
-		{
-			if(isset($_GET['lehreinheit_id']) && $_GET['lehreinheit_id']!='')
-			{
-				$lehreinheit_id = $_GET['lehreinheit_id'];
-				$gruppe_bez = 'Alle Studienrende';
-				//Alle Studenten die dieser Lehreinheit zugeordnet sind
-				$qry_stud = "SELECT
-								vw_student.uid, vorname, nachname, matrikelnr,
-								tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe
-							FROM
-								campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe,
-								public.tbl_studentlehrverband, lehre.tbl_lehreinheit
-							WHERE
-								tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND
-								tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitgruppe.lehreinheit_id AND
-								vw_student.uid = tbl_benutzergruppe.uid AND
-								tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz AND
-								vw_student.uid=tbl_studentlehrverband.student_uid AND
-								tbl_studentlehrverband.studiensemester_kurzbz=tbl_lehreinheit.studiensemester_kurzbz
-							UNION
-							SELECT
-								vw_student.uid, vorname, nachname, matrikelnr, tbl_studentlehrverband.semester,
-								tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe
-							FROM
-								campus.vw_student, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband, lehre.tbl_lehreinheit
-							WHERE
-								tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND
-								tbl_lehreinheitgruppe.studiengang_kz=tbl_studentlehrverband.studiengang_kz AND
-								tbl_lehreinheitgruppe.semester = tbl_studentlehrverband.semester AND
-								tbl_studentlehrverband.student_uid=vw_student.uid AND
-								tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitgruppe.lehreinheit_id AND
-								tbl_lehreinheit.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz AND
-							((tbl_lehreinheitgruppe.verband<>'' AND
-							  tbl_lehreinheitgruppe.gruppe<>'' AND
-							  trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband) AND
-							  trim(tbl_lehreinheitgruppe.gruppe) = trim(tbl_studentlehrverband.gruppe))
-							OR
-							(tbl_lehreinheitgruppe.verband<>'' AND
-							  (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null) AND
-							  trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband))
-							  OR (tbl_lehreinheitgruppe.verband is null AND tbl_lehreinheitgruppe.gruppe is null)
-							  )
-							 ORDER BY nachname, vorname";
-			}
-			else
-				die('Fehler bei der Parameteruebergabe');
-			$gruppe='';
-		}
-
-		if($result_stud = $db->db_query($qry_stud))
-		{
-			$zeile=3;
-
-			while($row_stud = $db->db_fetch_object($result_stud))
-			{
-				$spalte=0;
-				$summe=0;
-				//vorname
-				$worksheet->write($zeile,$spalte,$row_stud->vorname);
-				if(strlen($row_stud->vorname)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->vorname);
-				//nachname
-				$worksheet->write($zeile,++$spalte,$row_stud->nachname);
-				if(strlen($row_stud->nachname)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->nachname);
-				//matrikelnr
-				$worksheet->write($zeile,++$spalte,'="'.$row_stud->matrikelnr.'"');
-				if(strlen($row_stud->matrikelnr)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->matrikelnr);
-				//Gruppe
-				$worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe);
-				if(strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe);
-
-				foreach($ueb_obj->uebungen as $row_ueb)
-				{
-					$qry = "SELECT sum(punkte) as punkte FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id)
-						WHERE uebung_id=".$db->db_add_param($row_ueb->uebung_id)." AND student_uid=".$db->db_add_param($row_stud->uid)." AND vorbereitet=true";
-					if($result = $db->db_query($qry))
-					{
-						if($row = $db->db_fetch_object($result))
-						{
-							$punkte = $row->punkte;
-							$summe +=$punkte;
-						}
-						else
-							$punkte = 'failed';
-					}
-					else
-						$punkte='failed';
-					//punkte auf uebung
-					$worksheet->write($zeile,++$spalte,($punkte!=''?$punkte:'0'));
-				}
-
-				//summe
-				$worksheet->write($zeile,++$spalte,$summe);
-
-				//mitarbeit
-				$qry = "SELECT sum(mitarbeitspunkte) as mitarbeit FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id)
-				WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($row_stud->uid);
-				if($result = $db->db_query($qry))
-					if($row = $db->db_fetch_object($result))
-						$mitarbeit=$row->mitarbeit;
-					else
-						$mitarbeit='failed';
-				else
-					$mitarbeit='failed';
-
-				$worksheet->write($zeile,++$spalte,($row->mitarbeit!=''?$mitarbeit:'0'));
-				//punkte insgesamt
-				$worksheet->write($zeile,++$spalte,($summe+$mitarbeit), $format_bold);
-
-				$zeile++;
-			}
-			for($i=0;$i<count($maxlength);$i++)
-			{
-				$worksheet->setColumn(0, $i, $maxlength[$i]);
-			}
-		}
-
-		$workbook->close();
-
-	}
-	else
-	{
-		//EXCEL VERSION / Einzelne Kreuzerlliste
-
-		// Creating a workbook
-		$workbook = new Spreadsheet_Excel_Writer();
-		$workbook->setVersion(8);
-
-		// sending HTTP headers
-		$workbook->send("Kreuzerltool". "_" . date("d_m_Y") . ".xls");
-
-		// Creating a worksheet
-		$worksheet =& $workbook->addWorksheet("Kreuzerltool");
-		$worksheet->setInputEncoding('utf-8');
-
-		$format_bold =& $workbook->addFormat();
-		$format_bold->setBold();
-
-		$format_title =& $workbook->addFormat();
-		$format_title->setBold();
-		// let's merge
-		$format_title->setAlign('merge');
-
-		$worksheet->write(0,0,$uebung_obj->bezeichnung.' am '.date('d.m.Y').' '.$gruppen, $format_bold);
-		$maxlength = array();
-		//Ueberschrift
-		$i=0;
-		$worksheet->write(1,$i,"Vorname", $format_title);
-		$maxlength[$i]=strlen('Vorname');
-		$worksheet->write(1,++$i,"Nachname", $format_title);
-		$maxlength[$i]=strlen('Nachname');
-		$worksheet->write(1,++$i,"Matrikelnr", $format_title);
-		$maxlength[$i]=strlen('Matrikelnr');
-		//$worksheet->write(1,++$i,"Gruppe", $format_title);
-		//$maxlength[$i]=strlen('Gruppe');
-		$beispiel_obj = new beispiel();
-		$beispiel_obj->load_beispiel($uebung_id);
-		foreach($beispiel_obj->beispiele as $row_bsp)
-		{
-			$worksheet->write(1,++$i,$row_bsp->bezeichnung, $format_title);
-			$maxlength[$i]=strlen($row_bsp->bezeichnung);
-		}
-		$worksheet->write(1,++$i,"Punkte heute", $format_title);
-		$maxlength[$i]=strlen('Punkte heute');
-		$worksheet->write(1,++$i,"Mitarbeit heute", $format_title);
-		$maxlength[$i]=strlen('Mitarbeit_heute');
-		$worksheet->write(1,++$i,"Punkte insgesamt", $format_title);
-		$maxlength[$i]=strlen('Punkte insgesamt');
-		$worksheet->write(1,++$i,"Mitarbeit insgesamt", $format_title);
-		$maxlength[$i]=strlen('Mitarbeit insgesamt');
-		$worksheet->write(1,++$i,"Unterschrift", $format_title);
-		$maxlength[$i]=strlen('Unterschrift')+5;
-
-		if(isset($_GET['gruppe']) && $_GET['gruppe']!='')
-		{
-			$gruppe = $_GET['gruppe'];
-			$qry = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheitgruppe_id=".$db->db_add_param($gruppe);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					if($row->gruppe_kurzbz!='')
-					{
-						$gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz;
-						$qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe
-						FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid)
-						WHERE gruppe_kurzbz=".$db->db_add_param($row->gruppe_kurzbz)." AND studiensemester_kurzbz=".$db->db_add_param($stsem)." ORDER BY nachname, vorname";
-					}
-					else
-					{
-						$gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe;
-						$qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student
-									 WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)."
-									 AND semester=".$db->db_add_param($row->semester).
-									 ($row->verband!=''?" AND verband=".$db->db_add_param($row->verband):'').
-									 ($row->gruppe!=''?" AND gruppe=".$db->db_add_param($row->gruppe):'').
-									 " ORDER BY nachname, vorname";
-					}
-
-				}
-				else
-					die('Gruppe konnte nicht ermittelt werden');
-			}
-			else
-				die('Gruppe konnte nicht ermittelt werden');
-
-
-			$lehreinheit_id = $uebung_obj->lehreinheit_id;
-		}
-		else
-		{
-			if(isset($_GET['lehreinheit_id']) && $_GET['lehreinheit_id']!='')
-			{
-				$lehreinheit_id = $_GET['lehreinheit_id'];
-				$gruppe_bez = 'Alle Studienrende';
-
-				$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid)
-				WHERE  studiensemester_kurzbz = ".$db->db_add_param($stsem)." AND lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname";
-
-				//Alle Studenten die dieser Lehreinheit zugeordnet sind
-				/*
-				$qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe
-							FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
-							WHERE tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND
-							vw_student.uid = tbl_benutzergruppe.uid AND
-							tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-							UNION
-							SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe
-							FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
-							tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND
-							tbl_lehreinheitgruppe.studiengang_kz=vw_student.studiengang_kz AND
-							tbl_lehreinheitgruppe.semester = vw_student.semester AND
-							((tbl_lehreinheitgruppe.verband<>'' AND
-							  tbl_lehreinheitgruppe.gruppe<>'' AND
-							  trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband) AND
-							  trim(tbl_lehreinheitgruppe.gruppe) = trim(vw_student.gruppe))
-							OR
-							(tbl_lehreinheitgruppe.verband<>'' AND
-							  (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null) AND
-							  trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband))
-							  OR (tbl_lehreinheitgruppe.verband is null AND tbl_lehreinheitgruppe.gruppe is null)
-							  )
-							 ORDER BY nachname, vorname";
-				*/
-			}
-			else
-				die('Fehler bei der Parameteruebergabe');
-			$gruppe='';
-		}
-
-		if($result_stud = $db->db_query($qry_stud))
-		{
-			$zeile=3;
-
-			while($row_stud = $db->db_fetch_object($result_stud))
-			{
-				$spalte=0;
-				$punkte_heute=0;
-				//vorname
-				$worksheet->write($zeile,$spalte,$row_stud->vorname);
-				if(strlen($row_stud->vorname)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->vorname);
-				//nachname
-				$worksheet->write($zeile,++$spalte,$row_stud->nachname);
-				if(strlen($row_stud->nachname)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->nachname);
-				//matrikelnr
-				$worksheet->write($zeile,++$spalte,'="'.$row_stud->matrikelnr.'"');
-				if(strlen($row_stud->matrikelnr)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->matrikelnr);
-
-				//Gruppe
-				/*
-				$worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe);
-				if(strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe)>$maxlength[$spalte])
-					$maxlength[$spalte]=strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe);
-				*/
-				foreach($beispiel_obj->beispiele as $row_bsp)
-				{
-					$studentbeispiel_obj = new beispiel();
-					$studentbeispiel_obj->load_studentbeispiel($row_stud->uid, $row_bsp->beispiel_id);
-					if($studentbeispiel_obj->vorbereitet)
-						$punkte = $row_bsp->punkte;
-					else
-						$punkte = 0;
-					$punkte_heute +=$punkte;
-					//punkte auf uebung
-					$worksheet->write($zeile,++$spalte,$punkte);
-				}
-
-				//punkte heute
-				$worksheet->write($zeile,++$spalte,$punkte_heute);
-
-				//mitarbeit heute
-				$qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung
-					WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($row_stud->uid);
-				if($result = $db->db_query($qry))
-					if($row = $db->db_fetch_object($result))
-						$worksheet->write($zeile,++$spalte,($row->mitarbeit_heute!=''?$row->mitarbeit_heute:'0'));
-					else
-						$worksheet->write($zeile,++$spalte,'failed');
-				else
-					$worksheet->write($zeile,++$spalte,'failed');
-
-				//punkte insgesamt
-				$qry = "SELECT sum(tbl_beispiel.punkte) AS gesamt_ohne_mitarbeit FROM campus.tbl_uebung, campus.tbl_beispiel, campus.tbl_studentbeispiel WHERE
-						tbl_studentbeispiel.student_uid=".$db->db_add_param($row_stud->uid)." AND
-						tbl_studentbeispiel.vorbereitet=true AND
-						tbl_uebung.lehreinheit_id=".$db->db_add_param($uebung_obj->lehreinheit_id, FHC_INTEGER)." AND
-						tbl_uebung.uebung_id=tbl_beispiel.uebung_id AND
-						tbl_beispiel.beispiel_id=tbl_studentbeispiel.beispiel_id
-						";
-				if($result = $db->db_query($qry))
-					if($row = $db->db_fetch_object($result))
-						$worksheet->write($zeile,++$spalte,($row->gesamt_ohne_mitarbeit!=''?$row->gesamt_ohne_mitarbeit:'0'));
-					else
-						$worksheet->write($zeile,++$spalte,'failed');
-				else
-					$worksheet->write($zeile,++$spalte,'failed');
-
-				//mitarbeit insgesamt
-				$qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id)
-				WHERE student_uid=".$db->db_add_param($row_stud->uid)." AND lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
-				if($result = $db->db_query($qry))
-					if($row = $db->db_fetch_object($result))
-						$worksheet->write($zeile,++$spalte,($row->mitarbeit_heute!=''?$row->mitarbeit_heute:'0'));
-					else
-						$worksheet->write($zeile,++$spalte,'failed');
-				else
-					$worksheet->write($zeile,++$spalte,'failed');
-
-				$zeile++;
-			}
-			for($i=0;$i<count($maxlength);$i++)
-				$worksheet->setColumn(0, $i, $maxlength[$i]);
-		}
-
-		$workbook->close();
-	}
-}
-else
-{
-	//HTML VERSION
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title>Kreuzerltool</title>
-<script language="Javascript">
-function addUser(student_uid)
-{
-	var upd, upd_f;
-	upd = document.forms[0].update_ids;
-	upd_f = "update_" + student_uid;
-	if (document.forms[0].elements[upd_f].checked != true)
-	{
-		document.forms[0].elements[upd_f].checked = true;
-		upd.value += student_uid + "#";
-	}
-}
-</script>
-</head>
-<body>
-	<?php
-	if(isset($_POST['submit']))
-	{
-		//Update der Daten
-		$uids = explode('#',$_POST['update_ids']);
-
-		$uebung_obj = new uebung($uebung_id);
-		$beispiel_obj = new beispiel();
-		$beispiel_obj->load_beispiel($uebung_id);
-		$error=false;
-		foreach($uids as $uid)
-		{
-			if($uid!='')
-			{
-				if ($uebung_obj->beispiele)
-				{
-					foreach($beispiel_obj->beispiele as $bsp)
-					{
-						if(isset($_POST['update_'.$uid.'_'.$bsp->beispiel_id]))
-							$vorbereitet=true;
-						else
-							$vorbereitet=false;
-
-						$bsp_obj = new beispiel();
-
-						if(!$bsp_obj->studentbeispiel_exists($uid,$bsp->beispiel_id))
-						{
-							$new=true;
-							$bsp_obj->insertamum = date('Y-m-d H:i:s');
-							$bsp_obj->insertvon = $user;
-						}
-						else
-						{
-							$bsp_obj->load_studentbeispiel($uid, $bsp->beispiel_id);
-							$new=false;
-						}
-
-						$bsp_obj->student_uid = $uid;
-						$bsp_obj->beispiel_id = $bsp->beispiel_id;
-						$bsp_obj->vorbereitet = $vorbereitet;
-						$bsp_obj->updateamum = date('Y-m-d H:i:s');
-						$bsp_obj->updatevon = $user;
-
-						if(!$bsp_obj->studentbeispiel_save($new))
-							$error=true;
-					}
-				}
-				else
-				{
-					if (!$uebung_obj->load_studentuebung($uid,$uebung_id))
-					{
-						$uebung_obj->student_uid = $uid;
-						$uebung_obj->mitarbeiter_uid = $user;
-						$uebung_obj->abgabe_id = null;
-						$uebung_obj->note = $_POST['update_'.$uid.'_note'];
-						$uebung_obj->mitarbeitspunkte = null;
-						$uebung_obj->punkte = null;
-						$uebung_obj->anmerkung = null;
-						$uebung_obj->benotungsdatum = date("Y-m-d H:i:s");
-						$uebung_obj->updateamum = null;
-						$uebung_obj->updatevon = null;
-						$uebung_obj->insertamum = date("Y-m-d H:i:s");
-						$uebung_obj->insertvon = $user;
-						$new = true;
-					}
-					else
-					{
-						$uebung_obj->load_studentuebung($uid,$uebung_id);
-						$uebung_obj->mitarbeiter_uid = $user;
-						$uebung_obj->note = $_POST['update_'.$uid.'_note'];
-						$uebung_obj->benotungsdatum = date("Y-m-d H:i:s");
-						$uebung_obj->updateamum = date("Y-m-d H:i:s");
-						$uebung_obj->updatevon = $user;
-						$new = false;
-					}
-					$uebung_obj->studentuebung_save($new);
-
-				}
-			}
-		}
-		if(!$error)
-			echo "Die &Auml;nderungen wurden erfolgreich gespeichert";
-		else
-			echo "<span class='error'>Fehler beim Speichern der &Auml;nderungen</span>";
-	}
-
-	$uebung_obj = new uebung($uebung_id);
-	$lehreinheit_obj = new lehreinheit($uebung_obj->lehreinheit_id);
-
-	$beispiel_obj = new beispiel();
-
-	$lehrveranstaltung_obj = new lehrveranstaltung($lehreinheit_obj->lehrveranstaltung_id);
-	$stg_obj = new studiengang($lehrveranstaltung_obj->studiengang_kz);
-
-	$beispiel_obj->load_beispiel($uebung_id);
-	if ($uebung_obj->beispiele)
-		$anzahl = count($beispiel_obj->beispiele);
-	else
-		$anzahl = 1;
-	if(isset($_GET['gruppe']) && $_GET['gruppe']!='')
-	{
-		$gruppe = $_GET['gruppe'];
-		$qry = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheitgruppe_id=".$db->db_add_param($gruppe);
-		if($result = $db->db_query($qry))
-		{
-			if($row = $db->db_fetch_object($result))
-			{
-				if($row->gruppe_kurzbz!='')
-				{
-					$gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz;
-					$qry_stud = "SELECT uid, vorname, nachname FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid)
-					WHERE gruppe_kurzbz=".$db->db_add_param($row->gruppe_kurzbz)." AND studiensemester_kurzbz = ".$db->db_add_param($stsem)."
-					ORDER BY nachname, vorname";
-				}
-				else
-				{
-					$gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe;
-					$qry_stud = "SELECT uid, vorname, nachname FROM campus.vw_student
-								WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)."
-								AND semester=".$db->db_add_param($row->semester).
-								($row->verband!=''?" AND verband=".$db->db_add_param($row->verband):'').
-								($row->gruppe!=''?" AND gruppe=".$db->db_add_param($row->gruppe):'').
-								" ORDER BY nachname, vorname";
-				}
-
-			}
-			else
-				die('Gruppe konnte nicht ermittelt werden');
-		}
-		else
-			die('Gruppe konnte nicht ermittelt werden');
-		$lehreinheit_id = '';
-	}
-	else
-	{
-		if(isset($_GET['lehreinheit_id']) && $_GET['lehreinheit_id']!='')
-		{
-			$lehreinheit_id = $_GET['lehreinheit_id'];
-			$gruppe_bez = 'Alle Studierende';
-			//Alle Studenten die dieser lehreinheit zugeordnet sind
-			// studentenquery
-			$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid)
-			WHERE  studiensemester_kurzbz = ".$db->db_add_param($stsem)." AND lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname";
-			/*
-			$qry_stud = "SELECT vw_student.uid, vorname, nachname FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
-						WHERE tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
-						vw_student.uid = tbl_benutzergruppe.uid AND
-						tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz AND
-						tbl_benutzergruppe.studiensemester_kurzbz = '$stsem'
-						UNION
-						SELECT vw_student.uid, vorname, nachname FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
-						tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
-						tbl_lehreinheitgruppe.studiengang_kz=vw_student.studiengang_kz AND
-						tbl_lehreinheitgruppe.semester = vw_student.semester AND
-						((tbl_lehreinheitgruppe.verband<>'' AND
-						  tbl_lehreinheitgruppe.gruppe<>'' AND
-						  tbl_lehreinheitgruppe.verband is not null AND
-						  tbl_lehreinheitgruppe.gruppe is not null AND
-						  trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband) AND
-						  trim(tbl_lehreinheitgruppe.gruppe) = trim(vw_student.gruppe))
-						OR
-						(tbl_lehreinheitgruppe.verband<>'' AND tbl_lehreinheitgruppe.verband is not null AND
-						  (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null) AND
-						  trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband))
-						  OR (tbl_lehreinheitgruppe.verband is null AND tbl_lehreinheitgruppe.gruppe is null)
-						  )
-						 ORDER BY nachname, vorname";
-		*/
-		}
-		else
-			die('Fehler bei der Parameteruebergabe');
-		$gruppe='';
-	}
-
-	echo "<form method='POST' action='anwesenheitsliste.php?output=html&uebung_id=$uebung_id&lehreinheit_id=$lehreinheit_id&gruppe=$gruppe&stsem=$stsem'>";
-	echo "<input type='hidden' name='update_ids' value=''>";
-	echo "<table border='1'>
-			<tr>
-				<td colspan='".($anzahl+3)."' width='100%'>
-					<table width='100%'>
-					<tr>
-						<td><font class='headline'>$lehrveranstaltung_obj->semester.Semester</font></td>
-						<td align='center'><font class='headline'>$stg_obj->kuerzel - $lehrveranstaltung_obj->bezeichnung - $uebung_obj->bezeichnung - $gruppe_bez - $gruppen</font></td>
-						<td align='right'><font class='headline'>".date('d.m.Y')."</font></td>
-					</tr>
-					</table>
-				</td>
-			</tr>";
-
-	echo "<tr><td align='center'><b>Name</b></td>";
-	if (!$uebung_obj->beispiele)
-		echo "<td>Note</td>";
-	else
-	{
-		foreach($beispiel_obj->beispiele as $row)
-		{
-			echo "<td>$row->bezeichnung</td>";
-		}
-	}
-	echo "<td align='center' width='200'><b>Unterschrift</b></td><td></td></tr>\n";
-
-	if($result = $db->db_query($qry_stud))
-	{
-		while($row_stud = $db->db_fetch_object($result))
-		{
-
-			$filename = '';
-			$su_obj = new uebung($uebung_id);
-			$su_obj->load_studentuebung($row_stud->uid, $uebung_id);
-			if ($su_obj->abgabe_id)
-			{
-				$su_obj->load_abgabe($su_obj->abgabe_id);
-				$filename = $su_obj->abgabedatei;
-			}
-			else
-				$filename='';
-
-			echo "<tr onMouseOver=\"this.style.backgroundColor='#c7dfe8'\" onMouseOut=\"this.style.backgroundColor='#ffffff'\">
-			<td nowrap><input type='checkbox' name='update_$row_stud->uid' disabled>&nbsp;<b>$row_stud->nachname</b>&nbsp;$row_stud->vorname $row_stud->uid</td>";
-			if (!$uebung_obj->beispiele)
-			{
-				$studentuebung_obj = new uebung();
-				$studentuebung_obj->load_studentuebung($row_stud->uid,$uebung_id);
-				echo "<td align='center'><input type='text' name='update_".$row_stud->uid."_note' onchange=\"addUser('$row_stud->uid');\" value='".$studentuebung_obj->note."' size='3'></td>\n";
-
-			}
-			else
-			{
-				foreach($beispiel_obj->beispiele as $row_bsp)
-				{
-					$studentbeispiel_obj = new beispiel();
-					$studentbeispiel_obj->load_studentbeispiel($row_stud->uid, $row_bsp->beispiel_id);
-					echo "<td align='center'><input type='checkbox' name='update_".$row_stud->uid."_".$row_bsp->beispiel_id."' onClick=\"addUser('$row_stud->uid');\" ".($studentbeispiel_obj->vorbereitet?'checked':'').">".($studentbeispiel_obj->probleme?'<i><small>P</small></i>':'')."</td>\n";
-				}
-			}
-			echo "<td>&nbsp;</td>";
-
-			if ($filename != "")
-				echo "<td><a href='anwesenheitsliste.php?uid=$row_stud->uid&output=html&uebung_id=$uebung_id&lehreinheit_id=$lehreinheit_id&stsem=$stsem&download_abgabe=$filename'>Abgabe</a></td>\n";
-			else if ($uebung_obj->abgabe)
-				echo "<td><span style='color:red;'>Fehlt!</span></td>";
-			else
-				echo "<td></td>";
-			echo "</tr>\n";
-		}
-	}
-
-	echo '</table>';
-	echo "<br><br><table width='100%'><tr><td align='right'><input type='submit' name='submit' value='Änderungen Speichern'></td></tr></table>";
-	echo '</form>'
-	?>
-</body>
-</html>
-<?php
-}
diff --git a/cis/private/lehre/benotungstool/anwesenheitstabelle.php b/cis/private/lehre/benotungstool/anwesenheitstabelle.php
deleted file mode 100644
index b3c910429..000000000
--- a/cis/private/lehre/benotungstool/anwesenheitstabelle.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?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>.
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-require_once('../../../../include/phrasen.class.php');
-
-if (!$db = new basis_db())
-		die('Fehler beim Herstellen der Datenbankverbindung');
-			
-$sprache = getSprache(); 
-$p = new phrasen($sprache);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title><?php echo $p->t('benotungstool/benotungstool');?></title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-  //-->
-</script>
-</head>
-
-<body>
-<?php
-$user = get_uid();
-
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-$show_excel_link = false;
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-
-//Kopfzeile
-echo '<table width="100%">';
-echo ' <tr><td>';
-echo '<h1>&nbsp;'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='anwesenheitstabelle.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-
-if($result = $db->db_query($qry))
-{
-	if($db->db_num_rows($result)>1)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit').": <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-				$lektoren .=')';
-			}
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-echo '<table width="100%"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-echo "<b>".$lv_obj->bezeichnung_arr[$sprache]."</b><br>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/keinePassendeLehreinheitGefunden'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br>
-<a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-echo "<h3>".$p->t('benotungstool/anwesenheitstabelle')."</h3>";
-
-/*
-$uebung_obj = new uebung();
-$uebung_obj->load_uebung($lehreinheit_id);
-if(count($uebung_obj->uebungen)>0)
-{
-	echo "<table width='100%'><tr><td valign='top'>";
-	echo "Wählen Sie bitte eine Kreuzerlliste aus: <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-	foreach ($uebung_obj->uebungen as $row)
-	{
-		if($uebung_id=='')
-			$uebung_id=$row->uebung_id;
-
-		if($uebung_id == $row->uebung_id)
-			$selected = 'selected';
-		else
-			$selected = '';
-		echo "<OPTION value='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id' $selected>";
-		//Freigegeben = +
-		//Nicht Freigegeben = -
-		if($datum_obj->mktime_fromtimestamp($row->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($row->freigabebis)>time())
-			echo '+ ';
-		else
-			echo '- ';
-		echo $row->bezeichnung;
-		echo '</OPTION>';
-	}
-	echo '</SELECT>';
-	echo "</td>
-		<td>
-			<table>
-			<tr>
-				<td><b>+</b>...</td>
-				<td>Kreuzerlliste ist <u>freigeschalten</u>.</td>
-			</tr>
-			<tr>
-				<td><b>-</b>...</td>
-				<td>Kreuzerlliste ist <u>nicht freigeschalten</u>.</td>
-			</tr>
-			</table>
-		</td>
-	</tr></table>";
-}
-else
-	die("Derzeit gibt es keine Uebungen");
-*/
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,1);
-	if(count($uebung_obj->uebungen)>0)
-	{
-		echo "<table width='100%'><tr><td valign='top'>";
-		echo "<br>".$p->t('benotungstool/waehlenSieEineAufgabeAus').": <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		echo "<option value='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=' selected></option>";
-		foreach ($uebung_obj->uebungen as $row)
-		{
-			
-			if($uebung_id == $row->uebung_id)
-				$selected = 'selected';
-			else
-				$selected = '';		
-					
-			if($uebung_id=='')
-				$uebung_id=$row->uebung_id;
-			
-			$subuebung_obj = new uebung();
-			$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-			if(count($subuebung_obj->uebungen)>0)
-				{
-				$disabled = 'disabled';
-				$selected = '';
-				}
-			else
-				$disabled = '';
-			
-			echo "<OPTION style='background-color:#cccccc;' value='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id' $selected $disabled>";
-			
-			
-			echo $row->bezeichnung;
-			echo '</OPTION>';
-			
-			if(count($subuebung_obj->uebungen)>0)
-			{
-				foreach ($subuebung_obj->uebungen as $subrow)
-				{
-					if($uebung_id=='')
-						$uebung_id=$subrow->uebung_id;
-		
-					if($uebung_id == $subrow->uebung_id)
-					{
-				
-						$selected = 'selected';
-						if ($subrow->beispiele)	
-							$show_excel_link = true;
-					}
-					else
-					{						
-						$selected = '';
-					}
-					
-					echo "<OPTION value='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id' $selected>";
-
-					
-					//Freigegeben = +
-					//Nicht Freigegeben = -
-					if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-						echo ' + ';
-					else
-						echo ' - ';
-					
-					echo $subrow->bezeichnung;
-					echo '</OPTION>';
-					
-				}
-			}
-		}
-		
-		echo '</SELECT>';
-		
-		echo '</td>';
-		
-		echo "<td>
-			<table>
-			<tr>
-				<td><b>+</b>...</td>
-				<td><u>".$p->t('benotungstool/freigeschaltet')."</u>.</td>
-			</tr>
-			<tr>
-				<td><b>-</b>...</td>
-				<td><u>".$p->t('benotungstool/nichtFreigeschaltet')."</u>.</td>
-			</tr>
-			</table>
-		</td>
-	</tr></table>";
-	}
-	else
-		die($p->t('benotungstool/derzeitSindKeineUebungenAngelegt'));
-
-$uebung_obj = new uebung();
-$uebung_obj->load($uebung_id);
-echo "<h3><u>$uebung_obj->bezeichnung</u></h3>";
-
-echo '<table width="100%"><tr><td>';
-echo "<ul><li><a href='anwesenheitsliste.php?output=html&uebung_id=$uebung_id&lehreinheit_id=$lehreinheit_id&stsem=$stsem' target='_blank'>".$p->t('benotungstool/alleStudierenden')."</a>&nbsp;";
-if ($show_excel_link)
-	echo "<a href='anwesenheitsliste.php?output=xls&uebung_id=$uebung_id&lehreinheit_id=$lehreinheit_id&stsem=$stsem'><img src='../../../../skin/images/excel.gif' width=16 height=16></a>";
-echo "</li>";
-echo '</ul>';
-echo "</td><!--<td valign='top'>
-<ul><li>
-<a href='anwesenheitsliste.php?output=xls&lehreinheit_id=$lehreinheit_id&all'>Gesamt&uuml;bersicht&nbsp;<img src='../../../../skin/images/excel.gif' width=16 height=16></a>
-</li></ul>
-</td>--></tr></table>";
-
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/copy_uebung.php b/cis/private/lehre/benotungstool/copy_uebung.php
deleted file mode 100644
index 855b106ed..000000000
--- a/cis/private/lehre/benotungstool/copy_uebung.php
+++ /dev/null
@@ -1,874 +0,0 @@
-<?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>.
- */
-/*
- * Script zum Kopieren einer Kreuzerltool Uebung zu einer anderen Lehreinheit
- * (zB fuer die Uebernahme der Uebungen aus dem Vorjahr)
- */
-	require_once('../../../../config/cis.config.inc.php');
-// ------------------------------------------------------------------------------------------
-//	Datenbankanbindung 
-// ------------------------------------------------------------------------------------------
-	require_once('../../../../include/basis_db.class.php');
-	if (!$db = new basis_db())
-			die('Fehler beim Herstellen der Datenbankverbindung');
-
-// ---------------- Standart Include Dateien einbinden
-    require_once('../../../../include/studiengang.class.php');
-	require_once('../../../../include/studiensemester.class.php');
-    require_once('../../../../include/lehrveranstaltung.class.php');
-    require_once('../../../../include/lehreinheit.class.php');
-    require_once('../../../../include/lehreinheitgruppe.class.php');
-    require_once('../../../../include/lehreinheitmitarbeiter.class.php');
-
-
-	require_once('../../../../include/functions.inc.php');
-	require_once('../../../../include/benutzerberechtigung.class.php');
-	require_once('../../../../include/uebung.class.php');
-	require_once('../../../../include/beispiel.class.php');
-	require_once('../../../../include/datum.class.php');
-
-	
-// ***********************************************************************************************
-//      Datenbankverbindungen zu Classen
-// ***********************************************************************************************
-
-        if (!$le_obj = new lehreinheit())
-	         die('Fehler beim Oeffnen der Lehreinheit');
-
-        if (!$legrp_obj = new lehreinheitgruppe())
-	         die('Fehler beim Oeffnen der Lehreinheitgruppe');
-
-        if (!$lv_obj = new lehrveranstaltung())
-	         die('Fehler beim Oeffnen der Lehrveranstaltung');
-
-        if (!$stg_obj = new studiengang())
-	         die('Fehler beim Oeffnen der Studieng&auml;nge');
-
-        if (!$stsem = new studiensemester())
-	         die('Fehler beim Oeffnen der Studiensemester');
-        // @$studiensemester_kurzbz Studiensemester xxJJJJ - xx fuer SS Sommer  oder WW Winter
-        if (!$stsem_aktuell = $stsem->getakt())
-                $stsem_aktuell = $stsem->getaktorNext();	
-	
-	
-##echo "<hr> GET <br> ";	
-#var_dump($_GET);	
-#echo "<hr> POST <br> ";
-#var_dump($_POST);
-	
-$errormsg=array();
-$error=0;
-
-$user = get_uid();
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($user);
-
-if(!$rechte->isBerechtigt('admin'))
-	die('Sie haben keine Rechte f&uuml;r diese Seite');
-
-// @studiensemester_kurzbz Studiensemester WSxxxx SSxxxx
-        $studiensemester_kurzbz=(isset($_GET['studiensemester_kurzbz'])?trim($_GET['studiensemester_kurzbz']):$stsem_aktuell);
-// $lehrveranstaltung_id Lehrveranstaltung zur Lehreinheit
-	    $lehrveranstaltung_id=(isset($_GET['lvid'])?trim($_GET['lvid']):(isset($_GET['lehrveranstaltung_id'])?trim($_GET['lehrveranstaltung_id']):''));
-// @$studiengang_kz Studiengang
-        $studiengang_kz=(isset($_GET['studiengang_kz'])?trim($_GET['studiengang_kz']):227);
-// @$semester Semester des Studienganges
-        $semester=(isset($_GET['semester'])?trim($_GET['semester']):1);
-// @$lehreinheit_id Lehreinheit
-        $lehreinheit_id=(isset($_GET['leid'])?trim($_GET['leid']):(isset($_GET['lehreinheit_id'])?trim($_GET['lehreinheit_id']):''));
-		
-		
-        $uebung_id_source=(isset($_GET['uebung_id_source'])?$_GET['uebung_id_source']:(isset($_GET['uebung_id'])?trim($_GET['uebung_id']):''));
-
-// ------------- Target
-// @studiensemester_kurzbz Studiensemester WSxxxx SSxxxx
-        $studiensemester_kurzbz_target=(isset($_GET['studiensemester_kurzbz_target'])?trim($_GET['studiensemester_kurzbz_target']):$stsem_aktuell);
-// $lehrveranstaltung_id Lehrveranstaltung zur Lehreinheit
-	    $lehrveranstaltung_id_target=(isset($_GET['lvid_target'])?trim($_GET['lvid_target']):(isset($_GET['lehrveranstaltung_id_target'])?trim($_GET['lehrveranstaltung_id_target']):''));
-// @$studiengang_kz Studiengang
-        $studiengang_kz_target=(isset($_GET['studiengang_kz_target'])?trim($_GET['studiengang_kz_target']):227);
-// @$semester Semester des Studienganges
-        $semester_target=(isset($_GET['semester_target'])?trim($_GET['semester_target']):$semester);
-// @$lehreinheit_id_target Lehreinheit
-        $lehreinheit_id_target=(isset($_GET['lehreinheit_id_target'])?trim($_GET['lehreinheit_id_target']):'');
-// @$lehreinheit_id_sel Lehreinheit
-       $lehreinheit_id_sel=(isset($_GET['lehreinheit_id_sel'])?trim($_GET['lehreinheit_id_sel']):'');
-// @$lehreinheit_id_sel Lehreinheit
-    $uebung_id_sel=(isset($_GET['uebung_id_sel'])?trim($_GET['uebung_id_sel']):'');
-
-if ($uebung_id_sel!='' && !is_array($uebung_id_sel))
-	$uebung_id_sel=array($uebung_id_sel);
-		
-if ($uebung_id_source!='' && !is_array($uebung_id_source))
-	$uebung_id_source=array($uebung_id_source);
-
-#var_dump($uebung_id_source);
-	
-if (!empty($lehreinheit_id_sel))
-{
-
-
-		if ($le_obj->load($lehreinheit_id_sel))
-		{
-			$studiensemester_kurzbz=$le_obj->studiensemester_kurzbz;
-			$lehrveranstaltung_id=$le_obj->lehrveranstaltung_id;
-			$lehreinheit_id=$lehreinheit_id_sel;
-			if ($lv_obj->load($lehrveranstaltung_id))
-			{			
-				$studiengang_kz=$lv_obj->studiengang_kz;
-				$semester=$lv_obj->semester;
-			}
-			else
-			{
-            	$errormsg[]='Lehrveranstaltung '.$lehrveranstaltung_id.' wurden nicht gefunden! '.$lv_obj->errormsg;
-			}	
-		}
-		else
-		{
-            $errormsg[]='Lehreinheit '.$lehreinheit_id_sel.' wurden nicht gefunden! '.$le_obj->errormsg;
-		}	
-}	
-else if(!isset($_GET['kopieren']) && $uebung_id_source=='' && $uebung_id_sel!='' )
-{
-#var_dump($uebung_id_sel);
-	$uebung_id_source=$uebung_id_sel;
-}
-	
-#var_dump($uebung_id_source);	
-	
-// Es wurde nur eine Uebungsid uebergeben, und noch keine Aktion gedrueckt		
-if(!isset($_GET['kopieren']) && $uebung_id_source!='')
-{
-		if (!is_array($uebung_id_source) && !empty($uebung_id_source))
-			$uebung_id_source=array($uebung_id_source);
-			
-		$ueb_0 = new uebung($uebung_id_source[0]);
-#var_dump($ueb_0);		
-        if ($lehreinheit_id=$ueb_0->lehreinheit_id)
-        {
-                if ($le_obj->load($lehreinheit_id))
-                {
-                        $lehrveranstaltung_id = $le_obj->lehrveranstaltung_id;
-                        $studiensemester_kurzbz = $le_obj->studiensemester_kurzbz;
-				// @$lehrveranstaltung_id Lehrveranstaltung
-				        if ($lehrveranstaltung_id)
-				        {
-				                if ($lv_obj->load($lehrveranstaltung_id))
-				                {
-				                    $studiengang_kz = $lv_obj->studiengang_kz;
-					            	$semester = $lv_obj->semester;
-				                }
-				                else
-				                {
-				                    $bAnzeige=false;
-				                    $errormsg[]='Lehrveranstaltung wurde nicht gefunden '.addslashes($lehreinheit_id).' '.$lv_obj->errormsg;
-				                }
-				        }
-                }
-                else
-                {
-                        $bAnzeige=false;
-                        $errormsg[]='Lehreinheit wurde nicht gefunden '.addslashes($lehreinheit_id).' '.$le_obj->errormsg;
-                }
-        }
-		else
-		{
-             $errormsg[]='&Uuml;bung wurde nicht gefunden '.addslashes($uebung_id_source).' '.$ueb_0->errormsg;
-		}				
-}
-
-// Aktion wurde gedruckt	
-if(isset($_GET['kopieren']))
-{
-		if (!is_array($uebung_id_source) && !empty($uebung_id_source) )
-			$uebung_id_source=array($uebung_id_source);
-		if (!is_array($uebung_id_source) || count($uebung_id_source)<1 )
-		{
-			$error=true;
-			$errormsg[]="<span class='error'>&Uuml;bung muss ausgew&auml;hlt sein!</span>";
-		}
-		
-		if (!is_numeric($lehreinheit_id_target))
-		{
-			$error=true;
-			$errormsg[]="<span class='error'>Lehreinheit muss ausgew&auml;hlt sein!</span>";
-		}	
-		
-		if (!$error)
-		{
-			$db->db_query('BEGIN;');	
-
-			reset($uebung_id_source);
-			foreach ($uebung_id_source as $ueb)
-			{
-				$copy_insert = 0;
-				$copy_update = 0;	
-				$copy_insert_bsp = 0;
-				$copy_update_bsp = 0;
-				$error=false;
-				
-				
-				$ueb_1 = new uebung($ueb);
-				$lehreinheit_id_unterord=$ueb_1->lehreinheit_id;
-				$nummer_source = $ueb_1->nummer;
-				$qry = "SELECT * from campus.tbl_uebung where nummer = ".myaddslashes($nummer_source)." and lehreinheit_id = ".myaddslashes($lehreinheit_id_target).";";
-				//echo $qry;
-				if($result1 = $db->db_query($qry))	
-				{
-					if ($db->db_num_rows($result1) >0)
-					{
-						$row1 = $db->db_fetch_object($result1);		
-						$ueb_1_target =new uebung($row1->uebung_id);
-						$ueb_1_target->new = false;
-						$new = null;
-						$ueb_1_target->insertamum = null;
-						$ueb_1_target->insertvon = null;
-						$ueb_1_target->updateamum = date('Y-m-d H:i:s');
-						$ueb_1_target->updatevon = $user;
-						$copy_update++;
-					}
-					else
-					{
-						$ueb_1_target =new uebung();
-						$ueb_1_target->new = true;
-						$new = true;
-						$ueb_1_target->insertamum = date('Y-m-d H:i:s');
-						$ueb_1_target->insertvon = $user;
-						$ueb_1_target->updateamum = null;
-						$ueb_1_target->updatevon = null;
-						$copy_insert++;
-					}
-					$ueb_1_target->gewicht = $ueb_1->gewicht;
-					$ueb_1_target->punkte = null;
-					$ueb_1_target->angabedatei=null;
-					$ueb_1_target->freigabevon = null;
-					$ueb_1_target->freigabebis = null;
-					$ueb_1_target->abgabe = false;
-					$ueb_1_target->beispiele = false;
-					$ueb_1_target->statistik = false;
-					$ueb_1_target->maxstd = null;
-					$ueb_1_target->maxbsp=null;
-					$ueb_1_target->liste_id=null;
-					$ueb_1_target->bezeichnung = $ueb_1->bezeichnung;
-					$ueb_1_target->positiv = $ueb_1->positiv;
-					$ueb_1_target->defaultbemerkung = $ueb_1->defaultbemerkung;
-					$ueb_1_target->lehreinheit_id = $lehreinheit_id_target;
-					$ueb_1_target->nummer = $nummer_source;
-							
-					if (!$ueb_1_target->save($new))
-					{
-						$error = 1;
-						$errormsg[]="<span class='error'>Haupt&uuml;bung konnte nicht kopiert werden!</span>";
-					}
-						
-					else
-					{
-						// Subübungen durchlaufen			
-						$ueb_2 = new uebung();
-						$ueb_2->load_uebung($lehreinheit_id_unterord,2,$ueb);
-						
-						$ueb_2anzahl = count($ueb_2->uebungen);
-						if ($ueb_2anzahl >0)			
-						{
-							foreach ($ueb_2->uebungen as $subrow)
-							{
-																	
-								$nummer_source2 = $subrow->nummer;
-								$qry2 = "SELECT * from campus.tbl_uebung where nummer = '".$nummer_source2."' and lehreinheit_id = '".$lehreinheit_id_target."'";
-								$result2 = $db->db_query($qry2);
-								if ($db->db_num_rows($result2) >0)
-								{
-									$row2 = $db->db_fetch_object($result2);		
-									$ueb_2_target =new uebung($row2->uebung_id);
-									$ueb_2_target->new = false;
-									$new = null;
-									$ueb_2_target->insertamum = null;
-									$ueb_2_target->insertvon = null;
-									$ueb_2_target->updateamum = date('Y-m-d H:i:s');
-									$ueb_2_target->updatevon = $user;
-									$copy_update++;
-								}
-								else
-								{
-									$ueb_2_target =new uebung();
-									$ueb_2_target->new = true;
-									$new = true;
-									$ueb_2_target->insertamum = date('Y-m-d H:i:s');
-									$ueb_2_target->insertvon = $user;
-									$ueb_2_target->updateamum = null;
-									$ueb_2_target->updatevon = null;
-									$copy_insert++;
-								}
-								$ueb_2_target->gewicht = $subrow->gewicht;
-								$ueb_2_target->punkte = $subrow->punkte;
-								$ueb_2_target->angabedatei=null;
-								$ueb_2_target->freigabevon = $subrow->freigabevon;
-								$ueb_2_target->freigabebis = $subrow->freigabebis;
-								$ueb_2_target->abgabe = $subrow->abgabe;
-								$ueb_2_target->beispiele = $subrow->beispiele;
-								$ueb_2_target->statistik = $subrow->statistik;
-								$ueb_2_target->maxstd = $subrow->maxstd;
-								$ueb_2_target->maxbsp=$subrow->maxbsp;
-								$ueb_2_target->liste_id=$ueb_1_target->uebung_id;
-								$ueb_2_target->bezeichnung = $subrow->bezeichnung;
-								$ueb_2_target->positiv = $subrow->positiv;
-								$ueb_2_target->defaultbemerkung = $subrow->defaultbemerkung;
-								$ueb_2_target->lehreinheit_id = $lehreinheit_id_target;
-								$ueb_2_target->nummer = $nummer_source2;
-										
-								if (!$ueb_2_target->save($new))
-								{
-									$error = 1;
-									$errormsg[]="<span class='error'>&Uuml;bung konnte nicht kopiert werden!</span>";
-								}
-								
-								//angabedatei syncen
-								if (($error == 0) and $subrow->angabedatei != "")
-								{	
-									$angabedatei_source = $subrow->angabedatei;
-									$angabedatei_target = makeUploadName($db,'angabe', $lehreinheit_id_target, $ueb_2_target->uebung_id, $stsem);
-									$angabedatei_target .= ".".mb_substr($angabedatei_source, mb_strrpos($angabedatei_source, '.',0) + 1);
-									echo $angabedatei_source."->".$angabedatei_target."<br>";
-									exec("cp ".BENOTUNGSTOOL_PATH."angabe/".$angabedatei_source." ".BENOTUNGSTOOL_PATH."angabe/".$angabedatei_target);
-									$angabeupdate = "update campus.tbl_uebung set angabedatei = '".$angabedatei_target."' where uebung_id = '".$ueb_2_target->uebung_id."'";
-									$db->db_query($angabeupdate);
-								}
-												
-								if (($error == 0) and $ueb_2_target->beispiele)
-								{
-									// beispiele synchronisieren
-									$bsp_obj = new beispiel();
-									$bsp_obj->load_beispiel($subrow->uebung_id);
-									foreach ($bsp_obj->beispiele as $bsp)
-									{
-										$nummer_source_bsp = $bsp->nummer;
-										$qrybsp = "SELECT * from campus.tbl_beispiel where nummer = '".$nummer_source_bsp."' and uebung_id = '".$ueb_2_target->uebung_id."'";
-										$resultbsp = $db->db_query($qrybsp);
-					
-										if ($db->db_num_rows($resultbsp) >0)
-										{
-											$rowbsp = $db->db_fetch_object($resultbsp);		
-											$bsp_target =new beispiel($rowbsp->beispiel_id);
-											$bsp_target->new = false;
-											$new = null;
-											$bsp_target->insertamum = null;
-											$bsp_target->insertvon = null;
-											$bsp_target->updateamum = date('Y-m-d H:i:s');
-											$bsp_target->updatevon = $user;
-											$copy_update_bsp++;
-										}
-										else
-										{
-											$bsp_target =new beispiel();
-											$bsp_target->new = true;
-											$new = true;
-											$bsp_target->insertamum = date('Y-m-d H:i:s');
-											$bsp_target->insertvon = $user;
-											$bsp_target->updateamum = null;
-											$bsp_target->updatevon = null;
-											$copy_insert_bsp++;
-										}
-										$bsp_target->uebung_id = $ueb_2_target->uebung_id;
-										$bsp_target->nummer = $nummer_source_bsp;
-										$bsp_target->bezeichnung = $bsp->bezeichnung;
-										$bsp_target->punkte = $bsp->punkte;
-										
-										if (!$bsp_target->save($new))
-										{
-											$error = 1;
-											$errormsg[]="<span class='error'>Beispiele konnten nicht angelegt werden</span>";							
-										}
-										
-										//Notenschlüssel synchronisieren
-										$clear = "delete from campus.tbl_notenschluesseluebung where uebung_id = '".$ueb_1_target->uebung_id."'";
-										$db->db_query($clear);
-										
-										$qry_ns_source = "SELECT * from campus.tbl_notenschluesseluebung where uebung_id = '".$ueb."'";
-										$result_ns_source = $db->db_query($qry_ns_source);
-										while($row_ns = $db->db_fetch_object($result_ns_source))
-										{
-											$ns_insert = "INSERT INTO campus.tbl_notenschluesseluebung values ('".$ueb_1_target->uebung_id."','".$row_ns->note."', '".$row_ns->punkte."')";
-											$db->db_query($ns_insert);					
-										}					
-													
-									}									
-								}
-									
-							}
-						}
-					}
-					
-				}
-				else
-				{
-					$errormsg[]="<span class='error'>Fehler beim Datenbankzugriff!</span>";
-				}				
-	
-				if ($error == 0)
-				{
-					$errormsg[]="&Uuml;bung ".$ueb." erfolgreich kopiert! (&Uuml;: ".$copy_insert."/".$copy_update."; B: ".$copy_insert_bsp."/".$copy_update_bsp.")";
-				}
-				else
-				{
-					$errormsg[]="&Uuml;bung ".$ueb." wurde nicht kopiert! (&Uuml;: ".$copy_insert."/".$copy_update."; B: ".$copy_insert_bsp."/".$copy_update_bsp.")";
-					break;
-				}
-			}	
-		}	
-		// Nun alle An Felder - Lehreinheit zum Von kopieren (neue Anzeige)
-		if ($error == 0)
-		{
-			$db->db_query('COMMIT');	
-		}
-		else
-		{
-			$db->db_query('ROLLBACK');			
-		}
-		$errormsg[]='<br><br><a href="'.$_SERVER['PHP_SELF'].'" class="Item">noch eine &Uuml;bung kopieren</a>';
-	}
-
-
-	// ***********************************************************************************************
-	//      Datenbankfeld - Variable 
-	// ***********************************************************************************************
-	function myaddslashes($var)
-	{
-		return ($var!=''?"'".addslashes($var)."'":'null');
-	}
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title>Kreuzerltool - Copy </title>
-</head>
-<body>
-	<?php
-     $cFormName='copy_uebung';
-
-	 $content='';
-	 $content.='
-		<h1>Kopieren von &Uuml;bungen in eine andere Lehreinheit</h1>
-          <form title="Script zum Kopieren einer &Uuml;bung in eine beliebige Lehreinheit." accept-charset="UTF-8" name="'.$cFormName.'"  method="GET" target="_self" action="'.$_SERVER['PHP_SELF'].'" >
-				Direkt Eingabe : LE ID:<input name="lehreinheit_id_sel" onchange="document.'.$cFormName.'.studiengang_kz.selectedIndex = -1;document.'.$cFormName.'.semester.selectedIndex = -1;document.'.$cFormName.'.lehrveranstaltung_id.selectedIndex = -1;document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();">&nbsp;,&nbsp;
-				&Uuml;bung ID:<input name="uebung_id_sel" onchange="document.'.$cFormName.'.studiengang_kz.selectedIndex = -1;document.'.$cFormName.'.semester.selectedIndex = -1;document.'.$cFormName.'.lehrveranstaltung_id.selectedIndex = -1;document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();">&nbsp;&nbsp;oder<br><br>
-				
-				
-			<table class="liste">
-			<tr>
-			   	<th>Studiensem</th>
-			   	<th>StgKz</th>
-			   	<th>Sem</th>
-			   	<th>Lehrveranstaltung</th>
-			   	<th>Lehreinheiten</th>
-			   	<th>&Uuml;bungID die kopiert werden soll:</th>
-			</tr>
-			<tr>
-			
-';
-    //---------------------------------------------------------------------------
-	// Auswahlfelder
-	     $content.='<tr>';
-
-        // Studiensemester public.tbl_studiensemester_kurzbz
-         $content.='<td valign="top"><select onchange="document.'.$cFormName.'.studiengang_kz.selectedIndex = -1;document.'.$cFormName.'.semester.selectedIndex = -1;document.'.$cFormName.'.lehrveranstaltung_id.selectedIndex = -1;document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();" name="studiensemester_kurzbz">';
-# 	     $content.='<option value="">&nbsp;Alle&nbsp;</option>';
-         $stsem->studiensemester=array();
-		 if ($stsem->getAll())
-         {
-              foreach ($stsem->studiensemester as $row)
-              {
-                     $content.='<option value="'.$row->studiensemester_kurzbz.'" '.(("$studiensemester_kurzbz"=="$row->studiensemester_kurzbz")?' selected="selected" ':'').'>&nbsp;'.$row->studiensemester_kurzbz.'&nbsp;</option>';
-              }
-         }
-         else
-         {
-               $errormsg[]='Studiensemester wurden nicht gefunden! '.$stsem->errormsg;
-         }
-         $content.='</select></td>';
-
-        //---------------------------------------------------------------------------
-        // Studiengang public.tbl_studiengang_kz
-        	$content.='<td valign="top"><select onchange="document.'.$cFormName.'.semester.selectedIndex = -1;document.'.$cFormName.'.lehrveranstaltung_id.selectedIndex = -1;document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();" name="studiengang_kz">';
-#			$content.='<option value="" '.(empty($studiengang_kz)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-            $stsem->result=array();
-            if ($stg_obj->getAll('typ, kurzbz',true))
-            {
-                        $max_semester=0;
-                        $arrStudiengang='';
-                        foreach ($stg_obj->result as $row)
-                        {
-                                if (empty($studiengang_kz) && !isset($_REQUEST['studiengang_kz']) )
-                                {
-                                        $studiengang_kz=$row->studiengang_kz;
-                                        $semester=1;
-                                }
-                                if ($studiengang_kz==$row->studiengang_kz)
-                                {
-                                        $arrStudiengang=$row;
-                                        $max_semester=$row->max_semester;
-                                }
-                                $content.='<option value="'.$row->studiengang_kz.'" '.(("$studiengang_kz"=="$row->studiengang_kz")?' selected="selected" ':'').'>&nbsp;'.$row->kuerzel.'&nbsp;('.$row->kurzbzlang.')&nbsp;</option>';
-                        }
-                }
-                else
-                {
-                        $content.='<option value="" '.(empty($studiengang_kz)?' selected="selected" ':'').'>&nbsp;'.$stg_obj->errormsg.'&nbsp;</option>';
-                        $errormsg[]='Studieng&auml;nge wurden nicht gefunden! '.$stg_obj->errormsg;
-                }
-                $content.='</select></td>';
-
-        //---------------------------------------------------------------------------
-        // Semster public.tbl_studiengang_kz - max Semester des Selektierten Studiengangs
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'.lehrveranstaltung_id.selectedIndex = -1;document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();" name="semester">';
-#                $content.='<option value="" '.(empty($semester)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                if ($studiengang_kz!='')
-                {
-                        for($i=0;$i<=$max_semester;$i++)
-                        {
-                                $content.='<option value="'.($i).'" '.(("$semester"=="$i")?' selected="selected" ':'').'>&nbsp;'.($i).'&nbsp;</option>';
-                        }
-                }
-                else
-                {
-                        for($i=0;$i<=9;$i++)
-                        {
-                                $content.='<option value="'.($i).'" '.(("$semester"=="$i")?' selected="selected" ':'').'>&nbsp;'.($i).'&nbsp;</option>';
-                        }
-                }
-                $content.='</select></td>';
-
-        //---------------------------------------------------------------------------
-        // Lehrveranstaltungen
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'.lehreinheit_id.selectedIndex = -1;document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();" name="lehrveranstaltung_id">';
-#                $content.='<option value="" '.(empty($lehrveranstaltung_id)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                $lv_obj->lehrveranstaltungen=array();
-		  		if (!empty($studiengang_kz))
-		  		{	
-	                if ($lv_obj->load_lva_le($studiengang_kz, $studiensemester_kurzbz, $semester,null,null,null,'bezeichnung'))
-	                {
-	                        foreach ($lv_obj->lehrveranstaltungen as $row)
-	                        {
-									if (empty($lehrveranstaltung_id))
-										$lehrveranstaltung_id=$row->lehrveranstaltung_id;
-	                                $content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30, '...').' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
-	                        }
-	                }
-	                else
-	                {
-	                        $content.='<option value="" '.(empty($studiengang_kz)?' selected="selected" ':'').'>&nbsp;'.$stg_obj->errormsg.'&nbsp;</option>';
-	                        $errormsg[]='Lehrveranstaltungen wurden nicht gefunden! '.$lv_obj->errormsg;
-	                }
-		 	 	}	  
-                $content.='</select>
-		  </td>';
-        //---------------------------------------------------------------------------
-        // Lehreinheit
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'[7].selectedIndex = -1;document.'.$cFormName.'.submit();" name="lehreinheit_id">';
-#                $content.='<option value="" '.(empty($lehreinheit_id)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                $le_obj->lehreinheiten=array();
-                if (!empty($lehrveranstaltung_id))
-                {
-                        $le_obj->load_lehreinheiten($lehrveranstaltung_id, $studiensemester_kurzbz);
-                        foreach ($le_obj->lehreinheiten as $row)
-                        {
-								if (empty($lehreinheit_id))
-									$lehreinheit_id=$row->lehreinheit_id;
-						
-                                //Gruppen laden
-                          		$gruppen = '';
-					    		if (!$legrp_obj = new lehreinheitgruppe())
-						      		   die('Fehler beim Oeffnen der Lehreinheitgruppe');
-                           
-							    if ($legrp_obj->getLehreinheitgruppe($row->lehreinheit_id))
-                                {
-                                        foreach ($legrp_obj->lehreinheitgruppe as $grp)
-                                        {
-                                                if($grp->gruppe_kurzbz=='')
-                                                        $gruppen.=' '.$grp->semester.$grp->verband.$grp->gruppe;
-                                                else
-                                                        $gruppen.=' '.$grp->gruppe_kurzbz;
-                                        }
-                                }
-							//Lektoren laden
-								$lektoren='';
-								$lehreinheitmitarbeiter = new lehreinheitmitarbeiter();
-								$lehreinheitmitarbeiter->getLehreinheitmitarbeiter($row->lehreinheit_id);
-								foreach ($lehreinheitmitarbeiter->lehreinheitmitarbeiter as $ma)
-								{
-									$lektoren.= ($lektoren?',':'').'&nbsp;'.$ma->mitarbeiter_uid;
-								}
-								$lektoren=CutString($lektoren, 30, '...');
-                                $content.='<option value="'.$row->lehreinheit_id.'" '.($lehreinheit_id==$row->lehreinheit_id?' selected="selected" ':'').'>&nbsp;'.$row->lehrform_kurzbz.' '.$gruppen.'&nbsp;'.$lektoren.'&nbsp;('.$row->lehreinheit_id.')</option>';
-                        }
-                }
-                $content.='</select></td>';			
-
-#var_dump($uebung_id_source);
-		
-				$submitOK=false;				
-				if (!$ueb = new uebung())
-				{
-			         die('Fehler beim Oeffnen der &Uuml;bungen');
-				}
-				else
-				{
-					$ueb->uebungen=array();
-					$ueb->errormsg ='';
-					if (!$lehreinheit_ueb=$ueb->load_uebung($lehreinheit_id))
-					{
-						$errormsg[]=$ueb->errormsg;
-					}	
-				}
-
-	            $content.='<td valign="top"><select multiple size="'.count($ueb->uebungen).'" name="uebung_id_source[]">';
-				if (is_array($ueb->uebungen) && count($ueb->uebungen)>0)
-				{
-                        foreach ($ueb->uebungen as $row)
-						{									
-							if (!is_array($uebung_id_source) && !empty($uebung_id_source) )
-								$uebung_id_source=array($uebung_id_source);
-							$selected='';
-							if (is_array($uebung_id_source) && count($uebung_id_source)>0 )
-							{
-								reset($uebung_id_source);
-								foreach ($uebung_id_source as $ueb)
-								{
-									if ($row->uebung_id==$ueb)
-										$selected=' selected="selected" ';									
-								}
-							}	
-							$submitOK=true;
-                            $content.='<option value="'.$row->uebung_id.'" '.$selected.'>&nbsp;'.$row->bezeichnung.'&nbsp;('.$row->uebung_id.')</option>';
-                        }
-				}					
-				if (!$submitOK)
-                      $content.='<option value="">&nbsp;<span class="error">keine &Uuml;bung zur LE</span></option>';
-                $content.='</select></td>';			
-			
-		$content.='	
-			</tr>
-			<tr><td colspan="6"><hr></td></tr>
-			';
-						
-			if ($submitOK)			
-				$content.='<tr><th colspan="5">Lehreinheit ID in welche diese &Uuml;bung kopiert werden soll</th><td><input type="submit" value="Kopieren" name="kopieren"></td></tr>';
-			else
-				$content.='<tr><th colspan="6">Lehreinheit ID in welche diese &Uuml;bung kopiert werden soll</th></tr>';
-				
-		$content.='	
-			<tr><td colspan="6">&nbsp;</td></tr>			
-			';			
-
-		$content.='	
-			<tr>			
-			';
-			
-         $content.='<td valign="top"><select onchange="document.'.$cFormName.'.semester_target.value=\'\';document.'.$cFormName.'.lehrveranstaltung_id_target.value=\'\';document.'.$cFormName.'.lehreinheit_id_target.value=\'\';document.'.$cFormName.'.submit();" name="studiensemester_kurzbz_target">';
-# 	     $content.='<option value="">&nbsp;Alle&nbsp;</option>';
-         $stsem->studiensemester=array();
-		 if ($stsem->getAll())
-         {
-              foreach ($stsem->studiensemester as $row)
-              {
-                     $content.='<option value="'.$row->studiensemester_kurzbz.'" '.(("$studiensemester_kurzbz_target"=="$row->studiensemester_kurzbz")?' selected="selected" ':'').'>&nbsp;'.$row->studiensemester_kurzbz.'&nbsp;</option>';
-              }
-         }
-         else
-         {
-               $errormsg[]='Studiensemester wurden nicht gefunden! '.$stsem->errormsg;
-         }
-         $content.='</select></td>';
-
-        //---------------------------------------------------------------------------
-        // Studiengang public.tbl_studiengang_kz
-        	$content.='<td valign="top"><select onchange="document.'.$cFormName.'.semester_target.value=\'\';document.'.$cFormName.'.lehrveranstaltung_id_target.value=\'\';document.'.$cFormName.'.lehreinheit_id_target.value=\'\';document.'.$cFormName.'.submit();" name="studiengang_kz_target">';
-#			$content.='<option value="" '.(empty($studiengang_kz)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-            $stsem->result=array();
-            if ($stg_obj->getAll('typ, kurzbz',true))
-            {
-                        $max_semester=0;
-                        $arrStudiengang='';
-                        foreach ($stg_obj->result as $row)
-                        {
-                                if (empty($studiengang_kz_target) && !isset($_REQUEST['studiengang_kz_target']) )
-                                {
-                                        $studiengang_kz_target=$row->studiengang_kz;
-                                        $semester_target=1;
-                                }
-                                if ($studiengang_kz_target==$row->studiengang_kz)
-                                {
-                                        $arrStudiengang=$row;
-                                        $max_semester=$row->max_semester;
-                                }
-                                $content.='<option value="'.$row->studiengang_kz.'" '.(("$studiengang_kz_target"=="$row->studiengang_kz")?' selected="selected" ':'').'>&nbsp;'.$row->kuerzel.'&nbsp;('.$row->kurzbzlang.')&nbsp;</option>';
-                        }
-                }
-                else
-                {
-                        $content.='<option value="" '.(empty($studiengang_kz_target)?' selected="selected" ':'').'>&nbsp;'.$stg_obj->errormsg.'&nbsp;</option>';
-                        $errormsg[]='Studieng&auml;nge wurden nicht gefunden! '.$stg_obj->errormsg;
-                }
-                $content.='</select></td>';
-
-
-        //---------------------------------------------------------------------------
-        // Semster public.tbl_studiengang_kz - max Semester des Selektierten Studiengangs
-		// document.'.$cFormName.'.uebung_id_source_target.value=\'\';
-        //        $content.='<td valign="top"><select onchange="document.'.$cFormName.'.lehrveranstaltung_id_target.value=\'\';document.'.$cFormName.'.lehreinheit_id_target.value=\'\';document.'.$cFormName.'.submit();" name="semester_target">';
-#                $content.='<option value="" '.(empty($semester)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'.lehrveranstaltung_id_target.value=\'\';document.'.$cFormName.'.lehreinheit_id_target.value=\'\';document.'.$cFormName.'.submit();" name="semester_target">';
-                if ($studiengang_kz_target!='')
-                {
-                        for($i=0;$i<=$max_semester;$i++)
-                        {
-                                $content.='<option value="'.($i).'" '.(("$semester_target"=="$i")?' selected="selected" ':'').'>&nbsp;'.($i).'&nbsp;</option>';
-                        }
-                }
-                else
-                {
-                        for($i=0;$i<=9;$i++)
-                        {
-                                $content.='<option value="'.($i).'" '.(("$semester_target"=="$i")?' selected="selected" ':'').'>&nbsp;'.($i).'&nbsp;</option>';
-                        }
-                }
-                $content.='</select></td>';
-
-
-##echo "<br> $studiengang_kz_target, $studiensemester_kurzbz_target, $semester_target , $lehrveranstaltung_id_target <br>";
-
-        //---------------------------------------------------------------------------
-        // Lehrveranstaltungen
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'.lehreinheit_id_target.value=\'\';document.'.$cFormName.'.submit();" name="lehrveranstaltung_id_target">';
-#                $content.='<option value="" '.(empty($lehrveranstaltung_id)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                $lv_obj->lehrveranstaltungen=array();
-		  		if (!empty($studiengang_kz))
-		  		{	
-	                if ($lv_obj->load_lva_le($studiengang_kz_target, $studiensemester_kurzbz_target, $semester_target,null,null,null,'bezeichnung'))
-	                {
-	                        foreach ($lv_obj->lehrveranstaltungen as $row)
-	                        {
-									if (empty($lehrveranstaltung_id_target))
-										$lehrveranstaltung_id_target=$row->lehrveranstaltung_id;
-	                                $content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id_target"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30, '...').' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
-	                        }
-	                }
-	                else
-	                {
-	                        $content.='<option value="" '.(empty($studiengang_kz_target)?' selected="selected" ':'').'>&nbsp;'.$stg_obj->errormsg.'&nbsp;</option>';
-	                        $errormsg[]='Lehrveranstaltungen wurden nicht gefunden! '.$lv_obj->errormsg;
-	                }
-		 	 	}	  
-                $content.='</select>
-		  </td>';
-
-#echo "<br> $studiengang_kz_target, $studiensemester_kurzbz_target, $semester_target , $lehrveranstaltung_id_target <br>";
-
-        //---------------------------------------------------------------------------
-        // Lehreinheit
-		
-	
-                $content.='<td valign="top"><select onchange="document.'.$cFormName.'.submit();" name="lehreinheit_id_target">';
-#                $content.='<option value="" '.(empty($lehreinheit_id)?' selected="selected" ':'').'>&nbsp;Alle&nbsp;</option>';
-                $le_obj->lehreinheiten=array();
-                if (!empty($lehrveranstaltung_id_target))
-                {
-                        $le_obj->load_lehreinheiten($lehrveranstaltung_id_target, $studiensemester_kurzbz_target);
-                        foreach ($le_obj->lehreinheiten as $row)
-                        {
-                                //Gruppen laden
-                            $gruppen = '';
-					    		if (!$legrp_obj = new lehreinheitgruppe())
-						      		   die('Fehler beim Oeffnen der Lehreinheitgruppe');
-                           
-							    if ($legrp_obj->getLehreinheitgruppe($row->lehreinheit_id))
-                                {
-                                        foreach ($legrp_obj->lehreinheitgruppe as $grp)
-                                        {
-                                                if($grp->gruppe_kurzbz=='')
-                                                        $gruppen.=' '.$grp->semester.$grp->verband.$grp->gruppe;
-                                                else
-                                                        $gruppen.=' '.$grp->gruppe_kurzbz;
-                                        }
-                                }
-							//Lektoren laden
-								$lektoren='';
-								$lehreinheitmitarbeiter = new lehreinheitmitarbeiter();
-								$lehreinheitmitarbeiter->getLehreinheitmitarbeiter($row->lehreinheit_id);
-								foreach ($lehreinheitmitarbeiter->lehreinheitmitarbeiter as $ma)
-								{
-									$lektoren.= ($lektoren?',':'').'&nbsp;'.$ma->mitarbeiter_uid;
-								}
-								$lektoren=CutString($lektoren, 30, '...');									
-                                $content.='<option value="'.$row->lehreinheit_id.'" '.($lehreinheit_id_target==$row->lehreinheit_id?' selected="selected" ':'').'>&nbsp;'.$row->lehrform_kurzbz.' '.$gruppen.'&nbsp;'.$lektoren.'&nbsp;('.$row->lehreinheit_id.')</option>';
-                        }
-                }
-                $content.='</select></td>';			
-
-			$content.='<td valign="top" align="right">';
-			
-			
-#echo "<br> $studiengang_kz_target, $studiensemester_kurzbz_target, $semester_target , $lehrveranstaltung_id_target <br>";
-			
-				if (!$ueb = new uebung())
-				{
-			         die('Fehler beim Oeffnen der &Uuml;bungen');
-				}
-				else if (!empty($lehreinheit_id_target))
-				{
-					$ueb->uebungen=array();
-					$ueb->errormsg ='';
-					if (!$lehreinheit_ueb=$ueb->load_uebung($lehreinheit_id_target))
-					{
-						$errormsg[]=$ueb->errormsg;
-					}	
-					else if (count($ueb->uebungen))
-					{
-			            $content.='<select disabled multiple size="'.count($ueb->uebungen) .'">';
-                        foreach ($ueb->uebungen as $row)
-                        {
-							$submitOK=true;								
-							if (!is_array($uebung_id_source) && !empty($uebung_id_source) )
-								$uebung_id_source=array($uebung_id_source);
-							$selected='';
-                            $content.='<option value="'.$row->uebung_id.'" '.$selected.'>&nbsp;'.$row->bezeichnung.'&nbsp;('.$row->uebung_id.')</option>';
-                        }
-		                $content.='</select>';			
-					}	
-					else if (!empty($lehreinheit_id_target))
-					{
-						 $content.='<span class="error">keine &Uuml;bungen vorhanden</span>';
-					}				
-				}
-		$content.='</td>';
-		$content.='</tr>';
-		$content.='</table>';
-				
-       $content.='</form><hr>'.implode('<br>',$errormsg);
-	   
-	print_r($content);	
-		
-	?>
-</body>
-</html>
\ No newline at end of file
diff --git a/cis/private/lehre/benotungstool/functions.inc.php b/cis/private/lehre/benotungstool/functions.inc.php
deleted file mode 100644
index 2e42e33f0..000000000
--- a/cis/private/lehre/benotungstool/functions.inc.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-//Filenamen für up-/downloads bauen
-// which kann sein angabe, abgabe oder zip
-function makeUploadName($db, $which, $lehreinheit_id=null, $uebung_id=null, $ss=null, $uid=null, $date=null)
-{
-	$query = "SELECT tbl_studiengang.kurzbzlang, lehrfach.semester, lehrfach.kurzbz from public.tbl_studiengang, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehrveranstaltung, lehre.tbl_lehreinheit where tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id and tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id and tbl_lehrveranstaltung.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_lehreinheit.lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
-	$result = $db->db_query($query);
-	$row = $db->db_fetch_object($result);
-	$name = $row->kurzbzlang."_".$row->semester."_".$row->kurzbz."_".$ss;
-
-	if ($which == "angabe")
-	{
-		$name .= "_".$uebung_id;
-	}
-	else if ($which == "abgabe")
-	{
-		$query = "SELECT nachname, vorname from tbl_person, tbl_benutzer where tbl_benutzer.person_id = tbl_person.person_id and tbl_benutzer.uid = ".$db->db_add_param($uid);
-		$result = $db->db_query($query);
-		$row = $db->db_fetch_object($result);
-		$name .= "_".$uebung_id."_".$row->nachname."_".$row->vorname."_".$uid."_".$date;
-	}
-	else if ($which == "zip")
-	{
-
-		$name .= "_".$uebung_id."_".$date;
-	}
-	$name = str_replace(":","-",$name);
-	return $name;
-}
-?>
diff --git a/cis/private/lehre/benotungstool/legesamtnoteeintragen.php b/cis/private/lehre/benotungstool/legesamtnoteeintragen.php
deleted file mode 100644
index 7dbfdef52..000000000
--- a/cis/private/lehre/benotungstool/legesamtnoteeintragen.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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>.
- */
-
-require_once('../../../../config/cis.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');
-
-$user = get_uid();
-
-if(!check_lektor($user))
-	die('Sie haben keine Berechtigung fuer diesen Bereich');
-
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($user);
-
-if(isset($_GET['lvid']) && is_numeric($_GET['lvid'])) //Lehrveranstaltung_id
-	$lvid = $_GET['lvid'];
-else
-	die('Fehlerhafte Parameteruebergabe');
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-$uid = (isset($_GET['uid'])?$_GET['uid']:'');
-
-//Kopfzeile
-
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-
-
-
-if($lehreinheit_id=='')
-	die('Es wurde keine passende Lehreinheit in diesem Studiensemester gefunden');
-
-$note = $_REQUEST["note"];
-
-// lvgesamtnote für studenten speichern
-
-if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') && ((($note>0) && ($note < 6)) || ($note == 7) || ($note==8) || ($note==16))  ){
-	
-	$jetzt = date("Y-m-d H:i:s");	
-	$student_uid = $_REQUEST["student_uid"];	
-	$legesamtnote = new legesamtnote($lehreinheit_id);
-    if (!$legesamtnote->load($student_uid,$lehreinheit_id))
-    {
-		$legesamtnote->student_uid = $student_uid;
-		$legesamtnote->lehreinheit_id = $lehreinheit_id;
-		$legesamtnote->note = $_REQUEST["note"];
-		$legesamtnote->benotungsdatum = $jetzt;
-		$legesamtnote->updateamum = null;
-		$legesamtnote->updatevon = null;
-		$legesamtnote->insertamum = $jetzt;
-		$legesamtnote->insertvon = $user;
-		$legesamtnote->new = true;
-		$response = "neu";
-    }
-    else
-    {
-		$legesamtnote->note = $_REQUEST["note"];
-		$legesamtnote->benotungsdatum = $jetzt;
-		$legesamtnote->updateamum = $jetzt;
-		$legesamtnote->updatevon = $user;
-		$legesamtnote->new = false;
-		$response = "update";
-	}
-	if (!$legesamtnote->save())
-		echo "<span class='error'>".$legesamtnote->errormsg."</span>";
-	else 
-		echo $response;
-}
-else
-	echo "Bitte geben Sie eine Note von 1 - 5 bzw. 7 (nicht beurteilt) oder 8 (teilgenommen) ein!";
-
-
-?>
diff --git a/cis/private/lehre/benotungstool/legesamtnoteverwalten.php b/cis/private/lehre/benotungstool/legesamtnoteverwalten.php
deleted file mode 100644
index e7e886bc9..000000000
--- a/cis/private/lehre/benotungstool/legesamtnoteverwalten.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?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 >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
- */
-require_once('../../../../config/cis.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/phrasen.class.php');
-
-$sprache = getSprache(); 
-$p = new phrasen($sprache); 
-if (!$db = new basis_db())
-	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-
-$user = get_uid();
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-if($stsem!='' && !check_stsem($stsem))
-	die($p->t('global/studiensemesterKonnteNichtGefundenWerden'));
-
-//Vars
-$datum_obj = new datum();
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-$uid = (isset($_GET['uid'])?$_GET['uid']:'');
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title>Kreuzerltool</title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-	function confirmdelete()
-	{
-		return confirm('<?php echo $p->t('gesamtnote/wollenSieWirklichLoeschen');?>');
-	}
-  
-  
-    var anfrage = null;
-
-    function erzeugeAnfrage()
-    {
-        try 
-        {
-        	anfrage = new XMLHttpRequest();
-        } 
-        catch (versuchmicrosoft) 
-        {
-            try 
-            {
-                anfrage = new ActiveXObject("Msxml12.XMLHTTP");
-            } 
-            catch (anderesmicrosoft)
-            {
-                try 
-                {
-                    anfrage = new ActiveXObject("Microsoft.XMLHTTP");
-                }
-                catch (fehlschlag)
-                {
-                    anfrage = null;
-                }
-
-            }
-        }
-        if (anfrage == null) 
-        	alert("Fehler beim Erstellen des Anfrageobjekts!");
-    }
-   
-   function saveLENote(uid)
-   {
-		note = document.getElementById(uid).note.value;	
-		if ((note < 0) || (note > 5 && note != 8 && note != 7 && note!=16))
-		{
-			alert("<?php echo $p->t('benotungstool/noteEingeben');?>");
-			document.getElementById(uid).note.value="";
-		}
-		else
-		{	
-			erzeugeAnfrage(); 
-		    //note = document.getElementById(uid).note.value;
-		    stud_uid = uid;
-		    var jetzt = new Date();
-			var ts = jetzt.getTime();
-		    var url= '<?php echo "legesamtnoteeintragen.php?lvid=".addslashes($lvid)."&lehreinheit_id=".addslashes($lehreinheit_id)."&stsem=".addslashes($stsem); ?>';
-		    url += '&submit=1&student_uid='+uid+"&note="+note+"&"+ts;
-		    anfrage.open("GET", url, true);
-		    anfrage.onreadystatechange = updateSeite;
-		    anfrage.send(null);
-		}
-   }
-   
-   function updateSeite()
-   {
-	    if (anfrage.readyState == 4)
-	    {
-	        if (anfrage.status == 200) 
-	        {
-	        	uid = stud_uid;
-				var note = document.getElementById(uid).note.value;
-	            var resp = anfrage.responseText;
-	            if (resp == "neu" || resp == "update")
-	            {
-					            	
-	            	notentd = document.getElementById("note_"+uid);
-	            	while (notentd.childNodes.length>0)
-	            	{
-						notentd.removeChild(notentd.lastChild);
-	            	}
-	            	notenode = document.createTextNode(note);
-                    notentd.appendChild(notenode);
-                 }
-                 else
-                 	{
-	                 	alert(resp);
-	                 	document.getElementById(uid).note.value="";
-                 	}
-	        } 
-	        else 
-	        	alert("Request status:" + anfrage.status);
-	    }
-	}  
-//-->
-</script>
-</head>
-
-<body>
-<?php
-//Kopfzeile
-echo '<table width="100%">';
-echo ' <tr>';
-echo '<td><h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='legesamtnoteeintragen.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-
-}
-if($result = $db->db_query($qry))
-{
-	if($db->db_num_rows($result)>0)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit')." : <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-					$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-				$lektoren .=')';
-			}
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='legesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-
-echo '<table  class="tabcontent"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-echo "<b>".$lv_obj->bezeichnung_arr[$sprache]."</b><br>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/keinePassendeLehreinheitGefunden'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br><a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-// legesamtnote für studenten speichern
-if (isset($_REQUEST["submit"]) && ($_POST["student_uid"] != '')){
-	
-	$jetzt = date("Y-m-d H:i:s");	
-	$student_uid = $_POST["student_uid"];	
-	$legesamtnote = new legesamtnote($lehreinheit_id);
-    if (!$legesamtnote->load($student_uid,$lehreinheit_id))
-    {
-		$legesamtnote->student_uid = $student_uid;
-		$legesamtnote->lehreinheit_id = $lehreinheit_id;
-		$legesamtnote->note = $_POST["note"];
-		$legesamtnote->benotungsdatum = $jetzt;
-		$legesamtnote->updateamum = null;
-		$legesamtnote->updatevon = null;
-		$legesamtnote->insertamum = $jetzt;
-		$legesamtnote->insertvon = $user;
-		$legesamtnote->new = true;
-    }
-    else
-    {
-		$legesamtnote->note = $_POST["note"];
-		$legesamtnote->benotungsdatum = $jetzt;
-		$legesamtnote->updateamum = $jetzt;
-		$legesamtnote->updatevon = $user;
-	}
-	if (!$legesamtnote->save())
-		echo "<span class='error'>".$legesamtnote->errormsg."</span>";
-}
-
-echo "<h3>".$p->t('benotungstool/leGesamtnotenVerwalten')."</h3>";
-echo $p->t('benotungstool/noten');
-
-
-//Studentenliste
-echo "
-<table>
-";
-
-		echo "<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			</tr>
-			<tr>
-				<td class='ContentHeader2'>".$p->t('global/uid')."</td>
-				<td class='ContentHeader2'>".$p->t('global/nachname')."</td>
-				<td class='ContentHeader2'>".$p->t('global/vorname')."</td>
-				<td class='ContentHeader2'>".$p->t('benotungstool/gesamtnote')."</td>
-				<td class='ContentHeader2'>&nbsp;</td>
-				<td class='ContentHeader2'></td>
-				<td class='ContentHeader2'></td>
-				<td class='ContentHeader2'>".$p->t('benotungstool/leGesamtnote')."</td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			</tr>";
-/*
-		if($row_grp->gruppe_kurzbz!='')
-		{
-				echo "
-				<tr>
-					<td colspan='8' align='center'><b>$row_grp->gruppe_kurzbz</b></td>
-				</tr>";
-				$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($row_grp->gruppe_kurzbz)."' AND studiensemester_kurzbz = '".$stsem."' ORDER BY nachname, vorname";
-		}
-		else
-		{
-			echo "
-				<tr>
-					<td colspan='8' align='center'><b>Verband $row_grp->verband ".($row_grp->gruppe!=''?"Gruppe $row_grp->gruppe":'')."</b></td>
-				</tr>";
-				$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung
-				             WHERE studiengang_kz='$row_grp->studiengang_kz' AND
-				             semester='$row_grp->semester' ".
-							 ($row_grp->verband!=''?" AND trim(verband)=trim('$row_grp->verband')":'').
-							 ($row_grp->gruppe!=''?" AND trim(gruppe)=trim('$row_grp->gruppe')":'').
-				            " ORDER BY nachname, vorname";
-		}
-*/
-
-// studentenquery		
-$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE  studiensemester_kurzbz = ".$db->db_add_param($stsem)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname";
-
-if($result_stud = $db->db_query($qry_stud))
-{
-	$i=1;
-	while($row_stud = $db->db_fetch_object($result_stud))
-	{
-		$studentnote = new studentnote();
-		$studentnote->calc_gesamtnote($lehreinheit_id,$stsem,$row_stud->uid);
-		//echo $studentnote->debug;
-		$legesamtnote = new legesamtnote($lehreinheit_id);
-		if (!$legesamtnote->load($row_stud->uid,$lehreinheit_id))
-		{    				
-			$note = null;
-		}
-		else
-		{
-			$note = $legesamtnote->note;
-		} 
-		
-		if ($studentnote->studentgesamtnote!=0)
-			$note_calc = round($studentnote->studentgesamtnote,2);
-		else
-			$note_calc = null;
-		echo "
-		<tr class='liste".($i%2)."'>
-			<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->uid</a></td>
-			<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->nachname</a></td>
-			<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->vorname</a></td>";					
-		echo "<td>$note_calc</td>";
-		echo "<td align='center'>";
-		if ($studentnote->negativ)
-			echo "<span class='negativ'>neg</span>";
-		echo "</td>";
-		echo "<td align='center'>";
-		if ($studentnote->fehlt)
-			echo "<span class='negativ'>X</span>";
-		else
-			echo "ok";
-		echo "</td>";				
-		if ($note)
-			$note_final = $note;
-		else
-		{						
-			if ($studentnote->negativ)
-				$note_final = 5;
-			else
-			{		
-				$note_final = round($studentnote->studentgesamtnote);
-				if ($note_final == 0)
-					$note_final = null;
-			}
-		} 
-		echo "<form  accept-charset='UTF-8' name='$row_stud->uid' id='$row_stud->uid' method='POST' action='legesamtnoteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&stsem=$stsem'><td><input type='hidden' name='student_uid' value='$row_stud->uid'><input type='text' size='1' value='$note_final' name='note'><input type='button' value='->' onclick='saveLENote(\"$row_stud->uid\")'></td></form>";
-		if ($note == 5)
-			$negmarkier = " style='color:red; font-weight:bold;'";
-		else
-			$negmarkier = "";	
-		echo "<td align='center' id='note_$row_stud->uid'><span".$negmarkier.">$note</span></td>";				
-		echo "</tr>";
-		$i++;
-	}
-}
-echo "</table>";
-
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/menue.inc.php b/cis/private/lehre/benotungstool/menue.inc.php
deleted file mode 100644
index 3c580b07a..000000000
--- a/cis/private/lehre/benotungstool/menue.inc.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$class_uebung = 'benotungstool_tabs';
-$class_benotung = 'benotungstool_tabs';
-$class_anwesenheit = 'benotungstool_tabs';
-$class_statistik = 'benotungstool_tabs';
-
-$file = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $file);
-$pfile = $break[count($break) - 1]; 
-
-if ($pfile == 'verwaltung.php' or $pfile == 'verwaltung_listen.php')
-	$class_uebung = 'benotungstool_tabs_active';
-else if ($pfile == 'studentenpunkteverwalten.php' or $pfile == 'legesamtnoteverwalten.php' or $pfile == 'lvgesamtnoteverwalten.php')
-	$class_benotung = 'benotungstool_tabs_active';
-else if ($pfile == 'anwesenheitstabelle.php')
-	$class_anwesenheit = 'benotungstool_tabs_active';
-else if ($pfile == 'statistik.php')
-	$class_statistik = 'benotungstool_tabs_active';
-	
-echo "\n\n<!--Menue-->\n";
-echo "<div><ul><li><a href='lvgesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'>".$p->t('benotungstool/lehrveranstaltungBenoten')."</font></a></li><li><a href=".APP_ROOT."cms/dms.php?id=".$p->t('dms_link/benotungstoolHandbuch')." class='Item' target='_blank'><font size='3'>".$p->t('benotungstool/handbuchBenotungstool')."</font></a></li></ul></div>";
-echo "<br>\n";
-echo "<table cellpadding='3' width='100%'>\n";
-echo "	<tr>\n";
-echo "		<td class='$class_uebung'><a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'>".$p->t('benotungstool/uebungen')."</font></a></td>\n";
-echo "		<td class='$class_benotung'><a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'>".$p->t('benotungstool/benotung')."</font></a></td>\n";
-echo "		<td class='$class_anwesenheit'><a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'>".$p->t('benotungstool/anwesenheitstabelle')."</font></a></td>\n";
-echo "		<td class='$class_statistik'><a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'>".$p->t('benotungstool/statistik')."</font></a></td>\n";
-echo "	</tr>\n";
-echo "	<tr>\n";
-echo "		<td colspan='4' class='benotungstool_subtab'>";
-
-if ($pfile == "verwaltung.php")
-	echo "<b>".$p->t('benotungstool/uebersicht')."</b>";
-else if ($pfile == "verwaltung_listen.php")
-{
-	echo "<a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/uebersicht')."</a> \n";
-	if (isset($_GET["liste_id"]) && !isset($_GET["uebung_id"]))
-		echo "		| <b>".$p->t('benotungstool/uebung')."</b> \n";
-	if (isset($_GET["liste_id"]) && isset($_GET["uebung_id"]))
-		echo "		| <a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id'>".$p->t('benotungstool/uebung')."</a> | <b>".$p->t('benotungstool/liste')."</b> \n";
-}
-
-if ($pfile == "studentenpunkteverwalten.php" && (!isset($_GET["uid"]) || $_GET["uid"]==""))
-	echo "<b>".$p->t('benotungstool/uebungsnotenVerwalten').": ".$p->t('benotungstool/uebersicht')."</b> | <a href='legesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/leNotenVerwalten')."</a> | <a href='lvgesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/lvNotenVerwalten')."</a>";
-else if ($pfile == "studentenpunkteverwalten.php")
-	echo "<b>".$p->t('benotungstool/uebungsnotenVerwalten').": ".$p->t('benotungstool/detail')."</b> / <a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'>".$p->t('benotungstool/uebersicht')."</a> | <a href='legesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/leNotenVerwalten')."</a> | <a href='lvgesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/lvNotenVerwalten')."</a>";
-	
-else if ($pfile == "legesamtnoteverwalten.php")
-	echo "<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'>".$p->t('benotungstool/uebungsnotenVerwalten')."</a> | <b>".$p->t('benotungstool/leNotenVerwalten')."</b> | <a href='lvgesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/lvNotenVerwalten')."</a>";
-else if ($pfile == "lvgesamtnoteverwalten.php")
-	echo "<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'>".$p->t('benotungstool/uebungsnotenVerwalten')."</a> | <a href='legesamtnoteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/leNotenVerwalten')."</a> | <b>".$p->t('benotungstool/lvNotenVerwalten')."</b>";
-
-if	($pfile == 'anwesenheitstabelle.php')
-	echo "&nbsp;";
-if	($pfile == 'statistik.php')
-	echo "&nbsp;";
-	
-echo "		</td>\n";
-echo "	</tr>\n";
-echo "</table>\n";
-echo "<!--Menue Ende--><br>\n\n";
-?>
diff --git a/cis/private/lehre/benotungstool/statistik.php b/cis/private/lehre/benotungstool/statistik.php
deleted file mode 100644
index a2ce600b9..000000000
--- a/cis/private/lehre/benotungstool/statistik.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?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 >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-require_once('../../../../include/phrasen.class.php');
-
-if (!$db = new basis_db())
-		die('Fehler beim Herstellen der Datenbankverbindung');
-		
-$sprache = getSprache(); 
-$p = new phrasen($sprache);
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title><?php echo $p->t('benotungstool/kreuzerltool');?></title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-	function confirmdelete()
-	{
-		return confirm('<?php echo $p->t('gesamtnote/wollenSieWirklichLoeschen');?>');
-	}
-  //-->
-</script>
-</head>
-
-<body>
-<?php
-$user = get_uid();
-
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-
-//Kopfzeile
-echo '<table width="100%">';
-echo ' <tr><td>';
-echo '<h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='statistik.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-
-}
-
-if($result = $db->db_query($qry))
-{
-	if($db->db_num_rows($result)>1)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit').": <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-
-				$lektoren .=')';
-			}
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-echo '<table width="100%"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-echo "<b>".$lv_obj->bezeichnung_arr[$sprache]."</b><br>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/keinePassendeLehreinheitGefunden'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br>
-<a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-echo "<h3>".$p->t('benotungstool/statistikFuerKreuzerllisten')."</h3>";
-$uebung_obj = new uebung();
-$uebung_obj->load_uebung($lehreinheit_id,1);
-if(count($uebung_obj->uebungen)>0)
-{
-	echo "<table width='100%'><tr><td valign='top'>";
-	echo "<br>".$p->t('benotungstool/waehlenSieEineKreuzerlliste').": <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-	echo "<option value='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=' selected></option>";
-	foreach ($uebung_obj->uebungen as $row)
-	{
-		
-		if($uebung_id == $row->uebung_id)
-			$selected = 'selected';
-		else
-			$selected = '';		
-				
-		if($uebung_id=='')
-			$uebung_id=$row->uebung_id;
-		
-		$subuebung_obj = new uebung();
-		$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-		if(count($subuebung_obj->uebungen)>0)
-			{
-			$disabled = 'disabled';
-			$selected = '';
-			}
-		else
-			$disabled = '';
-		
-		echo "<OPTION style='background-color:#cccccc;' value='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id' $selected $disabled>";
-		
-		
-		echo $row->bezeichnung;
-		echo '</OPTION>';
-		
-		if(count($subuebung_obj->uebungen)>0)
-		{
-			foreach ($subuebung_obj->uebungen as $subrow)
-			{
-				//if($uebung_id=='')
-				//	$uebung_id=$subrow->uebung_id;
-	
-				if($uebung_id == $subrow->uebung_id)
-					$selected = 'selected';
-				else
-					$selected = '';
-				if ($subrow->beispiele)
-					echo "<OPTION value='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id' $selected>";
-
-				
-				//Freigegeben = +
-				//Nicht Freigegeben = -
-				if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-					echo ' + ';
-				else
-					echo ' - ';
-				
-				echo $subrow->bezeichnung;
-				echo '</OPTION>';
-				
-			}
-		}
-	}
-	
-	echo '</SELECT>';
-	
-	echo '</td>';
-	
-	echo "<td>
-		<table>
-		<tr>
-			<td><b>+</b>...</td>
-			<td><u>".$p->t('benotungstool/freigeschaltet')."</u>.</td>
-		</tr>
-		<tr>
-			<td><b>-</b>...</td>
-			<td><u>".$p->t('benotungstool/nichtFreigeschaltet')."</u>.</td>
-		</tr>
-		</table>
-	</td>
-</tr></table>";
-}
-else
-	die($p->t('benotungstool/derzeitSindKeineUebungenAngelegt'));
-
-
-echo "<br><br><br>";
-if(isset($uebung_id) && $uebung_id!='')
-{
-	$beispiel_obj = new beispiel();
-	if($beispiel_obj->load_beispiel($uebung_id))
-	{
-		if(count($beispiel_obj->beispiele)>0)
-		{
-			echo '<table border="0" cellpadding="0" cellspacing="0" width="600">
-         		 <tr>
-	           		 <td>&nbsp;</td>
-	           		 <td height="19" width="339" valign="bottom">
-		           		 <table border="0" cellpadding="0" cellspacing="0" width="339" background="../../../../skin/images/bg.gif">
-		                	<tr>
-		                  		<td>&nbsp;</td>
-		                	</tr>
-		              	</table>
-		             </td>
-          		</tr>';
-			$i=0;
-			$qry_cnt = "SELECT distinct student_uid FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id) WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." GROUP BY student_uid";
-				if($result_cnt = $db->db_query($qry_cnt))
-						$gesamt=$db->db_num_rows($result_cnt);
-
-			foreach ($beispiel_obj->beispiele as $row)
-			{
-				$i++;
-				$solved = 0;
-				$psolved = 0;
-				$qry_cnt = "SELECT count(*) as anzahl FROM campus.tbl_studentbeispiel WHERE beispiel_id=".$db->db_add_param($row->beispiel_id, FHC_INTEGER)." AND vorbereitet=true";
-				if($result_cnt = $db->db_query($qry_cnt))
-					if($row_cnt = $db->db_fetch_object($result_cnt))
-						$solved = $row_cnt->anzahl;
-
-				if($solved>0)
-					$psolved = $solved/$gesamt*100;
-
-				echo '<tr>
-	            		<td '.($i%2?'class="MarkLine"':'').' valign="top" height="10" width="200"><font size="2" face="Arial, Helvetica, sans-serif">
-	              			'.$row->bezeichnung.'
-	              		</font></td>
-						<td '.($i%2?'class="MarkLine"':'').'>
-	            			<table width="339" border="0" cellpadding="0" cellspacing="0" background="../../../../skin/images/bg_.gif">
-	                		<tr>
-	                  			<td valign="top">
-	                  				<table class="tabcontent">
-	                      			<tr>
-	                        			<td nowrap><font size="2" face="Arial, Helvetica, sans-serif">
-	                        			<img src="../../../../skin/images/entry.gif" width="'.($psolved*3).'" height="5" alt="" border="1" />
-	                        			<span class="smallb"><b>&nbsp;'.$solved.'</b> ['.number_format($psolved,1,'.','').'%]</span></font>
-	                        			</td>
-									</tr>
-									</table>
-								</td>
-	                		</tr>
-	              			</table>
-						</td>
-	          		</tr>';
-			}
-			echo "</table>";
-			echo "<br><br>Es haben insgesamt <u>$gesamt Studenten</u> eingetragen.";
-		}
-	}
-	else
-		echo "<span class='error'>$beispiel_obj->errormsg</span>";
-}
-
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/studentenansicht.php b/cis/private/lehre/benotungstool/studentenansicht.php
deleted file mode 100644
index d13f24aa0..000000000
--- a/cis/private/lehre/benotungstool/studentenansicht.php
+++ /dev/null
@@ -1,1173 +0,0 @@
-<?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>.
- */
-// ********************
-// * Studentenansicht fuers Kreuzerltool
-// ********************
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-require_once('../../../../include/studentnote.class.php');
-require_once('../../../../include/legesamtnote.class.php');
-require_once('../../../../include/lvgesamtnote.class.php');
-require_once('../../../../include/zeugnisnote.class.php');
-require_once('../../../../include/phrasen.class.php');
-include('functions.inc.php');
-
-$sprache = getSprache();
-$p = new phrasen($sprache);
-
-if (!$db = new basis_db())
-		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-$user = get_uid();
-
-$lektorenansicht = 0;
-
-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
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-$uid = (isset($_GET['uid'])?$_GET['uid']:''); //Uid
-
-if(check_lektor($user) && (isset($_GET['uid']) && $_GET["uid"] != ""))
-{
-	$rights = new benutzerberechtigung();
-	$rights->getBerechtigungen($user);
-	$lehreinheit=new lehreinheit($_GET["lehreinheit_id"]);
-	if(!check_lektor_lehrveranstaltung($user, $lehreinheit->lehrveranstaltung_id, $lehreinheit->studiensemester_kurzbz) && !$rights->isBerechtigt('admin',0))
-			die($p->t('global/keineBerechtigungFuerDieseSeite'));
-	$lektorenansicht = 1;
-	$user = $_GET["uid"];
-}
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-		die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-
-//Abgabedatei ausliefern
-if (isset($_GET["download_abgabe"]))
-{
-	$file=$_GET["download_abgabe"];
-	$file = preg_replace('/[^A-Za-z0-9\-_.]/', '',$file);
-	$uebung_id = $_GET["uebung_id"];
-	$ueb = new uebung();
-	if($ueb->load_studentuebung($user, $uebung_id))
-	{
-		if($ueb->load_abgabe($ueb->abgabe_id))
-		{
-			$filename = BENOTUNGSTOOL_PATH."abgabe/".$ueb->abgabedatei;
-			header('Content-Type: application/octet-stream');
-			header('Content-disposition: attachment; filename="'.$file.'"');
-			readfile($filename);
-			exit;
-		}
-		else
-		{
-			die($ueb->errormsg);
-		}
-	}
-	else
-		die($ueb->errormsg);
-}
-
-//Angabedatei ausliefern
-if (isset($_GET["download"])){
-	$file=$_GET["download"];
-	$uebung_id = $_GET["uebung_id"];
-	$ueb = new uebung();
-	$ueb->load($uebung_id);
-	$filename = BENOTUNGSTOOL_PATH."angabe/".$ueb->angabedatei;
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="'.$file.'"');
-	readfile($filename);
-	exit;
-}
-
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title><?php echo $p->t('benotungstool/kreuzerltool');?></title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-  //-->
-</script>
-</head>
-
-<body>
-
-
-<?php
-
-if (isset($_REQUEST["deleteabgabe"]))
-{
-	$ueb = new uebung();
-	$ueb->load_studentuebung($user, $uebung_id);
-	if (!$ueb->delete_abgabe($ueb->abgabe_id))
-		echo $ueb->errormsg;
-
-}
-//echo $_FILES["abgabedatei"];
-//if (isset($_FILES["abgabedatei"]))
-if (isset($_POST["abgabe"]))
-{
-	$abgabedatei_up = $_FILES["abgabedatei"]["tmp_name"];
-	$abgabe_anmerkung = (isset($_POST["abgabe_anmerkung"])?$_POST["abgabe_anmerkung"]:'');
-
-	if ($abgabedatei_up)
-	{
-		//echo $abgabedatei_up;
-		$datum = date('Y-m-d H:i:s');
-		$datumstr = str_replace(" ","_",$datum);
-		$name_up = pathinfo($_FILES["abgabedatei"]["name"]);
-		$name_neu = makeUploadName($db, $which='abgabe', $lehreinheit_id=$lehreinheit_id, $uebung_id=$uebung_id, $ss=$stsem,$uid=$user, $date=$datumstr);
-		$name_neu = preg_replace('/[^A-Za-z0-9\-_]/', '',$name_neu);
-		$abgabedatei = $name_neu.".".$name_up["extension"];
-		$abgabepfad = BENOTUNGSTOOL_PATH."abgabe/".$abgabedatei;
-
-		$uebung_obj = new uebung();
-		$uebung_obj->load_studentuebung($user, $uebung_id);
-
-		if ($uebung_obj->errormsg != "")
-		{
-			$uebung_obj->student_uid = $user;
-			$uebung_obj->mitarbeiter_uid = null;
-			$uebung_obj->abgabe_id = null;
-			$uebung_obj->uebung_id = $uebung_id;
-			$uebung_obj->note = null;
-			$uebung_obj->mitarbeitspunkte = null;
-			$uebung_obj->punkte = null;
-			$uebung_obj->anmerkung = null;
-			$uebung_obj->benotungsdatum = null;
-			$uebung_obj->updateamum = null;
-			$uebung_obj->updatevon = null;
-			$uebung_obj->insertamum = $datum;
-			$uebung_obj->insertvon = $user;
-			$uebung_obj->new = true;
-			$uebung_obj->studentuebung_save($new=true);
-			//echo $uebung_obj->errormsg;
-
-		}
-		if ($uebung_obj->abgabe_id != null)
-		{
-			$uebung_obj->load_abgabe($uebung_obj->abgabe_id);
-			unlink(BENOTUNGSTOOL_PATH."abgabe/".$uebung_obj->abgabedatei);
-			$uebung_obj->abgabedatei = $abgabedatei;
-			$uebung_obj->abgabezeit = 	$datum;
-			$uebung_obj->abgabe_anmerkung = $abgabe_anmerkung;
-			$uebung_obj->abgabe_save(false);
-		}
-		else
-		{
-			$uebung_obj->abgabedatei = $abgabedatei;
-			$uebung_obj->abgabezeit = 	$datum;
-			$uebung_obj->abgabe_anmerkung = $abgabe_anmerkung;
-			$uebung_obj->abgabe_save(true);
-		}
-		$uebung_obj->studentuebung_save(false);
-		//Abgabedatei ablegen
-		move_uploaded_file($_FILES['abgabedatei']['tmp_name'], $abgabepfad);
-	}
-
-	else
-	{
-		$abgabe_anmerkung = $_POST["abgabe_anmerkung"];
-		$uebung_obj2 = new uebung();
-		$uebung_obj2->load_studentuebung($user, $uebung_id);
-		if ($uebung_obj2->errormsg == "")
-		{
-			if ($uebung_obj2->abgabe_id != null)
-			{
-				$uebung_obj2->load_abgabe($uebung_obj2->abgabe_id);
-				$uebung_obj2->abgabe_anmerkung = $abgabe_anmerkung;
-				$uebung_obj2->abgabe_save(false);
-			}
-		}
-	}
-}
-else
-	$abgabedatei_up = null;
-
-
-
-
-//Kopfzeile
-echo '<table width="100%">';
-echo ' <tr><td>';
-echo '<h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-//Lehreinheiten laden zu denen der eingeloggte Student zugeteilt ist
-//Bei Lehrverbaenden werden auch die uebergeordneten geladen
-$qry = "SELECT distinct lehreinheit_id, lehrfach.kurzbz FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) WHERE lehreinheit_id IN(
-		SELECT lehreinheit_id FROM public.tbl_benutzergruppe JOIN lehre.tbl_lehreinheitgruppe USING (gruppe_kurzbz)
-		WHERE tbl_benutzergruppe.uid=".$db->db_add_param($user)." AND
-		tbl_lehreinheitgruppe.lehreinheit_id IN(
-			SELECT lehreinheit_id FROM lehre.tbl_lehreinheit JOIN campus.tbl_uebung USING(lehreinheit_id)
-			WHERE tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem).")
-		UNION
-		SELECT
-			lehreinheit_id
-		FROM
-			public.tbl_student, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband
-		WHERE
-			tbl_student.student_uid=".$db->db_add_param($user)." AND
-			tbl_studentlehrverband.student_uid=tbl_student.student_uid AND
-			tbl_studentlehrverband.studiensemester_kurzbz=".$db->db_add_param($stsem)." AND
-			tbl_student.studiengang_kz=tbl_lehreinheitgruppe.studiengang_kz AND
-			tbl_lehreinheitgruppe.gruppe_kurzbz is null AND
-			tbl_studentlehrverband.semester=tbl_lehreinheitgruppe.semester AND
-			(
-				(
-				  (
-				  tbl_lehreinheitgruppe.verband<>'' AND
-				  tbl_lehreinheitgruppe.gruppe<>'' AND
-				  trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband) AND
-				  trim(tbl_lehreinheitgruppe.gruppe) = trim(tbl_studentlehrverband.gruppe)
-				  )
-				  OR
-				  (
-				    tbl_lehreinheitgruppe.verband<>'' AND
-				  	(
-				  	trim(tbl_lehreinheitgruppe.gruppe)='' OR
-				  	tbl_lehreinheitgruppe.gruppe is null
-				  	)
-				  	AND
-				  	trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband)
-				  )
-				  OR
-				  (
-					(trim(tbl_lehreinheitgruppe.verband)='' OR tbl_lehreinheitgruppe.verband is null)
-					 AND
-					 (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null)
-				  )
-				)
-			)
-			AND
-			tbl_lehreinheitgruppe.lehreinheit_id IN(SELECT lehreinheit_id FROM lehre.tbl_lehreinheit JOIN campus.tbl_uebung USING(lehreinheit_id)
-				WHERE tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)."))";
-//echo $qry;
-if($result = $db->db_query($qry))
-{
-	if($db->db_num_rows($result)>1)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit')." : <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			//Beteiligte Mitarbeiter auslesen
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN campus.vw_mitarbeiter ON(mitarbeiter_uid=uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-
-				$lektoren .=')';
-			}
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id".(isset($uid) && $uid!=''?'&uid='.$uid:'')."' $selected>$row->kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-		else
-			$lehreinheit_id ='';
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-
-echo '</td><tr></table>';
-echo '<table><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td width='100%'>\n";
-echo "<table width='100%'><tr><td><b>".$lv_obj->bezeichnung_arr[$sprache]."</b></td><td align='right'><a href='../../../../documents/".strtolower($stg_obj->kuerzel)."/$lv_obj->semester/$lv_obj->lehreverzeichnis/download/' target='_blank' class='Item'>".$p->t('benotungstool/downloadverzeichnisAnzeigen')."</a></td></tr></table><br>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/keineKreuzerllistenFuerDieseLehrveranstaltung'));
-
-$qry = "SELECT vorname, nachname FROM campus.vw_student WHERE uid=".$db->db_add_param($user);
-$name='';
-if($result = $db->db_query($qry))
-	if($row = $db->db_fetch_object($result))
-		$name = $row->vorname.' '.$row->nachname;
-
-
-
-if (!isset($_GET["notenuebersicht"]))
-{
-	$l = 0;
-	$ueb_check = new uebung();
-	$ueb_check->load_uebung($lehreinheit_id,1);
-	if	(count($ueb_check->uebungen > 0))
-	{
-		foreach ($ueb_check->uebungen as $row)
-		{
-			$sub_check = new uebung();
-			$sub_check->load_uebung($lehreinheit_id,2,$row->uebung_id);
-			if (count($sub_check->uebungen) > 0)
-				$l = 1;
-		}
-	}
-
-	if ($l > 0)
-	{
-		echo "<br><b>".$p->t('lehre/leistungsuebersicht')." / <a href='studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&notenuebersicht=1&uid=$user'>".$p->t('benotungstool/notenuebersichtFuer')." $name</b><br><br>";
-		$uebung_obj = new uebung();
-		$uebung_obj->load_uebung($lehreinheit_id,1);
-		if(count($uebung_obj->uebungen)>0)
-		{
-			echo "<table width='100%'><tr><td valign='top'>";
-			echo "<br>".$p->t('benotungstool/waehlenSieEineAufgabeAus').": <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-			echo "<option value='studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uid=$user' selected></option>";
-			foreach ($uebung_obj->uebungen as $row)
-			{
-
-				if($uebung_id == $row->uebung_id)
-					$selected = 'selected';
-				else
-					$selected = '';
-
-				$subuebung_obj = new uebung();
-				$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-				if(count($subuebung_obj->uebungen)>0)
-					{
-					$disabled = 'disabled';
-					$selected = '';
-					echo "<OPTION style='background-color:#cccccc;' value='studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id&uid=$user' $selected $disabled>";
-					echo $row->bezeichnung;
-					echo '</OPTION>';
-					}
-				else
-					$disabled = '';
-
-
-
-				if(count($subuebung_obj->uebungen)>0)
-				{
-					foreach ($subuebung_obj->uebungen as $subrow)
-					{
-						if($uebung_id=='')
-							$uebung_id=$subrow->uebung_id;
-
-						if($uebung_id == $subrow->uebung_id)
-							$selected = 'selected';
-						else
-							$selected = '';
-
-						echo "<OPTION value='studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id&uid=$user' $selected>";
-
-
-						//Freigegeben = +
-						//Nicht Freigegeben = -
-						if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-							echo ' + ';
-						else
-							echo ' - ';
-
-						echo $subrow->bezeichnung;
-						echo '</OPTION>';
-
-					}
-				}
-			}
-
-			echo '</SELECT>';
-			echo '</td>';
-
-			echo "<td>
-				<table>
-				<tr>
-					<td><b>+</b>...</td>
-					<td><u>".$p->t('benotungstool/freigeschaltet')."</u>.</td>
-				</tr>
-				<tr>
-					<td><b>-</b>...</td>
-					<td><u>".$p->t('benotungstool/nichtFreigeschaltet')."</u>.</td>
-				</tr>
-				</table>
-			</td>
-		</tr></table>";
-		}
-		else
-			die($p->t('benotungstool/derzeitGibtEsKeineUebungen'));
-	}
-	else
-	{
-		$callURL="studentenansicht.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&notenuebersicht=1&uid=$user";
-		#header("Location:$callURL");
-	echo "<script language=\"JavaScript\">";
-	echo "window.location.href  ='$callURL'";
-	echo "</script>";
-	exit;
-		//echo "Derzeit sind keine Kreuzerllisten oder Abgaben angelegt";
-	}
-
-
-
-	//******SPEICHERN DER DATEN*************
-	if(isset($_POST['submit']))
-	{
-		$error=false;
-
-		$ueb_hlp_obj = new uebung();
-		$ueb_hlp_obj->load($uebung_id);
-		//Wenn Kreuzerlliste Freigegeben ist
-		if($datum_obj->mktime_fromtimestamp($ueb_hlp_obj->freigabevon)<time() &&
-		   $datum_obj->mktime_fromtimestamp($ueb_hlp_obj->freigabebis)>time())
-		{
-			$bsp_obj = new beispiel();
-
-			if($bsp_obj->load_beispiel($uebung_id))
-			{
-				$anzahl_solved = 0;
-				foreach ($bsp_obj->beispiele as $row)
-				{
-						if (isset($_POST['solved_'.$row->beispiel_id]) && ($_POST['solved_'.$row->beispiel_id]==1))
-							$anzahl_solved++;
-				}
-				if (($anzahl_solved <= $ueb_hlp_obj->maxbsp) || ($ueb_hlp_obj->maxbsp == 0))
-				{
-					foreach ($bsp_obj->beispiele as $row)
-					{
-						$stud_bsp_obj = new beispiel();
-
-						if($stud_bsp_obj->load_studentbeispiel($user, $row->beispiel_id))
-						{
-							$stud_bsp_obj->new=false;
-						}
-						else
-						{
-							$stud_bsp_obj->new=true;
-							$stud_bsp_obj->insertamum = date('Y-m-d H:i:s');
-							$stud_bsp_obj->insertvon = $user;
-							$stud_bsp_obj->vorbereitet = false;
-						}
-						if (isset($_POST['solved_'.$row->beispiel_id]))
-							$stud_bsp_obj->vorbereitet = ($_POST['solved_'.$row->beispiel_id]==1?true:false);
-
-						$stud_bsp_obj->probleme = (isset($_POST['problem_'.$row->beispiel_id])?true:false);
-						$stud_bsp_obj->updateamum = date('Y-m-d H:i:s');
-						$stud_bsp_obj->updatevon = $user;
-						$stud_bsp_obj->student_uid = $user;
-						$stud_bsp_obj->beispiel_id = $row->beispiel_id;
-
-						if(!$row->check_anzahl_studentbeispiel($row->beispiel_id))
-							die('<span class="error">Fehler beim Ermitteln der Beispiele</span>');
-						if (($row->anzahl_studentbeispiel >= $ueb_hlp_obj->maxstd) && ($stud_bsp_obj->vorbereitet==true) && ($ueb_hlp_obj->maxstd != null)) //isset($_POST['problem_'.$row->beispiel_id]) &&  $stud_bsp_obj->new ||
-						{
-							$hlp = new beispiel();
-							if($hlp->load_studentbeispiel($user, $row->beispiel_id))
-							{
-								if($hlp->vorbereitet!=$stud_bsp_obj->vorbereitet)
-								{
-									echo "<span class='error'>".$p->t('benotungstool/dasBeispielKannNichtMehrAngekreuztWerden',array($row->bezeichnung))."<br></span>";
-									$error = true;
-								}
-							}
-						}
-						else
-						{
-							if(!$stud_bsp_obj->studentbeispiel_save())
-							{
-								echo $stud_bsp_obj->errormsg;
-								$error=true;
-							}
-						}
-					}
-				}
-				else
-				{
-					$error=true;
-					echo $p->t('benotungstool/zuVieleBeispieleAngekreuzt')."!<br>";
-				}
-			}
-
-			if($error)
-				echo "<span class='error'>".$p->t('benotungstool/esKonntenNichtAlleDatenGespeichertWerden')."</span><br>";
-			else
-				echo $p->t('global/erfolgreichgespeichert')."<br>";
-		}
-		else
-			echo "<span class='error'>".$p->t('benotungstool/nichtGespeichertKreuzerllisteNichtFreigegeben')."!</span>";
-	}
-
-	//********ANZEIGE DER EINGETRAGENEN KREUZERL***********
-	if ($l > 0)
-	{
-		$uebung_obj = new uebung();
-		$uebung_obj->load($uebung_id);
-		$downloadname = mb_ereg_replace($uebung_id,mb_ereg_replace(' ','_',$uebung_obj->bezeichnung), $uebung_obj->angabedatei);
-		$downloadname = preg_replace('/[^A-Za-z0-9\-_.]/', '',$downloadname);
-		echo $p->t('benotungstool/freigegebenVon')." ".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon))." ".$p->t('global/bis')." ".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis));
-		echo "<br><br><h3><u>$uebung_obj->bezeichnung</u></h3>";
-		if ($uebung_obj->angabedatei)
-			echo $p->t('benotungstool/angabe').": <a href='studentenansicht.php?uid=$user&lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&download=".$downloadname."'>".$downloadname."</a><br><br>";
-
-
-		$ueb_obj = new uebung();
-		if($ueb_obj->load_studentuebung($user, $uebung_id))
-		{
-			$anmerkung = $ueb_obj->anmerkung;
-			$mitarbeit = $ueb_obj->mitarbeitspunkte;
-			$note = $ueb_obj->note;
-		}
-		else
-		{
-			$anmerkung = '';
-			$mitarbeit = 0;
-			$note = null;
-		}
-	//	$anmerkung = ereg_replace("\n","<br>",$anmerkung);
-		$anmerkung = mb_str_replace("\n", "<br>", $anmerkung);
-		if ($uebung_obj->beispiele)
-		{
-
-			$qry_cnt = "SELECT count(*) as anzahl FROM campus.tbl_studentbeispiel WHERE beispiel_id IN (SELECT beispiel_id from campus.tbl_beispiel where uebung_id =".$db->db_add_param($uebung_id, FHC_INTEGER).") AND vorbereitet=true and student_uid = ".$db->db_add_param($user);
-				if($result_cnt = $db->db_query($qry_cnt))
-					if($row_cnt = $db->db_fetch_object($result_cnt))
-						$anzahl = $row_cnt->anzahl;
-
-			echo "<script type='text/javascript'>";
-			if ($uebung_obj->maxbsp)
-				echo "maxbsp = ".$uebung_obj->maxbsp.";";
-			else
-				echo "maxbsp = 9999;";
-			echo "aktbsp = ".$anzahl.";";
-			echo "function plus1(id)
-				{
-					aktbsp++;
-					if (aktbsp > maxbsp)
-					{
-						document.bspform.reset();
-						alert('Sie dürfen maximal '+maxbsp+' Beispiele markieren!');
-						aktbsp = ".$anzahl.";
-					}
-
-				}
-				function minus1()
-				{
-					aktbsp--;
-				}
-				";
-
-			echo "</script>";
-
-			$bsp_obj = new beispiel();
-			$bsp_obj->load_beispiel($uebung_id);
-			if ($bsp_obj->beispiele)
-			{
-				echo " <table>";
-				if ($uebung_obj->maxbsp > 0)
-					echo "<tr><td>".$p->t('benotungstool/maxBeispieleStudent').":</td><td><b>".$uebung_obj->maxbsp."</b></td></tr>";
-				if ($uebung_obj->maxstd > 0)
-					echo "<tr><td>".$p->t('benotungstool/maxStudentenBeispiel').":</td><td style='background-color:#dddddd;'><b>".$uebung_obj->maxstd."</b></td></tr>";
-				echo "</table>";
-				echo "
-				<form accept-charset='UTF-8' method='POST' name='bspform' action='studentenansicht.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&uid=$user'>
-				<table width='100%'>
-					<tr>
-						<td valign='top'><div style='width: 70%;'>
-						".($anmerkung!=''?'<b>'.$p->t('global/anmerkungen').':</b><br> '.$anmerkung.'<br><br>':'')."
-						</div>
-							<table border='1'>
-							<tr>
-								<td class='ContentHeader2'>".$p->t('benotungstool/beispiel')."</td>
-							    <td class='ContentHeader2'>".$p->t('benotungstool/vorbereitet')."</td>
-							    <td class='ContentHeader2'>".$p->t('benotungstool/nichtVorbereitet')."</td>
-							    <td class='ContentHeader2'>".$p->t('benotungstool/probleme')."</td>
-							    <td class='ContentHeader2'>".$p->t('benotungstool/punkte')."</td>
-							</tr>";
-
-
-
-				foreach ($bsp_obj->beispiele as $row)
-				{
-					$bsp_voll = false;
-					$stud_bsp_obj = new beispiel();
-					if ($uebung_obj->maxstd > 0)
-					{
-						$stud_bsp_obj->check_anzahl_studentbeispiel($row->beispiel_id);
-						if ($stud_bsp_obj->anzahl_studentbeispiel >= $uebung_obj->maxstd)
-							$bsp_voll = true;
-					}
-					if($stud_bsp_obj->load_studentbeispiel($user, $row->beispiel_id))
-					{
-						$vorbereitet = $stud_bsp_obj->vorbereitet;
-						$probleme = $stud_bsp_obj->probleme;
-					}
-					else
-					{
-						$vorbereitet = false;
-						$probleme = false;
-					}
-					if ($bsp_voll)
-					{
-						$ro = " disabled";
-						$markiert = " style='background-color:#dddddd;'";
-					}
-					else
-					{
-						$ro = "";
-						$markiert = "";
-					}
-					echo "<tr$markiert>
-							<td>$row->bezeichnung</td>
-							<td align='center'><input type='radio' onchange='plus1($row->beispiel_id);' name='solved_$row->beispiel_id' value='1' ".($vorbereitet?'checked':'')."$ro></td>
-							<td align='center'><input type='radio' onchange='minus1();' name='solved_$row->beispiel_id' value='0' ".(!$vorbereitet?'checked':'')."></td>
-							<td align='center'><input type='checkbox' name='problem_$row->beispiel_id' ".($probleme?'checked':'')."$ro></td>
-							<td align='center'>$row->punkte</td>
-						</tr>";
-
-
-				}
-
-				//Speichern button nur Anzeigen wenn die Uebung Freigegeben ist
-				if($datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis)>time())
-					echo "<tr><td align='right' colspan=5><input type='submit' value='".$p->t('global/speichern')."' name='submit'></td></form></tr>";
-
-				echo "</table>";
-			}
-			else
-				echo "<table><tr><td>".$p->t('benotungstool/keineBeispieleAngelegt')."</td></tr></table><table width='100%'><tr><td width='70%'></div><table><tr><td>&nbsp;</td></tr></table>";
-
-			if ($uebung_obj->abgabe)
-			{
-
-				echo "<br><table><tr><td>".$p->t('benotungstool/abgabedatei').":</td></tr>\n";
-				$uebung_obj->load_studentuebung($user, $uebung_id);
-				if ($uebung_obj->abgabe_id)
-				{
-					$uebung_obj->load_abgabe($uebung_obj->abgabe_id);
-					echo " <tr>";
-					echo"	<td><a href='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&download_abgabe=".$uebung_obj->abgabedatei."'>".$uebung_obj->abgabedatei."</a>";
-					if($datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis)>time())
-						echo " <a href='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&deleteabgabe=1'>[del]</a></td>";
-					echo "</tr>";
-				}
-
-				if($datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis)>time())
-				{
-					echo "	<tr>\n";
-					echo "	<form accept-charset='UTF-8' method='POST' action='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem' enctype='multipart/form-data' name='kl_angabe'>\n";
-					echo "		<td>\n";
-					echo "			<input type='file' name='abgabedatei'> <input type='submit' name='abgabe' value='".$p->t('benotungstool/abgeben')."'>";
-					echo "		</td>\n";
-					echo "	</form>\n";
-					echo "</tr>\n";
-
-				}
-				echo "</table>";
-			}
-
-			echo "</td><td valign='top' algin='right'>";
-
-			//Gesamtpunkte diese Kreuzerlliste
-			$qry = "SELECT sum(punkte) as punktegesamt FROM campus.tbl_beispiel WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER);
-			$punkte_gesamt=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$punkte_gesamt = $row->punktegesamt;
-
-			//Eingetragen diese Kreuzerlliste
-			$qry = "SELECT sum(punkte) as punkteeingetragen FROM campus.tbl_beispiel JOIN campus.tbl_studentbeispiel USING(beispiel_id) WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($user)." AND vorbereitet=true";
-			$punkte_eingetragen=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$punkte_eingetragen = ($row->punkteeingetragen!=''?$row->punkteeingetragen:0);
-
-			//Gesamtpunkte alle Kreuzerllisten in dieser Übung
-			$ueb_help = new uebung($uebung_id);
-			$liste_id = $ueb_help->liste_id;
-			$qry = "SELECT sum(tbl_beispiel.punkte) as punktegesamt_alle FROM campus.tbl_beispiel, campus.tbl_uebung
-					WHERE tbl_uebung.uebung_id=tbl_beispiel.uebung_id AND
-					tbl_uebung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." and tbl_uebung.liste_id = ".$db->db_add_param($liste_id, FHC_INTEGER);
-			$punkte_gesamt_alle=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$punkte_gesamt_alle = $row->punktegesamt_alle;
-
-			//Eingetragen alle Kreuzerllisten
-			$qry = "SELECT sum(tbl_beispiel.punkte) as punkteeingetragen_alle FROM campus.tbl_beispiel, campus.tbl_studentbeispiel, campus.tbl_uebung
-					WHERE tbl_beispiel.beispiel_id = tbl_studentbeispiel.beispiel_id AND
-					tbl_uebung.uebung_id=tbl_beispiel.uebung_id AND
-					tbl_uebung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND
-					tbl_uebung.liste_id = ".$db->db_add_param($liste_id, FHC_INTEGER)." AND
-					tbl_studentbeispiel.student_uid=".$db->db_add_param($user)." AND vorbereitet=true";
-			$punkte_eingetragen_alle=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$punkte_eingetragen_alle = ($row->punkteeingetragen_alle!=''?$row->punkteeingetragen_alle:0);
-
-			//Mitarbeitspunkte
-			$qry = "SELECT sum(mitarbeitspunkte) as mitarbeitspunkte FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id)
-					WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($user)." AND liste_id = ".$db->db_add_param($liste_id, FHC_INTEGER);
-			$mitarbeit_alle=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$mitarbeit_alle = ($row->mitarbeitspunkte!=''?$row->mitarbeitspunkte:0);
-
-			//Mitarbeitspunkte
-			$qry = "SELECT mitarbeitspunkte FROM campus.tbl_studentuebung
-					WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($user);
-			$mitarbeit=0;
-			if($result=$db->db_query($qry))
-				if($row = $db->db_fetch_object($result))
-					$mitarbeit = $row->mitarbeitspunkte;
-			echo "
-
-				<table border='1' width='210'>
-				<tr>
-					<td colspan='2' class='ContentHeader2'>".$p->t('benotungstool/dieseKreuzerlliste').":</td>
-				</tr>
-				<tr>
-					<td width='180'>".$p->t('benotungstool/punkteInsgesamtMoeglich').":</td>
-					<td width='30'>$punkte_gesamt</td>
-				</tr>
-				<tr>
-					<td>".$p->t('benotungstool/punkteEingetragen').":</td>
-					<td>$punkte_eingetragen</td>
-				</tr>
-				</table>
-				<br><br>
-				<table border='1' width='210'>
-				<tr>
-					<td colspan='2' class='ContentHeader2'>".$p->t('benotungstool/alleKreuzerllistenDieserUebung').":</td>
-				</tr>
-				<tr>
-					<td width='180'>".$p->t('benotungstool/punkteInsgesamtMoeglich').":</td>
-					<td width='30'>$punkte_gesamt_alle</td>
-				</tr>
-				<tr>
-					<td>".$p->t('benotungstool/punkteEingetragen').":</td>
-					<td>$punkte_eingetragen_alle</td>
-				</tr>
-				</table>
-				<br><br>
-				<table border='1' width='210'>
-				<tr>
-					<td colspan='2' class='ContentHeader2'>".$p->t('benotungstool/mitarbeitspunkte').":</td>
-				</tr>
-				<tr>
-					<td width='180'>".$p->t('benotungstool/bisherInsgesamt').":</td>
-					<td width='30'>$mitarbeit_alle</td>
-				</tr>
-				<tr>
-					<td>".$p->t('benotungstool/dieseKreuzerlliste').":</td>
-					<td>$mitarbeit</td>
-				</tr>
-				</table>
-				";
-
-
-			echo "
-			</td></tr>
-
-			</table>
-
-			</form>
-			";
-
-			//**********STATISTIK***************
-			if($uebung_obj->statistik)
-			{
-				echo "<h3>".$p->t('benotungstool/statistik')."</h3>";
-				$beispiel_obj = new beispiel();
-				if($beispiel_obj->load_beispiel($uebung_id))
-				{
-					if(count($beispiel_obj->beispiele)>0)
-					{
-						echo '<table border="0" cellpadding="0" cellspacing="0" width="600">
-			         		 <tr>
-				           		 <td>&nbsp;</td>
-				           		 <td height="19" width="339" valign="bottom">
-					           		 <table border="0" cellpadding="0" cellspacing="0" width="339" background="../../../../skin/images/bg.gif">
-					                	<tr>
-					                  		<td>&nbsp;</td>
-					                	</tr>
-					              	</table>
-					             </td>
-			          		</tr>';
-						$i=0;
-						$qry_cnt = "SELECT distinct student_uid FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id) WHERE uebung_id=".$db->db_add_param($uebung_id)." GROUP BY student_uid";
-							if($result_cnt = $db->db_query($qry_cnt))
-									$gesamt=$db->db_num_rows($result_cnt);
-
-						foreach ($beispiel_obj->beispiele as $row)
-						{
-							$i++;
-							$solved = 0;
-							$psolved = 0;
-							$qry_cnt = "SELECT count(*) as anzahl FROM campus.tbl_studentbeispiel WHERE beispiel_id=".$db->db_add_param($row->beispiel_id, FHC_INTEGER)." AND vorbereitet=true";
-							if($result_cnt = $db->db_query($qry_cnt))
-								if($row_cnt = $db->db_fetch_object($result_cnt))
-									$solved = $row_cnt->anzahl;
-
-
-
-							if($solved>0)
-								$psolved = $solved/$gesamt*100;
-
-							echo '<tr>
-				            		<td '.($i%2?'class="MarkLine"':'').' valign="top" height="10" width="200"><font size="2" face="Arial, Helvetica, sans-serif">
-				              			'.$row->bezeichnung.'
-				              		</font></td>
-									<td '.($i%2?'class="MarkLine"':'').'>
-				            			<table width="339" border="0" cellpadding="0" cellspacing="0" background="../../../../skin/images/bg_.gif">
-				                		<tr>
-				                  			<td valign="top">
-				                  				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				                      			<tr>
-				                        			<td nowrap><font size="2" face="Arial, Helvetica, sans-serif">
-				                        			<img src="../../../../skin/images/entry.gif" width="'.($psolved*3).'" height="5" alt="" border="1" />
-				                        			<span class="smallb"><b>&nbsp;'.$solved.'</b> ['.number_format($psolved,1,'.','').'%]</span></font>
-				                        			</td>
-												</tr>
-												</table>
-											</td>
-				                		</tr>
-				              			</table>
-									</td>
-				          		</tr>';
-						}
-						echo "</table>";
-						echo "<br><br>".$p->t('benotungstool/esHabenStudentenEingetragen',array($gesamt));
-					}
-				}
-				else
-					echo "<span class='error'>$beispiel_obj->errormsg</span>";
-				echo "</td></tr>";
-				echo "</table>";
-			}
-		}
-		else if ($uebung_obj->abgabe)
-		{
-
-			echo "<table width='100%'>\n";
-			echo "<tr><td>".($note!=''?'<b>'.$p->t('benotungstool/note').': </b>'.$note.'<br><br>':'')."</td></tr>\n";
-			echo"
-			<tr>
-					<td valign='top'>
-					".($anmerkung!=''?'<b>'.$p->t('global/anmerkungen').':</b><br> '.$anmerkung.'<br><br>':'')."
-					</td>";
-			echo "</tr>\n";
-
-			echo "<tr><td><hr></td></tr>\n";
-			$uebung_obj->load_studentuebung($user, $uebung_id);
-			if ($uebung_obj->abgabe_id)
-			{
-				$uebung_obj->load_abgabe($uebung_obj->abgabe_id);
-				echo " <tr>";
-				echo"	<td>".$p->t('benotungstool/abgabedatei').": <a href='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&download_abgabe=".$uebung_obj->abgabedatei."'>".$uebung_obj->abgabedatei."</a>";
-				if($datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis)>time())
-					echo " <a href='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&deleteabgabe=1'>[del]</a><br></td>";
-				echo "</tr>";
-			}
-			if($datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis)>time())
-			{
-				echo "	<tr>\n";
-				echo "	<form accept-charset='UTF-8' method='POST' action='studentenansicht.php?uid=$user&lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem' enctype='multipart/form-data'>\n";
-				echo "		<td>\n";
-				echo "			<br>".$p->t('global/anmerkung').":<br><textarea name='abgabe_anmerkung' rows='3' cols='50'>".$uebung_obj->abgabe_anmerkung."</textarea><br>";
-				echo "			<br>".$p->t('global/datei').":<br><input type='file' name='abgabedatei'> <input type='submit' name='abgabe' value='".$p->t('benotungstool/abgeben')."'>";
-				echo "		</td>\n";
-				echo "	</form>\n";
-				echo "</tr>\n";
-			}
-			echo "</table>\n";
-
-		}
-	}
-
-}
-//notenübersicht
-else
-{
-	if ($lektorenansicht == 1)
-	{
-		$uid_arr = Array();
-		$vorname_arr = Array();
-		$nachname_arr = Array();
-
-			$qry_stud_dd = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE  studiensemester_kurzbz = ".$db->db_add_param($stsem)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER)."  ORDER BY nachname, vorname";
-            if($result_stud_dd = $db->db_query($qry_stud_dd))
-			{
-				$i=1;
-				while($row_stud_dd = $db->db_fetch_object($result_stud_dd))
-				{
-					$uid_arr[] = $row_stud_dd->uid;
-					$vorname_arr[] = $row_stud_dd->vorname;
-					$nachname_arr[] = $row_stud_dd->nachname;
-
-				}
-			}
-
-		echo "<br><hr><br>";
-		echo $p->t('benotungstool/studentenAuswaehlen').": ";
-		$key = array_search($uid,$uid_arr);
-		$prev = $key-1;
-		$next = $key+1;
-		if ($key > 0)
-			echo "<a href='studentenansicht.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$prev]&stsem=$stsem&notenuebersicht=1'> &lt;&lt; </a>";
-		echo "<SELECT name='stud_dd' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		for ($j = 0; $j < count($uid_arr); $j++)
-		{
-				if ($uid_arr[$j] == $uid)
-					$selected = " selected";
-				else
-					$selected = "";
-
-				echo "<option value='studentenansicht.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$j]&stsem=$stsem&notenuebersicht=1'$selected>$vorname_arr[$j] $nachname_arr[$j]</option>";
-		}
-		echo "</select>";
-		if ($key < count($uid_arr)-1)
-			echo "<a href='studentenansicht.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$next]&stsem=$stsem&notenuebersicht=1'> &gt;&gt; </a>";
-
-		echo "<br><hr><br>";
-	}
-
-	echo "<br><b><a href='studentenansicht.php?uid=$user&lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id'>".$p->t('benotungstool/leistungsuebersichtNotenuebersichtFuer')." $name</b><br><br>";
-	echo "<table><tr><td>";
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,1);
-	if(count($uebung_obj->uebungen)>0)
-	{
-
-		echo "<table style='border: 1px #dddddd solid'>";
-		echo "	<tr>\n";
-		echo "		<th colspan='2'>".$p->t('benotungstool/aufgabe')."</th>\n";
-		echo "		<th>".$p->t('benotungstool/gewicht')."</th>\n";
-		echo "		<th>".$p->t('benotungstool/punkte')."</th>";
-		echo "		<th>".$p->t('benotungstool/teilnote')."</th>\n";
-		echo "		<th>".$p->t('benotungstool/note')."</th>";
-		echo "	</tr>\n";
-		foreach ($uebung_obj->uebungen as $row)
-		{
-
-			$subuebung_obj = new uebung();
-			$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-			$l1note = new studentnote();
-			if(count($subuebung_obj->uebungen) >= 0)
-			{
-
-
-				$l1note->calc_l1_note($row->uebung_id, $user, $lehreinheit_id);
-				if ($l1note->negativ)
-					$l1_note = 5;
-				else
-					$l1_note = $l1note->l1_note;
-				echo "	<tr>\n";
-				echo "		<td colspan='2'>";
-				echo $row->bezeichnung;
-				if ($row->positiv)
-					echo "*";
-				echo "		</td>\n";
-				echo "		<td align='center'>".$row->gewicht."</td>\n";
-				echo "		<td align='center'>";
-				if ($l1note->punkte_gesamt_l1 >0)
-					echo $l1note->punkte_gesamt_l1;
-				echo "</td>\n";
-				echo "<td align='center'></td>";
-				echo "<td align='center'>".$l1_note."</td>\n";
-				echo "	</tr>\n";
-
-			}
-
-			if(count($subuebung_obj->uebungen) > 0)
-			{
-
-				foreach ($subuebung_obj->uebungen as $subrow)
-				{
-
-					echo "	<tr>\n";
-					echo "		<td>- </td>";
-					echo "		<td>\n";
-					echo $subrow->bezeichnung;
-					if ($subrow->positiv)
-						echo "*";
-					echo "		</td>\n";
-					echo "		<td align='center'>\n";
-					if ($subrow->abgabe)
-						echo $subrow->gewicht;
-					echo "		</td>\n";
-					if ($subrow->beispiele)
-					{
-						$l1note->calc_punkte($subrow->uebung_id, $user);
-						echo "		<td align='center'>".$l1note->punkte_gesamt."</td>";
-						echo "		<td align='center'></td>\n";
-						echo "		<td align='center'></td>\n";
-					}
-					else if ($subrow->abgabe)
-					{
-						$l1note->calc_note($subrow->uebung_id, $user);
-						echo "		<td align='center'></td>\n";
-						echo "		<td align='center'>".$l1note->note."</td>";
-						echo "		<td align='center'></td>\n";
-					}
-					echo "	</tr>\n";					/*
-					if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-						echo ' + ';
-					else
-						echo ' - ';
-					*/
-
-				}
-
-			}
-		}
-		$l1note->calc_gesamtnote($lehreinheit_id, $stsem, $user);
-		if ($l1note->negativ)
-			$gesamtnote = 5;
-		else
-			$gesamtnote = $l1note->studentgesamtnote;
-		echo "<tr style='background-color:#dddddd;'><td colspan='5'>".$p->t('benotungstool/errechneteGesamtnote').": </td><td align='center'>".$gesamtnote."</td></tr>";
-
-
-		echo "</table>";
-		echo "<span style='font-size:8pt;'>".$p->t('benotungstool/mussPositivSein')."</span>";
-	}
-
-	echo "</td><td valign='top'>";
-
-	$legesamtnote = new legesamtnote($lehreinheit_id);
-
-	if (!$legesamtnote->load($user, $lehreinheit_id))
-	{
-		$lenote = null;
-	}
-	else
-	{
-		$lenote = $legesamtnote->note;
-	}
-	if ($lvgesamtnote = new lvgesamtnote($lvid,$user,$stsem))
-	{
-		$lvnote = $lvgesamtnote->note;
-	}
-	else
-		$lvnote = null;
-	if ($zeugnisnote = new zeugnisnote($lvid,$user,$stsem))
-	{
-		$znote = $zeugnisnote->note;
-	}
-	else
-		$znote = null;
-
-	echo "<table style='border: 1px #dddddd solid'>\n";
-	echo "	<tr><th colspan='2'>".$p->t('benotungstool/eingetrageneNoten')."</th></tr>";
-	echo "<tr>\n";
-	echo "<td>".$p->t('global/lehreinheit')."</td>";
-	echo "<td>".$lenote."</td>";
-	echo "</tr>\n";
-	echo "<tr>\n";
-	echo "<td>".$p->t('global/lehrveranstaltung')."</td>";
-	echo "<td>".$lvnote."</td>";
-	echo "</tr>\n";
-	echo "<tr>\n";
-	echo "<td>".$p->t('benotungstool/zeunis')."</td>";
-	echo "<td>".$znote."</td>";
-	echo "</tr>\n";
-	echo "</table>";
-
-	echo "</td></tr></table>";
-}
-?>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/studentenpunkteverwalten.php b/cis/private/lehre/benotungstool/studentenpunkteverwalten.php
deleted file mode 100644
index 199b3a841..000000000
--- a/cis/private/lehre/benotungstool/studentenpunkteverwalten.php
+++ /dev/null
@@ -1,978 +0,0 @@
-<?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>.
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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('functions.inc.php');
-require_once('../../../../include/phrasen.class.php');
-
-$sprache = getSprache();
-$p = new phrasen($sprache);
-if (!$db = new basis_db())
-		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-$user = get_uid();
-
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-$uid = (isset($_GET['uid'])?$_GET['uid']:'');
-
-//Abgabedatei ausliefern
-if (isset($_GET["download_abgabe"])){
-	$file=$_GET["download_abgabe"];
-	$uebung_id = $_GET["uebung_id"];
-	$ueb = new uebung();
-	$ueb->load_studentuebung($uid, $uebung_id);
-	$ueb->load_abgabe($ueb->abgabe_id);
-	$filename = BENOTUNGSTOOL_PATH."abgabe/".$ueb->abgabedatei;
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="'.$file.'"');
-	readfile($filename);
-	exit;
-}
-
-//Handbuch ausliefern
-if (isset($_GET["handbuch"])){
-	$filename = BENOTUNGSTOOL_PATH."handbuch_benotungstool.pdf";
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="handbuch_benotungstool.pdf"');
-	readfile($filename);
-	exit;
-}
-
-
-if (isset($_FILES["abgabedatei"]))
-{
-	//echo $_FILES["abgabedatei"];
-	$abgabedatei_up = $_FILES["abgabedatei"]["tmp_name"];
-
-	if ($abgabedatei_up)
-	{
-		$student_uid = $uid;
-		$datum = date('Y-m-d H:i:s');
-		$datumstr = ereg_replace(" ","_",$datum);
-		$name_up = pathinfo($_FILES["abgabedatei"]["name"]);
-		$name_neu = makeUploadName($db, $which='abgabe', $lehreinheit_id=$lehreinheit_id, $uebung_id=$uebung_id, $ss=$stsem,$uid=$student_uid, $date=$datumstr);
-		$name_neu = preg_replace('/[^A-Za-z0-9\-_]/', '',$name_neu);
-		$abgabedatei = $name_neu.".".$name_up["extension"];
-		$abgabepfad = BENOTUNGSTOOL_PATH."abgabe/".$abgabedatei;
-
-		$uebung_obj = new uebung();
-		$uebung_obj->load_studentuebung($student_uid, $uebung_id);
-
-
-		if ($uebung_obj->errormsg != "")
-		{
-			$uebung_obj->student_uid = $student_uid;
-			$uebung_obj->mitarbeiter_uid = null;
-			$uebung_obj->abgabe_id = null;
-			$uebung_obj->uebung_id = $uebung_id;
-			$uebung_obj->note = null;
-			$uebung_obj->mitarbeitspunkte = null;
-			$uebung_obj->punkte = null;
-			$uebung_obj->anmerkung = null;
-			$uebung_obj->benotungsdatum = null;
-			$uebung_obj->updateamum = null;
-			$uebung_obj->updatevon = null;
-			$uebung_obj->insertamum = $datum;
-			$uebung_obj->insertvon = $user;
-			$uebung_obj->new = true;
-			$uebung_obj->studentuebung_save($new=true);
-			echo $uebung_obj->errormsg;
-
-		}
-		if ($uebung_obj->abgabe_id != null)
-		{
-			$uebung_obj->load_abgabe($uebung_obj->abgabe_id);
-			unlink(BENOTUNGSTOOL_PATH."abgabe/".$uebung_obj->abgabedatei);
-			$uebung_obj->abgabedatei = $abgabedatei;
-			$uebung_obj->abgabezeit = 	$datum;
-			$uebung_obj->abgabe_anmerkung = "";
-			$uebung_obj->abgabe_save(false);
-		}
-		else
-		{
-			$uebung_obj->abgabedatei = $abgabedatei;
-			$uebung_obj->abgabezeit = 	$datum;
-			$uebung_obj->abgabe_anmerkung = "";
-			$uebung_obj->abgabe_save(true);
-		}
-		$uebung_obj->studentuebung_save(false);
-		//Abgabedatei ablegen
-		move_uploaded_file($_FILES['abgabedatei']['tmp_name'], $abgabepfad);
-	}
-}
-else
-	$abgabedatei_up = null;
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title><?php echo $p->t('benotungstool/benotungstool');?></title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-	function confirmdelete()
-	{
-		return confirm('<?php echo $p->t('gesamtnote/wollenSieWirklichLoeschen');?>');
-	}
-  //-->
-</script>
-</head>
-
-<body>
-<?php
-
-
-//Kopfzeile
-echo '<table width="100%"><tr><td><h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz
-			FROM
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz
-			FROM
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-
-}
-
-if($result = $db->db_query($qry))
-{
-	if($db->db_num_rows($result)>0)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit').": <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-				$lektoren .=')';
-			}
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-echo '<table width="100%"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-echo "<b>".$lv_obj->bezeichnung_arr[$sprache]."</b><br>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/keinePassendeLehreinheitGefunden'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br><a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-echo "<h3>".$p->t('benotungstool/studentenaufgabenVerwalten')."</h3>";
-if(isset($_POST['submit']))
-{
-	$error=false;
-	$punkte = (isset($_POST['punkte'])?mb_ereg_replace(',','.',$_POST['punkte']):'');
-	if(isset($punkte) && is_numeric($punkte) && !isset($_POST['abgabe']))
-	{
-		$ueb_obj = new uebung();
-		if($ueb_obj->load_studentuebung($uid, $uebung_id))
-			$ueb_obj->new = false;
-		else
-		{
-			$ueb_obj->new = true;
-			$ueb_obj->insertamum = date('Y-m-d H:i:s');
-			$ueb_obj->insertvon = $user;
-		}
-
-		$ueb_obj->mitarbeitspunkte = $punkte;
-		$ueb_obj->anmerkung = $_POST['anmerkung'];
-		$ueb_obj->updateamum = date('Y-m-d H:i:s');
-		$ueb_obj->updatevon = $user;
-		$ueb_obj->mitarbeiter_uid = $user;
-		$ueb_obj->uebung_id = $uebung_id;
-		$ueb_obj->student_uid = $uid;
-
-		if(!$ueb_obj->studentuebung_save())
-			$error = true;
-
-		$bsp_obj = new beispiel();
-
-		if($bsp_obj->load_beispiel($uebung_id))
-		{
-			foreach ($bsp_obj->beispiele as $row)
-			{
-					$stud_bsp_obj = new beispiel();
-
-					if($stud_bsp_obj->load_studentbeispiel($uid, $row->beispiel_id))
-					{
-						$stud_bsp_obj->new=false;
-					}
-					else
-					{
-						$stud_bsp_obj->new=true;
-						$stud_bsp_obj->insertamum = date('Y-m-d H:i:s');
-						$stud_bsp_obj->insertvon = $user;
-					}
-					$stud_bsp_obj->vorbereitet = ($_POST['solved_'.$row->beispiel_id]==1?true:false);
-					$stud_bsp_obj->probleme = (isset($_POST['problem_'.$row->beispiel_id])?true:false);
-					$stud_bsp_obj->updateamum = date('Y-m-d H:i:s');
-					$stud_bsp_obj->updatevon = $user;
-					$stud_bsp_obj->student_uid = $uid;
-					$stud_bsp_obj->beispiel_id = $row->beispiel_id;
-
-					if(!$stud_bsp_obj->studentbeispiel_save())
-					{
-						echo $stud_bsp_obj->errormsg;
-						$error=true;
-					}
-			}
-		}
-
-		if($error)
-			echo "<span class='error'>".$p->t('benotungstool/esKonntenNichtAlleDatenGespeichertWerden')."</span>";
-		else
-			echo $p->t('global/erfolgreichgespeichert')."<br>";
-
-	}
-	else if (!isset($_POST['abgabe']))
-	{
-		echo "<span class='error'>".$p->t('benotungstool/punkteSindUngueltig')."</span>";
-	}
-	if(isset($_POST['abgabe']) && is_numeric($_POST['note']))
-	{
-		$note = $_POST['note'];
-		$ueb_obj = new uebung();
-		if($ueb_obj->load_studentuebung($uid, $uebung_id))
-			$ueb_obj->new = false;
-		else
-		{
-			$ueb_obj->new = true;
-			$ueb_obj->insertamum = date('Y-m-d H:i:s');
-			$ueb_obj->insertvon = $user;
-		}
-
-		$ueb_obj->note = $note;
-		$ueb_obj->anmerkung = $_POST['anmerkung'];
-		$ueb_obj->updateamum = date('Y-m-d H:i:s');
-		$ueb_obj->updatevon = $user;
-		$ueb_obj->mitarbeiter_uid = $user;
-		$ueb_obj->uebung_id = $uebung_id;
-		$ueb_obj->student_uid = $uid;
-
-		if(!$ueb_obj->studentuebung_save())
-			$error = true;
-		if($error)
-			echo "<span class='error'>".$p->t('benotungstool/esKonntenNichtAlleDatenGespeichertWerden')."</span>";
-		else
-			echo $p->t('global/erfolgreichgespeichert')."<br>";
-	}
-	else if (isset($_POST['abgabe']))
-		echo "<span class='error'>".$p->t('benotungstool/noteIstUngueltig')."<br></span>";
-}
-
-if(isset($_GET['uid']) && $_GET['uid']!='')
-{
-	//Punkte eintragen
-	$uid = addslashes($_GET['uid']);
-
-	$qry_stud = "SELECT vorname, nachname, uid FROM campus.vw_student WHERE uid='$uid'";
-
-	if(!$result_stud = $db->db_query($qry_stud))
-		die($p->t('benotungstool/fehlerBeimLadenDesStudenten'));
-
-	if(!$row_stud = $db->db_fetch_object($result_stud))
-		die($p->t('benotungstool/studentWurdeNichtGefunden'));
-
-	//echo "<b>$row_stud->vorname $row_stud->nachname</b><br>\n";
-
-
-
-	$uid_arr = Array();
-	$vorname_arr = Array();
-	$nachname_arr = Array();
-
-			// studentenquery
-			$qry_stud_dd = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE  studiensemester_kurzbz = ".$db->db_add_param($stsem)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id, FHC_INTEGER)."  ORDER BY nachname, vorname";
-            if($result_stud_dd = $db->db_query($qry_stud_dd))
-			{
-				$i=1;
-				while($row_stud_dd = $db->db_fetch_object($result_stud_dd))
-				{
-					$uid_arr[] = $row_stud_dd->uid;
-					$vorname_arr[] = $row_stud_dd->vorname;
-					$nachname_arr[] = $row_stud_dd->nachname;
-
-				}
-			}
-//		}
-//	}
-	echo $p->t('benotungstool/studentenAuswaehlen').": ";
-	$key = array_search($uid,$uid_arr);
-	$prev = $key-1;
-	$next = $key+1;
-	if ($key > 0)
-		echo "<a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$prev]&stsem=$stsem'> &lt;&lt; </a>";
-	echo "<SELECT name='stud_dd' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-	for ($j = 0; $j < count($uid_arr); $j++)
-	{
-			if ($uid_arr[$j] == $uid)
-				$selected = " selected";
-			else
-				$selected = "";
-
-			echo "<option value='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$j]&stsem=$stsem'$selected>$vorname_arr[$j] $nachname_arr[$j]</option>";
-	}
-	echo "</select>";
-	if ($key < count($uid_arr)-1)
-		echo "<a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid_arr[$next]&stsem=$stsem'> &gt;&gt; </a>";
-
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,1);
-	if(count($uebung_obj->uebungen)>0)
-	{
-		echo "<table width='100%'><tr><td valign='top'>";
-		echo "<br>".$p->t('benotungstool/waehlenSieEineAufgabeAus').": <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		echo "<option value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=&uid=$uid' selected></option>";
-		foreach ($uebung_obj->uebungen as $row)
-		{
-
-			if($uebung_id == $row->uebung_id)
-				$selected = 'selected';
-			else
-				$selected = '';
-
-			if($uebung_id=='')
-				$uebung_id=$row->uebung_id;
-
-			$subuebung_obj = new uebung();
-			$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-			if(count($subuebung_obj->uebungen)>0)
-				{
-				$disabled = 'disabled';
-				$selected = '';
-				}
-			else
-				$disabled = '';
-
-			echo "<OPTION style='background-color:#cccccc;' value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id&uid=$uid' $selected $disabled>";
-
-
-			echo $row->bezeichnung;
-			echo '</OPTION>';
-
-			if(count($subuebung_obj->uebungen)>0)
-			{
-				foreach ($subuebung_obj->uebungen as $subrow)
-				{
-					if($uebung_id=='')
-						$uebung_id=$subrow->uebung_id;
-
-					if($uebung_id == $subrow->uebung_id)
-						$selected = 'selected';
-					else
-						$selected = '';
-
-					echo "<OPTION value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id&uid=$uid' $selected>";
-
-
-					//Freigegeben = +
-					//Nicht Freigegeben = -
-					if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-						echo ' + ';
-					else
-						echo ' - ';
-
-					echo $subrow->bezeichnung;
-					echo '</OPTION>';
-
-				}
-			}
-		}
-
-		echo '</SELECT>';
-
-		echo '</td>';
-
-		echo "<td>
-			<table>
-			<tr>
-				<td><b>+</b>...</td>
-				<td><u>".$p->t('benotungstool/freigeschaltet')."</u>.</td>
-			</tr>
-			<tr>
-				<td><b>-</b>...</td>
-				<td><u>".$p->t('benotungstool/nichtFreigeschaltet')."</u>.</td>
-			</tr>
-			</table>
-		</td>
-	</tr></table>";
-	}
-	else
-		die($p->t('benotungstool/derzeitSindKeineUebungenAngelegt'));
-
-	$ueb_obj = new uebung();
-	$ueb_obj->load($uebung_id);
-	if($ueb_obj->load_studentuebung($uid, $uebung_id))
-	{
-		$anmerkung = $ueb_obj->anmerkung;
-		$mitarbeit = $ueb_obj->mitarbeitspunkte;
-		$note = $ueb_obj->note;
-	}
-	else
-	{
-		$anmerkung = '';
-		$mitarbeit = 0;
-		$note = '';
-	}
-
-	if ($ueb_obj->beispiele && is_numeric($_GET['uebung_id']))
-	{
-		echo "
-		<form accept-charset='UTF-8' method='POST' action='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid'>
-		<table width='100%'><tr><td valign='top'>
-		".$p->t('global/anmerkung').":<br>
-		<textarea name='anmerkung' cols=50 rows=5>".$anmerkung."</textarea>
-		<br><br>
-		<table border='1'>
-		<tr>
-			<td class='ContentHeader2'>".$p->t('benotungstool/beispiel')."</td>
-		    <td class='ContentHeader2'>".$p->t('benotungstool/vorbereitet')."</td>
-		    <td class='ContentHeader2'>".$p->t('benotungstool/nichtVorbereitet')."</td>
-		    <td class='ContentHeader2'>".$p->t('benotungstool/probleme')."</td>
-		    <td class='ContentHeader2'>".$p->t('benotungstool/punkte')."</td>
-		</tr>";
-
-		$bsp_obj = new beispiel();
-		$bsp_obj->load_beispiel($uebung_id);
-
-		foreach ($bsp_obj->beispiele as $row)
-		{
-			$stud_bsp_obj = new beispiel();
-			if($stud_bsp_obj->load_studentbeispiel($uid, $row->beispiel_id))
-			{
-				$vorbereitet = $stud_bsp_obj->vorbereitet;
-				$probleme = $stud_bsp_obj->probleme;
-			}
-			else
-			{
-				$vorbereitet = false;
-				$probleme = false;
-			}
-			echo "<tr>
-				<td>$row->bezeichnung</td>
-					<td align='center'><input type='radio' name='solved_$row->beispiel_id' value='1' ".($vorbereitet?'checked':'')."></td>
-					<td align='center'><input type='radio' name='solved_$row->beispiel_id' value='0' ".(!$vorbereitet?'checked':'')."></td>
-					<td align='center'><input type='checkbox' name='problem_$row->beispiel_id' ".($probleme?'checked':'')."></td>
-					<td align='center'>$row->punkte</td>
-				</tr>";
-		}
-
-		echo "</table>";
-
-
-
-		$ueb_obj->load_studentuebung($uid, $uebung_id);
-		if ($ueb_obj->abgabe_id)
-		{
-			$ueb_obj->load_abgabe($ueb_obj->abgabe_id);
-			$filename = $ueb_obj->abgabedatei;
-		}
-		else
-			$filename='';
-
-		if ($filename != '')
-			echo "<br>".$p->t('benotungstool/abgabedatei').": <a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid&download_abgabe=$filename'>".$filename."</a><br><br>";
-
-
-
-		echo "
-		</td><td valign='top' algin='right'>";
-
-		//Gesamtpunkte diese Kreuzerlliste
-		$qry = "SELECT sum(punkte) as punktegesamt FROM campus.tbl_beispiel WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER);
-		$punkte_gesamt=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$punkte_gesamt = $row->punktegesamt;
-
-		//Eingetragen diese Kreuzerlliste
-		$qry = "SELECT sum(punkte) as punkteeingetragen FROM campus.tbl_beispiel JOIN campus.tbl_studentbeispiel USING(beispiel_id) WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($uid)." AND vorbereitet=true";
-		$punkte_eingetragen=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$punkte_eingetragen = ($row->punkteeingetragen!=''?$row->punkteeingetragen:0);
-
-
-		//Gesamtpunkte alle Kreuzerllisten in dieser Übung
-		$ueb_help = new uebung($uebung_id);
-		$liste_id = $ueb_help->liste_id;
-		$qry = "SELECT sum(tbl_beispiel.punkte) as punktegesamt_alle FROM campus.tbl_beispiel, campus.tbl_uebung
-				WHERE tbl_uebung.uebung_id=tbl_beispiel.uebung_id AND
-				tbl_uebung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." and tbl_uebung.liste_id = ".$db->db_add_param($liste_id, FHC_INTEGER);
-		$punkte_gesamt_alle=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$punkte_gesamt_alle = $row->punktegesamt_alle;
-
-		//Eingetragen alle Kreuzerllisten
-		$qry = "SELECT sum(tbl_beispiel.punkte) as punkteeingetragen_alle FROM campus.tbl_beispiel, campus.tbl_studentbeispiel, campus.tbl_uebung
-				WHERE tbl_beispiel.beispiel_id = tbl_studentbeispiel.beispiel_id AND
-				tbl_uebung.uebung_id=tbl_beispiel.uebung_id AND
-				tbl_uebung.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND
-				tbl_uebung.liste_id = ".$db->db_add_param($liste_id)." AND
-				tbl_studentbeispiel.student_uid=".$db->db_add_param($uid)." AND vorbereitet=true";
-		$punkte_eingetragen_alle=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$punkte_eingetragen_alle = ($row->punkteeingetragen_alle!=''?$row->punkteeingetragen_alle:0);
-
-		//Mitarbeitspunkte
-		$qry = "SELECT sum(mitarbeitspunkte) as mitarbeitspunkte FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id)
-				WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($uid)." and liste_id=".$db->db_add_param($liste_id);
-		$mitarbeit_alle=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$mitarbeit_alle = ($row->mitarbeitspunkte!=''?$row->mitarbeitspunkte:0);
-
-		//Mitarbeitspunkte
-		$qry = "SELECT mitarbeitspunkte FROM campus.tbl_studentuebung
-				WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($uid);
-		$mitarbeit=0;
-		if($result=$db->db_query($qry))
-			if($row = $db->db_fetch_object($result))
-				$mitarbeit = ($row->mitarbeitspunkte!=''?$row->mitarbeitspunkte:0);
-		echo "
-		<br>
-			<table border='1' width='210'>
-			<tr>
-				<td colspan='2' class='ContentHeader2'>Diese Kreuzerlliste:</td>
-			</tr>
-			<tr>
-				<td width='180'>".$p->t('benotungstool/punkteInsgesamtMoeglich').":</td>
-				<td width='30'>$punkte_gesamt</td>
-			</tr>
-			<tr>
-				<td>".$p->t('benotungstool/punkteEingetragen').":</td>
-				<td>$punkte_eingetragen</td>
-			</tr>
-			</table>
-			<br><br>
-			<table border='1' width='210'>
-			<tr>
-				<td colspan='2' class='ContentHeader2'>".$p->t('benotungstool/alleKreuzerllistenDieserUebung').":</td>
-			</tr>
-			<tr>
-				<td width='180'>".$p->t('benotungstool/punkteInsgesamtMoeglich').":</td>
-				<td width='30'>$punkte_gesamt_alle</td>
-			</tr>
-			<tr>
-				<td>".$p->t('benotungstool/punkteEingetragen').":</td>
-				<td>$punkte_eingetragen_alle</td>
-			</tr>
-			</table>
-			<br><br>
-			<table border='1' width='210'>
-			<tr>
-				<td colspan='2' class='ContentHeader2'>".$p->t('benotungstool/mitarbeitspunkte').":</td>
-			</tr>
-			<tr>
-				<td width='180'>".$p->t('benotungstool/bisherInsgesamt').":</td>
-				<td width='30'>$mitarbeit_alle</td>
-			</tr>
-			<tr>
-				<td>".$p->t('benotungstool/dieseKreuzerlliste').":</td>
-				<td><input type='text' size=2 name='punkte' value='$mitarbeit'></td>
-			</tr>
-			</table>
-			";
-
-
-		echo "
-		</td></tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-				<input type='button' value='".$p->t('global/zurueck')."' onclick='history.back();'>
-				<input type='submit' value='".$p->t('global/speichern')."' name='submit'>
-			</td>
-
-		</tr>
-		</table>
-
-		</form>
-		";
-	}
-	else if (is_numeric($_GET['uebung_id']))
-	{
-		$ueb_obj->load_studentuebung($uid, $uebung_id);
-		if ($ueb_obj->abgabe_id)
-		{
-			$ueb_obj->load_abgabe($ueb_obj->abgabe_id);
-			$filename = $ueb_obj->abgabedatei;
-		}
-		else
-			$filename='';
-		//Abgaben benoten
-		$studentnote = new studentnote($lehreinheit_id,$stsem,$uid,$uebung_id);
-		$studentnote->calc_note($uebung_id, $uid);
-		echo "<span class='studentnote'>".$p->t('benotungstool/note').": ".$studentnote->note." (Gewicht: ".$ueb_obj->gewicht.")</span><br><br>";
-		if ($filename != '')
-			echo $p->t('benotungstool/abgabedatei').": <a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid&download_abgabe=$filename'>".$filename."</a><br><br>";
-		echo "
-		<form accept-charset='UTF-8' method='POST' action='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$uid'>
-		<table width='100%'><tr><td valign='top'>
-		".$p->t('global/anmerkung').":<br>
-		<textarea name='anmerkung' cols=50 rows=5>".$anmerkung."</textarea>
-		</td><td>
-		<table border='1'>
-		<tr>
-			<td class='ContentHeader2'>Note</td>
-			<td><input type='text' name='note' value='$note'><input type='hidden' name='abgabe' value='1'></td>
-		</tr>";
-		echo "
-		<tr>
-			<td colspan='2'>
-				<input type='button' value='".$p->t('global/zurueck')."' onclick='history.back();'>
-				<input type='submit' value='".$p->t('global/speichern')."' name='submit'>
-			</td>
-
-		</tr>
-		</table>
-		</form>";
-
-	}
-	echo "</td></tr></table>";
-	echo "<table>\n";
-	echo "	<tr>\n";
-	echo "	<form accept-charset='UTF-8' method='POST' action='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&stsem=$stsem&uid=$uid' enctype='multipart/form-data'>\n";
-	echo "		<td>\n";
-	echo "			<b>".$p->t('benotungstool/studentenabgabedatei').":</b><br><input type='file' name='abgabedatei'> <input type='submit' name='abgabe' value='".$p->t('benotungstool/abgeben')."'>";
-	echo "		</td>\n";
-	echo "	</form>\n";
-	echo "</tr>\n";
-	echo "</table>";
-}
-else
-{
-
-	//Übungen benoten
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,1);
-	if(count($uebung_obj->uebungen)>0)
-	{
-		echo "<table width='100%'><tr><td valign='top'>";
-		echo "<br>".$p->t('benotungstool/aufgabeKreuzerllistenAbgaben').": <SELECT name='uebung' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		echo "<option value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=&uid=$uid' selected></option>";
-		foreach ($uebung_obj->uebungen as $row)
-		{
-
-			if($uebung_id == $row->uebung_id)
-				$selected = 'selected';
-			else
-				$selected = '';
-
-			if($uebung_id=='')
-				$uebung_id=$row->uebung_id;
-
-			$subuebung_obj = new uebung();
-			$subuebung_obj->load_uebung($lehreinheit_id,2,$row->uebung_id);
-			if(count($subuebung_obj->uebungen)>0)
-				{
-				$disabled = 'disabled';
-				$selected = '';
-				}
-			else
-				$disabled = '';
-
-			echo "<OPTION style='background-color:#cccccc;' value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id&uid=$uid' $selected $disabled>";
-
-
-			echo $row->bezeichnung;
-			echo '</OPTION>';
-
-			if(count($subuebung_obj->uebungen)>0)
-			{
-				foreach ($subuebung_obj->uebungen as $subrow)
-				{
-					if($uebung_id=='')
-						$uebung_id=$subrow->uebung_id;
-
-					if($uebung_id == $subrow->uebung_id)
-						$selected = 'selected';
-					else
-						$selected = '';
-
-					echo "<OPTION value='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id&uid=$uid' $selected>";
-
-
-					//Freigegeben = +
-					//Nicht Freigegeben = -
-					if($datum_obj->mktime_fromtimestamp($subrow->freigabevon)<time() && $datum_obj->mktime_fromtimestamp($subrow->freigabebis)>time())
-						echo ' + ';
-					else
-						echo ' - ';
-
-					echo $subrow->bezeichnung;
-					echo '</OPTION>';
-
-				}
-			}
-		}
-
-		echo '</SELECT>';
-		echo "<a href='anwesenheitsliste.php?output=html&uebung_id=$uebung_id&lehreinheit_id=$lehreinheit_id&stsem=$stsem' target='_blank'> [".$p->t('benotungstool/benoten')."]</a>";
-		$abgabe_obj = new uebung($uebung_id);
-		if ($abgabe_obj->abgabe && glob(BENOTUNGSTOOL_PATH."abgabe/*_[WS]S[0-9][0-9][0-9][0-9]_".$uebung_id."_*"))
-		{
-			$date = date('Y-m-d_H:i:s');
-			$downloadname = makeUploadName($db, $which="zip", $lehreinheit_id, $uebung_id, $stsem, $uid=null, $date);
-			$downloadname = str_replace($uebung_id, str_replace(" ","_",$abgabe_obj->bezeichnung), $downloadname);
-			$downloadname = preg_replace('/[^A-Za-z0-9\-_]/', '',$downloadname);
-			echo "<a href='zipdownload_benotungstool.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&downloadname=$downloadname'> [".$p->t('benotungstool/abgabenDownloaden')."]</a>";
-		}
-		else
-			echo "[".$p->t('benotungstool/keineAbgabenVerfuegbar')."]";
-
-		echo '</td></tr></table>';
-	}
-
-
-
-
-	echo "<br><hr><br>";
-	//Studentenliste
-	echo $p->t('benotungstool/bitteWaehlenSieDenStudentenAus')."<br>";
-	echo "
-	<table width='80%'>
-	";
-
-			echo "<tr>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-
-				</tr>
-				<tr>
-					<td class='ContentHeader2'>".$p->t('global/uid')."</td>
-					<td class='ContentHeader2'>".$p->t('global/nachname')."</td>
-					<td class='ContentHeader2'>".$p->t('global/vorname')."</td>
-					<td class='ContentHeader2'>".$p->t('benotungstool/studentenansicht')."</td>
-
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-				</tr>";
-			/*
-			if($row_grp->gruppe_kurzbz!='')
-			{
-					echo "
-					<tr>
-						<td colspan='4' align='center'><b>$row_grp->gruppe_kurzbz</b></td>
-					</tr>";
-					$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($row_grp->gruppe_kurzbz)."' AND studiensemester_kurzbz = '".$stsem."' ORDER BY nachname, vorname";
-			}
-			else
-			{
-				echo "
-					<tr>
-						<td colspan='4' align='center'><b>Verband $row_grp->verband ".($row_grp->gruppe!=''?"Gruppe $row_grp->gruppe":'')."</b></td>
-					</tr>";
-					$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student
-					             WHERE studiengang_kz='$row_grp->studiengang_kz' AND
-					             semester='$row_grp->semester' ".
-								 ($row_grp->verband!=''?" AND trim(verband)=trim('$row_grp->verband')":'').
-								 ($row_grp->gruppe!=''?" AND trim(gruppe)=trim('$row_grp->gruppe')":'').
-					            " ORDER BY nachname, vorname";
-			}
-			*/
-			// studentenquery
-			$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE  studiensemester_kurzbz = '".$stsem."' and lehreinheit_id = '".$lehreinheit_id."' ORDER BY nachname, vorname";
-            if($result_stud = $db->db_query($qry_stud))
-			{
-				$i=1;
-				while($row_stud = $db->db_fetch_object($result_stud))
-				{
-
-
-
-					echo "
-					<tr class='liste".($i%2)."'>
-						<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->uid</a></td>
-						<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->nachname</a></td>
-						<td><a href='studentenpunkteverwalten.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item'>$row_stud->vorname</a></td>
-						<td><a href='studentenansicht.php?lvid=$lvid&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&uid=$row_stud->uid&stsem=$stsem' class='Item' target='_blank'>".$p->t('benotungstool/studentenansicht')."</a></td>
-					</tr>";
-					$i++;
-				}
-			}
-//		}
-//	}
-	echo "</table>";
-}
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/verwaltung.php b/cis/private/lehre/benotungstool/verwaltung.php
deleted file mode 100644
index e35eaecb1..000000000
--- a/cis/private/lehre/benotungstool/verwaltung.php
+++ /dev/null
@@ -1,941 +0,0 @@
-<?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>.
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-require_once('functions.inc.php');
-require_once('../../../../include/phrasen.class.php');
-
-$sprache = getSprache(); 
-$p = new phrasen($sprache);
-
-if (!$db = new basis_db())
-		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-			
-
-function microtime_float()
-{
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
-$time = microtime_float();
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title>Kreuzerltool</title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-	function confirmdelete()
-	{
-		return confirm('<?php echo $p->t('gesamtnote/wollenSieWirklichLoeschen');?>');
-	}
-	
-	//Aus- und Einblenden der Listen
-	__js_page_array = new Array();
-
-    function js_toggle_container(conid)
-    {
-		if (document.getElementById)
-		{
-        	var block = "table-row";
-			if (navigator.appName.indexOf('Microsoft') > -1)
-				block = 'block';
-            var status = __js_page_array[conid];
-            if (status == null)
-            	status=document.getElementById(conid).style.display; //status = "none";
-            if (status == "none")
-            {
-            	document.getElementById(conid).style.display = block;
-            	__js_page_array[conid] = "visible";
-            }
-            else
-            {
-            	document.getElementById(conid).style.display = 'none';
-            	__js_page_array[conid] = "none";
-            }
-            return false;
-     	}
-     	else
-     		return true;
-  	}
-  //-->
-</script>
-</head>
-
-<body>
-<?php
-
-$user = get_uid();
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-$global_msg ='';
-$error_thema='';
-$error_anzahlderbeispiele='';
-$error_punkteprobeispiel='';
-$error_freigabebis='';
-$error_freigabevon='';
-$error_gewicht='';
-
-$thema = (isset($_POST['thema'])?$_POST['thema']:'');
-$anzahlderbeispiele = (isset($_POST['anzahlderbeispiele'])?$_POST['anzahlderbeispiele']:'');
-$punkteprobeispiel = (isset($_POST['punkteprobeispiel'])?$_POST['punkteprobeispiel']:'');
-$punkteprobeispiel = mb_ereg_replace(',','.',$punkteprobeispiel);
-$freigabebis = (isset($_POST['freigabebis'])?$_POST['freigabebis']:'');
-$freigabevon = (isset($_POST['freigabevon'])?$_POST['freigabevon']:'');
-$gewicht = (isset($_POST['gewicht'])?$_POST['gewicht']:'');
-$positiv = (isset($_POST['positiv'])?$_POST['positiv']:'');
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-$copy_content = '';
-$copy_dropdown = '';
-
-//Kopfzeile
-echo '<table width="100%"><tr><td><h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='verwaltung.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT 
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz 
-			FROM 
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE 
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-
-if($result =  $db->db_query($qry))
-{
-	$result_alle_lehreinheiten = $result;
-	if($db->db_num_rows($result)>1)
-	{
-		//Lehreinheiten DropDown
-		echo $p->t('global/lehreinheit').": <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		$copy_dropdown = "<select name='lehreinheit_id_target'><option></option>";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			//Zugeteilte Lektoren
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter using(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-				$lektoren .=')';
-			}
-
-
-			//Zugeteilte Gruppen
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-			if ($lehreinheit_id != $row->lehreinheit_id)			
-				$copy_dropdown .= "<option value='".$row->lehreinheit_id."'>$row->lfbez-$row->lehrform_kurzbz - $gruppen</option>";
-		}
-		echo '</SELECT> ';
-		$copy_dropdown .="</select>";
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-
-echo '<table width="100%"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-
-echo "<h2>".$lv_obj->bezeichnung_arr[$sprache]."</h2>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/esGibtKeineLehreinheiten'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br>
-<a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-//echo "studiensemester: $stsem<br>";
-//echo "lehrveranstaltung: $lvid<br>";
-//echo "lehreinheit: $lehreinheit_id<br>";
-//Übung in andere LE kopieren
-
-if (isset($_REQUEST["copy_uebung"]))
-{
-	$copy_insert = 0;
-	$copy_update = 0;	
-	$copy_insert_bsp = 0;
-	$copy_update_bsp = 0;
-	$uebung_id_source = $_REQUEST["uebung_id_source"];
-	$lehreinheit_id_target = $_REQUEST["lehreinheit_id_target"];
-	if (!is_numeric($uebung_id_source) or !is_numeric($lehreinheit_id_target))
-		echo "<span class='error'>".$p->t('benotungstool/uebungUndLehreinheit')."!</span>";
-	else
-	{
-		$ueb_1 = new uebung($uebung_id_source);
-		$nummer_source = $ueb_1->nummer;
-		$qry = "SELECT * from campus.tbl_uebung where nummer = ".$db->db_add_param($nummer_source)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id_target, FHC_INTEGER);
-		//echo $qry;
-		if($result1 = $db->db_query($qry))	
-		{
-			if ($db->db_num_rows($result1) >0)
-			{
-				$row1 = $db->db_fetch_object($result1);		
-				$ueb_1_target =new uebung($row1->uebung_id);
-				$ueb_1_target->new = false;
-				$new = null;
-				$ueb_1_target->insertamum = null;
-				$ueb_1_target->insertvon = null;
-				$ueb_1_target->updateamum = date('Y-m-d H:i:s');
-				$ueb_1_target->updatevon = $user;
-				$copy_update++;
-			}
-			else
-			{
-				$ueb_1_target =new uebung();
-				$ueb_1_target->new = true;
-				$new = true;
-				$ueb_1_target->insertamum = date('Y-m-d H:i:s');
-				$ueb_1_target->insertvon = $user;
-				$ueb_1_target->updateamum = null;
-				$ueb_1_target->updatevon = null;
-				$copy_insert++;
-			}
-			$ueb_1_target->gewicht = $ueb_1->gewicht;
-			$ueb_1_target->punkte = null;
-			$ueb_1_target->angabedatei=null;
-			$ueb_1_target->freigabevon = null;
-			$ueb_1_target->freigabebis = null;
-			$ueb_1_target->abgabe = false;
-			$ueb_1_target->beispiele = false;
-			$ueb_1_target->statistik = false;
-			$ueb_1_target->maxstd = null;
-			$ueb_1_target->maxbsp=null;
-			$ueb_1_target->liste_id=null;
-			$ueb_1_target->bezeichnung = $ueb_1->bezeichnung;
-			$ueb_1_target->positiv = $ueb_1->positiv;
-			$ueb_1_target->defaultbemerkung = $ueb_1->defaultbemerkung;
-			$ueb_1_target->lehreinheit_id = $lehreinheit_id_target;
-			$ueb_1_target->nummer = $nummer_source;
-					
-			if (!$ueb_1_target->save($new))
-			{
-				$error = 1;
-				echo "<span class='error'>".$p->t('benotungstool/hauptuebungKonnteNichtKopiertWerden')."!</span>";
-			}
-				
-			else
-			{
-				// Subübungen durchlaufen			
-				$error = 0;
-				$ueb_2 = new uebung();
-				$ueb_2->load_uebung($lehreinheit_id,2,$uebung_id_source);
-				
-				$ueb_2anzahl = count($ueb_2->uebungen);
-				if ($ueb_2anzahl >0)			
-				{
-					foreach ($ueb_2->uebungen as $subrow)
-					{
-															
-						$nummer_source2 = $subrow->nummer;
-						$qry2 = "SELECT * from campus.tbl_uebung where nummer = ".$db->db_add_param($nummer_source2)." and lehreinheit_id = ".$db->db_add_param($lehreinheit_id_target, FHC_INTEGER);
-						$result2 = $db->db_query($qry2);
-	
-						if ($db->db_num_rows($result2) >0)
-						{
-							$row2 = $db->db_fetch_object($result2);		
-							$ueb_2_target =new uebung($row2->uebung_id);
-							$ueb_2_target->new = false;
-							$new = null;
-							$ueb_2_target->insertamum = null;
-							$ueb_2_target->insertvon = null;
-							$ueb_2_target->updateamum = date('Y-m-d H:i:s');
-							$ueb_2_target->updatevon = $user;
-							$copy_update++;
-						}
-						else
-						{
-							$ueb_2_target =new uebung();
-							$ueb_2_target->new = true;
-							$new = true;
-							$ueb_2_target->insertamum = date('Y-m-d H:i:s');
-							$ueb_2_target->insertvon = $user;
-							$ueb_2_target->updateamum = null;
-							$ueb_2_target->updatevon = null;
-							$copy_insert++;
-						}
-						$ueb_2_target->gewicht = $subrow->gewicht;
-						$ueb_2_target->punkte = $subrow->punkte;
-						$ueb_2_target->angabedatei=null;
-						$ueb_2_target->freigabevon = $subrow->freigabevon;
-						$ueb_2_target->freigabebis = $subrow->freigabebis;
-						$ueb_2_target->abgabe = $subrow->abgabe;
-						$ueb_2_target->beispiele = $subrow->beispiele;
-						$ueb_2_target->statistik = $subrow->statistik;
-						$ueb_2_target->maxstd = $subrow->maxstd;
-						$ueb_2_target->maxbsp=$subrow->maxbsp;
-						$ueb_2_target->liste_id=$ueb_1_target->uebung_id;
-						$ueb_2_target->bezeichnung = $subrow->bezeichnung;
-						$ueb_2_target->positiv = $subrow->positiv;
-						$ueb_2_target->defaultbemerkung = $subrow->defaultbemerkung;
-						$ueb_2_target->lehreinheit_id = $lehreinheit_id_target;
-						$ueb_2_target->nummer = $nummer_source2;
-								
-						if (!$ueb_2_target->save($new))
-						{
-							$error = 1;
-							echo "<span class='error'>".$p->t('benotungstool/uebungKonnteNichtKopiertWerden')."!</span>";
-						}
-						
-						//angabedatei syncen
-						if ($subrow->angabedatei != "")
-						{	
-							$angabedatei_source = $subrow->angabedatei;
-							$angabedatei_target = makeUploadName($db, 'angabe', $lehreinheit_id, $ueb_2_target->uebung_id, $stsem);
-							$angabedatei_target .= ".".mb_substr($angabedatei_source, mb_strrpos($angabedatei_source, '.') + 1);
-							echo $angabedatei_source."->".$angabedatei_target."<br>";
-							exec("cp ".BENOTUNGSTOOL_PATH."angabe/".$angabedatei_source." ".BENOTUNGSTOOL_PATH."angabe/".$angabedatei_target);
-							$angabeupdate = "update campus.tbl_uebung set angabedatei = ".$db->db_add_param($angabedatei_target)." where uebung_id = ".$db->db_add_param($ueb_2_target->uebung_id, FHC_INTEGER);
-							$db->db_query($angabeupdate);
-						}
-										
-						if (($error == 0) and $ueb_2_target->beispiele)
-						{
-							// beispiele synchronisieren
-							$bsp_obj = new beispiel();
-							$bsp_obj->load_beispiel($subrow->uebung_id);
-							foreach ($bsp_obj->beispiele as $bsp)
-							{
-								$nummer_source_bsp = $bsp->nummer;
-								$qrybsp = "SELECT * from campus.tbl_beispiel where nummer = ".$db->db_add_param($nummer_source_bsp)." and uebung_id = ".$db->db_add_param($ueb_2_target->uebung_id, FHC_INTEGER);
-								$resultbsp = $db->db_query($qrybsp);
-			
-								if ($db->db_num_rows($resultbsp) >0)
-								{
-									$rowbsp = $db->db_fetch_object($resultbsp);		
-									$bsp_target =new beispiel($rowbsp->beispiel_id);
-									$bsp_target->new = false;
-									$new = null;
-									$bsp_target->insertamum = null;
-									$bsp_target->insertvon = null;
-									$bsp_target->updateamum = date('Y-m-d H:i:s');
-									$bsp_target->updatevon = $user;
-									$copy_update_bsp++;
-								}
-								else
-								{
-									$bsp_target =new beispiel();
-									$bsp_target->new = true;
-									$new = true;
-									$bsp_target->insertamum = date('Y-m-d H:i:s');
-									$bsp_target->insertvon = $user;
-									$bsp_target->updateamum = null;
-									$bsp_target->updatevon = null;
-									$copy_insert_bsp++;
-								}
-								$bsp_target->uebung_id = $ueb_2_target->uebung_id;
-								$bsp_target->nummer = $nummer_source_bsp;
-								$bsp_target->bezeichnung = $bsp->bezeichnung;
-								$bsp_target->punkte = $bsp->punkte;
-								
-								if (!$bsp_target->save($new))
-								{
-									$error = 1;
-									echo "<span class='error'>".$p->t('benotungstool/beispieleKonntenNichtAngelegtWerden')."</span>";							
-								}
-								
-								//Notenschlüssel synchronisieren
-								$clear = "delete from campus.tbl_notenschluesseluebung where uebung_id = ".$db->db_add_param($ueb_1_target->uebung_id, FHC_INTEGER);
-								$db->db_query($clear);
-								
-								$qry_ns_source = "SELECT * from campus.tbl_notenschluesseluebung where uebung_id = ".$db->db_add_param($uebung_id_source, FHC_INTEGER);
-								$result_ns_source = $db->db_query($qry_ns_source);
-								while($row_ns = $db->db_fetch_object($result_ns_source))
-								{
-									$ns_insert = "INSERT INTO campus.tbl_notenschluesseluebung values (".$db->db_add_param($ueb_1_target->uebung_id).",".$db->db_add_param($row_ns->note).", ".$db->db_add_param($row_ns->punkte).")";
-									$db->db_query($ns_insert);					
-								}					
-											
-							}									
-						}
-							
-					}
-				}
-			}
-			
-		}
-		else
-			echo "<span class='error'>".$p->t('global/fehlerBeimOeffnenDerDatenbankverbindung')."!</span>";
-			
-		if ($error == 0)
-			echo $p->t('benotungstool/uebungErfolgreichKopiert')."! (Ü: ".$copy_insert."/".$copy_update."; B: ".$copy_insert_bsp."/".$copy_update_bsp.")";
-	}
-}
-
-
-
-echo "<h3>".$p->t('benotungstool/uebungenAnlegenUndVerwalten')."</h3>";
-echo "</tr></table>";
-
-//Anlegen einer neuen Uebung
-if(isset($_POST['uebung_neu']))
-{
-	if(isset($thema))
-	{
-		//pruefen ob alle Daten eingegeben wurden
-		$error=false;
-		$error_msg = '';
-		if($thema=='')
-		{
-			//$error_thema .= "<span class='error'>Thema muss eingegeben werden</span>";
-			echo "<span class='error'>".$p->t('benotungstool/themaMussEingegebenWerden')."</span>";
-			$error=true;
-		}
-		if(!is_numeric($gewicht))
-		{
-			echo "<span class='error'>".$p->t('benotungstool/gewichtMussEineZahlSein')."</span>";
-			$error = true;
-		}
-
-		if(!$error)
-		{
-			//Uebung anlegen
-			$datum_obj = new datum();
-			$uebung_obj = new uebung();
-			$uebung_obj->gewicht=$gewicht;
-			$uebung_obj->punkte='';
-			$uebung_obj->angabedatei='';
-			$uebung_obj->freigabevon = null;
-			$uebung_obj->freigabebis = null;
-			$uebung_obj->abgabe=false;
-			$uebung_obj->beispiele=false;
-			$uebung_obj->bezeichnung=$thema;
-			$uebung_obj->positiv=isset($_POST['positiv']);
-			$uebung_obj->defaultbemerkung='';
-			$uebung_obj->lehreinheit_id=$lehreinheit_id;
-			$uebung_obj->updateamum = date('Y-m-d H:i:s');
-			$uebung_obj->updatevon = $user;
-			$uebung_obj->insertamum = date('Y-m-d H:i:s');
-			$uebung_obj->insertvon = $user;
-			$uebung_obj->statistik = false;
-			$uebung_obj->liste_id = null;
-			$uebung_obj->get_next_nummer();
-			$uebung_obj->nummer = $uebung_obj->next_nummer;			
-			
-			if($uebung_obj->save(true))
-			{
-				if($error_msg!='')
-					echo "<span class='error'>$error_msg</span>";
-				//else
-				//	header("Location: verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$uebung_obj->uebung_id");
-			}
-			else
-				echo "<span class='error'>$uebung_obj->errormsg</span>";
-		}
-
-	}
-	else
-		echo "<span class='error'>".$p->t('benotungstool/uebungKonnteNichtAngelegtWerden')."!</span><br>";
-}
-
-
-//Loeschen einer Uebung
-if(isset($_POST['delete_uebung']))
-{
-	if(isset($_POST['uebung']))
-	{
-		$ueb_obj = new uebung();
-		$error_msg='';
-		//Ausgewaehlte Beispiele holen
-		$delete_ids = $_POST['uebung'];
-		foreach($delete_ids as $id)
-		{
-			//Beispiel loeschen
-			if(!$ueb_obj->delete($id))
-				$error_msg=$ueb_obj->errormsg;
-		}
-		if($error_msg!='')
-			echo "<span class='error'>$error_msg</span>";
-	}
-}
-
-//Editieren einer Uebung
-if(isset($_POST['uebung_edit']))
-{
-	$error = false;
-	if($thema=='')
-	{
-		echo "<span class='error'>".$p->t('benotungstool/themaMussEingegebenWerden')."'</span>";
-		$error = true;
-	}
-
-
-	if(!$error)
-	{
-		$uebung_obj = new uebung($uebung_id);
-		$uebung_obj->gewicht='';
-		$uebung_obj->punkte='';
-		$uebung_obj->angabedatei='';
-		$uebung_obj->freigabevon = null;
-		$uebung_obj->freigabebis = null;
-		$uebung_obj->abgabe=false;
-		$uebung_obj->beispiele=false;
-		$uebung_obj->bezeichnung=$thema;
-		$uebung_obj->positiv=true;
-		$uebung_obj->defaultbemerkung='';
-		$uebung_obj->lehreinheit_id=$lehreinheit_id;
-		$uebung_obj->updateamum = date('Y-m-d H:i:s');
-		$uebung_obj->updatevon = $user;
-		$uebung_obj->uebung_id = $uebung_id;
-		$uebung_obj->statistik = false;
-
-		if($uebung_obj->save(false))
-			header("Location: verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id");
-			//echo "Die &Auml;nderung wurde gespeichert!";
-		else
-			echo "<span class='error'>$uebung_obj->errormsg</span>";
-	}
-
-}
-
-
-//Eine Uebung in eine andere Lehreinheit kopieren
-if(isset($_GET['kopieren']) && $_GET['kopieren']=='true')
-{
-	//echo "Kopiere Uebung ".$_GET['uebung_copy_id']." to ".$_POST['lehreinheit_copy_id'];
-	//Laden der zu kopierenden Uebung
-	if(is_numeric($_GET['uebung_copy_id']) && is_numeric($_POST['lehreinheit_copy_id']))
-	{
-		//Source Uebung Laden
-		$qry = "SELECT * FROM campus.tbl_uebung WHERE uebung_id=".$db->db_add_param($_GET['uebung_copy_id'], FHC_INTEGER);
-		if($result_source = $db->db_query($qry))
-		{
-			if($row_source = $db->db_fetch_object($result_source))
-			{
-				//Berechtigung Checken
-				$qry = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter WHERE lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_copy_id'], FHC_INTEGER)." AND mitarbeiter_uid=".$db->db_add_param($user);
-				if($row_berechtigt = $db->db_query($qry))
-				{
-					if($db->db_num_rows($row_berechtigt)>0 ||
-					   $rechte->isBerechtigt('admin',0) ||
-					   $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz)
-					    || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-					{
-						//Schauen ob bereits eine uebung mit diesem Namen vorhanden ist
-						$qry = "SELECT * FROM campus.tbl_uebung WHERE lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_copy_id'], FHC_INTEGER)." AND bezeichnung=".$db->db_add_param($row_source->bezeichnung);
-						$result_bezeichnung_exists = $db->db_query($qry);
-						if($db->db_num_rows($result_bezeichnung_exists)==0)
-						{
-							//Uebung einfuegen
-							$uebung_dest = new uebung();
-							$uebung_dest->gewicht = $row_source->punkte;
-							$uebung_dest->punkte = $row_source->punkte;
-							$uebung_dest->angabedatei = $row_source->angabedatei;
-							$uebung_dest->freigabevon = $row_source->freigabevon;
-							$uebung_dest->freigabebis = $row_source->freigabebis;
-							$uebung_dest->abgabe = ($row_source->abgabe=='t'?true:false);
-							$uebung_dest->beispiele = ($row_source->beispiele=='t'?true:false);
-							$uebung_dest->bezeichnung = $row_source->bezeichnung;
-							$uebung_dest->positiv = ($row_source->positiv=='t'?true:false);
-							$uebung_dest->statistik = ($row_source->statistik=='t'?true:false);
-							$uebung_dest->defaultbemerkung = $row_source->defaultbemerkung;
-							$uebung_dest->lehreinheit_id = $_POST['lehreinheit_copy_id'];
-							$ubeung_dest->updateamum = date('Y-m-d H:i:s');
-							$uebung_dest->updatevon = $user;
-							$uebung_dest->insertamum = date('Y-m-d H:i:s');
-							$uebung_dest->insertvon = $user;
-
-							if($uebung_dest->save(true))
-							{
-								//Beispiel laden
-								$qry = "SELECT * FROM campus.tbl_beispiel WHERE uebung_id=".$db->db_add_param($_GET['uebung_copy_id'], FHC_INTEGER);
-								if($result_bsp_source = $db->db_query($qry))
-								{
-									$error_bsp_save=false;
-									while($row_bsp_source = $db->db_fetch_object($result_bsp_source))
-									{
-										//Beispiel speichern
-										$beispiel_dest = new beispiel();
-										$beispiel_dest->uebung_id = $uebung_dest->uebung_id;
-										$beispiel_dest->bezeichnung = $row_bsp_source->bezeichnung;
-										$beispiel_dest->punkte = $row_bsp_source->punkte;
-										$beispiel_dest->updateamum = date('Y-m-d H:i:s');
-										$beispiel_dest->updatevon = $user;
-										$beispiel_dest->insertamum = date('Y-m-d H:i:s');
-										$beispiel_dest->insertvon = $user;
-
-										if(!$beispiel_dest->save(true))
-											$error_bsp_save=true;
-									}
-
-									if($error_bsp_save)
-										echo "<span class='error'>".$p->t('benotungstool/fehlerNichtAlleBeispieleKopiert')."</span>";
-									else
-										echo $p->t('benotungstool/datenErfolgreichKopiert');
-								}
-							}
-							else
-							{
-
-								echo "<span class='error'>".$p->t('benotungstool/fehlerKopierenDerDaten').": $uebung_dest->errormsg</span>";
-							}
-						}
-						else
-							echo "<span class='error'>".$p->t('benotungstool/fehlerBeimKopieren')."!</span>";
-					}
-					else
-						echo "<span class='error'>".$p->t('global/keineBerechtigungFuerDieseSeite')."</span>";
-				}
-			}
-			else
-				echo "<span class='error'>".$p->t('benotungstool/uebung')." ".$_GET['uebung_copy_id']." ".$p->t('benotungstool/wurdeNichtGefunden')."</span>";
-		}
-		else
-			echo "<span class='error'>".$p->t('benotungstool/uebung')." ".$_GET['uebung_copy_id']." ".$p->t('benotungstool/wurdeNichtGefunden')."</span>";
-	}
-	else
-		echo "<span class='error'>".$p->t('global/fehlerBeiDerParameteruebergabe')."</span>";
-}
-
-//Uebersichtstabelle
-if(isset($uebung_id) && $uebung_id!='')
-{
-	echo "<table><tr><td valign='top'>";
-	//Bearbeiten der ausgewaehlten Uebung
-	echo "<form action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' method=POST>\n";
-	echo "<table><tr><td colspan='2' width='340' class='ContentHeader3'>".$p->t('benotungstool/ausgewaehlteUebungBearbeiten')."</td><td>&nbsp;</td></tr>\n";
-	echo "<tr><td>&nbsp;</td><td></td></tr>";
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load($uebung_id);
-
-	echo "
-	<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema'  maxlength='32' value='$uebung_obj->bezeichnung'></td><td>$error_thema</td></tr>
-	<!--
-	<tr><td>".$p->t('benotungstool/freigabe')."</td><td align='right'>von <input type='text' size='16' name='freigabevon' value='".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon))."'></td></tr>
-	<tr><td>".$p->t('benotungstool/format')."</td><td align='right'>bis <input type='text' size='16' name='freigabebis' value='".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis))."'></td></tr>
-	<tr><td>".$p->t('benotungstool/statistikFuerStudentenAnzeigen')." <input type='checkbox' name='statistik' ".($uebung_obj->statistik?'checked':'')."></td><td></td></tr>
-	-->
-	<tr><td colspan=2 align='right'><input type='submit' name='uebung_edit' value='".$p->t('global/speichern')."'></td></tr>
-	</table>
-	</form>";
-
-	$beispiel_obj = new beispiel();
-	$beispiel_obj->load_beispiel($uebung_id);
-	$anzahl = count($beispiel_obj->beispiele);
-	echo "</td><td valign='top'>";
-
-	echo "</td></tr><tr><td valign='top'>";
-
-	echo "</td><td valign='top'>";
-}
-else
-{
-	//Gesamtuebersicht ueber alle Uebungen
-	
-	echo "<table><tr><td valign='top'>";
-	echo "<form accept-charset='UTF-8' name='del' action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' method='POST'>";
-	echo "<table width='440'><tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/vorhandeneUebungenBearbeiten')."</td></tr>";
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,$level=1,$uebung_id=null);
-	$anzahl = count($uebung_obj->uebungen);
-	//$copy_content="<table cellpadding=0><tr><td class='ContentHeader3'>&Uuml;bung in andere LE kopieren</td></tr><tr><td></td><td></td><td>&nbsp;</td></tr><tr><th>&nbsp;</th></tr>";
-	$has_copy_content=false;
-	if($anzahl>0)
-	{
-		echo "<tr><td></td><td></td><td>&nbsp;</td><td></td></tr><tr><th>".$p->t('benotungstool/thema')."</th><th>".$p->t('benotungstool/freigeschalten')."</th><th>".$p->t('benotungstool/auswahl')."</th></tr>";
-
-		//Alle Lehreinheiten holen die zu dieser lehrveranstaltung gehoeren
-		//und der angemeldete User berechtigt ist
-		$copy_option_content = array();
-		for($i=0;$i<$db->db_num_rows($result_alle_lehreinheiten);$i++)
-		{
-			$row_alle_lehreinheiten = $db->db_fetch_object($result_alle_lehreinheiten,$i);
-			if($lehreinheit_id!=$row_alle_lehreinheiten->lehreinheit_id)
-			{
-				//zugeteilte Lektoren holen
-				$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter using(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row_alle_lehreinheiten->lehreinheit_id,FHC_INTEGER);
-				if($result_lektoren = $db->db_query($qry_lektoren))
-				{
-					$lektoren = '( ';
-					$j=0;
-					while($row_lektoren = $db->db_fetch_object($result_lektoren))
-					{
-						$lektoren .= $row_lektoren->kurzbz;
-						$j++;
-						if($j<$db->db_num_rows($result_lektoren))
-							$lektoren.=', ';
-						else
-							$lektoren.=' ';
-					}
-					$lektoren .=')';
-				}
-				//zugeteilte Gruppen holen
-				$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row_alle_lehreinheiten->lehreinheit_id, FHC_INTEGER);
-				if($result_gruppen = $db->db_query($qry_gruppen))
-				{
-					$gruppen = '';
-					$j=0;
-					while($row_gruppen = $db->db_fetch_object($result_gruppen))
-					{
-						if($row_gruppen->gruppe_kurzbz=='')
-							$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-						else
-							$gruppen.=$row_gruppen->gruppe_kurzbz;
-						$j++;
-						if($j<$db->db_num_rows($result_gruppen))
-							$gruppen.=', ';
-						else
-							$gruppen.=' ';
-					}
-				}
-				//$copy_option_content.= "<OPTION value='$row_alle_lehreinheiten->lehreinheit_id'>$row_alle_lehreinheiten->lfbez - $gruppen $lektoren</OPTION>\n";
-				$copy_le_content[$row_alle_lehreinheiten->lehreinheit_id] = "$row_alle_lehreinheiten->lfbez-$row_alle_lehreinheiten->lehrform_kurzbz - $gruppen $lektoren";
-			}
-			
-		}
-		$uebung_id_source_dropdown = "<select name='uebung_id_source'><option></option>";
-		//Uebungen durchlaufen
-		foreach ($uebung_obj->uebungen as $row)
-		{
-			$uebung_id_source_dropdown .= "<option value='$row->uebung_id'>$row->bezeichnung</option>";
-			$has_option_content=false;
-			echo "<tr height=23><td align='left'>";
-			echo "<a onClick='return(js_toggle_container(\"submenu_$row->uebung_id\"));' class='MenuItem'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'></a>&nbsp;<a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$row->uebung_id' class='Item'><u>".$row->bezeichnung."</u></a>";
-			echo "</td><td align='center'>";
-
-			//if((strtotime(strftime($row->freigabevon))<=time()) && (strtotime(strftime($row->freigabebis))>=time()))
-			//	echo 'Ja';
-			//else
-			//	echo 'Nein';
-			echo "</td><td align='center'><input type='Checkbox' name='uebung[]' value='$row->uebung_id'></td>";
-			echo "<!--<form name='copy' action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' method='POST'><td><input type='hidden' name='uebung_id_source' value='".$row->uebung_id."'>".$copy_dropdown."<input type='submit' name='copy_uebung' value='>'></td></form>-->";
-			echo "</tr>";
-
-			$subuebung_obj = new uebung();
-			$subuebung_obj->load_uebung($lehreinheit_id,$level=2,$uebung_id=$row->uebung_id);
-			$subanzahl = count($subuebung_obj->uebungen);
-			echo "<tr><td colspan='3'>";
-			echo "<table id='submenu_".$row->uebung_id."' style='display:none;' width='400'>";
-			//echo "<ul style='margin-top: 0px; margin-bottom: 0px;'>";
-			foreach ($subuebung_obj->uebungen as $subrow)
-			{
-				echo "<tr><td width='200'><li style='margin-left:20px;'><a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$subrow->uebung_id&liste_id=$row->uebung_id'>".$subrow->bezeichnung."</a></li></td><td width='150'>";
-				if((strtotime(strftime($subrow->freigabevon))<=time()) && (strtotime(strftime($subrow->freigabebis))>=time()))
-					echo $p->t('global/ja');
-				else
-					echo $p->t('global/nein');
-				echo "</td><td align='center'><input type='Checkbox' name='uebung[]' value='$subrow->uebung_id'></td></tr>";
-			}
-			//echo "</ul>";
-			echo "</table>";
-			echo "</td></tr>";
-		}
-		echo "<tr><td colspan='3' align='right'><input type='Submit' value='".$p->t('benotungstool/auswahlLoeschen')."' name='delete_uebung' onclick='return confirmdelete();'></td><td></td></tr>";
-		echo "</form>";
-		if ($copy_dropdown != '')
-		{		
-			echo "<tr><td colspan='3'>&nbsp;</td></tr>";
-			echo "<tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/vorhandeneUebungenKopieren')."</td></tr>";
-			
-			$uebung_id_source_dropdown .= "</select>";
-			echo "<tr><td colspan='3'>";
-			echo "<form name='copy' action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' method='POST'><table><tr><td>".$p->t('benotungstool/uebung')."</td><td></td><td>".$p->t('global/lehreinheit')."</td><td></td></tr><tr><td>".$uebung_id_source_dropdown."</td><td>-></td><td>".$copy_dropdown."</td><td><input type='submit' name='copy_uebung' value='".$p->t('global/kopieren')."'></td></tr></table></form>";
-			echo "</td></tr>";
-		}
-	}
-	else
-		echo "<tr><td colspan='3'>".$p->t('benotungstool/derzeitSindKeineUebungenAngelegt')."</td><td></td></tr>";
-
-	echo "</table>
-	<br><br>";
-
-
-	//Kopier-Buttons anzeigen
-	//$copy_content.='</table>';
-	//echo "</td><td valign='top'>";
-	//if($has_copy_content)
-	//	echo $copy_content;
-	//echo "</td></tr></table>";
-
-	//Uebung neu anlegen
-	if(!isset($_POST['uebung_neu']))
-	{
-		$thema = $p->t('benotungstool/uebung')." ".($anzahl<9?'0'.($anzahl+1):($anzahl+1));
-		$anzahlderbeispiele = 10;
-		$punkteprobeispiel = 1;
-		$freigabevon = date('d.m.Y H:i');
-		$freigabebis = date('d.m.Y H:i');
-	}
-	
-	echo "</td><td valign='top'>";
-	echo "
-	<form action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' method=POST>
-	<table >
-	<tr><td width='440' colspan=2 class='ContentHeader3'>".$p->t('benotungstool/neueUebungAnlegen')."</td><td></td></tr>
-	<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema' maxlength='32' value='$thema'></td><td><span class='error'>$error_thema</td></tr>
-	<tr><td>".$p->t('benotungstool/gewicht')."</td><td align='right'><input type='text' size='16' name='gewicht' value='1'></td><td>$error_gewicht</td></tr>
-		<tr><td>".$p->t('benotungstool/positiv')." </td><td><input type='checkbox' name='positiv'></td></tr>
-	<!--
-	<tr><td>".$p->t('benotungstool/anzahlDerBeispiele')."</td><td align='right'><input type='text' name='anzahlderbeispiele' maxlength='2' size='2' value='$anzahlderbeispiele'></td><td>$error_anzahlderbeispiele</td></tr>
-	<tr><td>".$p->t('benotungstool/anzahlPunkteProBeispiel')."</td><td align='right'><input type='text' name='punkteprobeispiel' value='$punkteprobeispiel'></td><td>$error_punkteprobeispiel</td></tr>
-	<tr><td>".$p->t('benotungstool/freigabe')."</td><td align='right'>von <input type='text' size='16' name='freigabevon' value='$freigabevon'></td><td>$error_freigabevon</td></tr>
-	<tr><td>".$p->t('benotungstool/format')."</td><td align='right'>bis <input type='text' size='16' name='freigabebis' value='$freigabebis'></td><td>$error_freigabebis</td></tr>
-	<tr><td>".$p->t('benotungstool/statistikFuerStudentenAnzeigen')." <input type='checkbox' name='statistik'></td><td></td></tr>
-	-->
-	<tr><td colspan=2 align='right'><input type='submit' name='uebung_neu' value='".$p->t('benotungstool/anlegen')."'></td></tr>
-	</table>
-	</form>
-	";
-}
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/verwaltung_listen.php b/cis/private/lehre/benotungstool/verwaltung_listen.php
deleted file mode 100644
index 85b1c016e..000000000
--- a/cis/private/lehre/benotungstool/verwaltung_listen.php
+++ /dev/null
@@ -1,1250 +0,0 @@
-<?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 >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
- */
-
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/basis_db.class.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/datum.class.php');
-require_once('functions.inc.php');
-require_once('../../../../include/phrasen.class.php');
-
-$sprache = getSprache();
-$p = new phrasen($sprache);
-
-if (!$db = new basis_db())
-	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-
-function microtime_float()
-{
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
-$time = microtime_float();
-$user = get_uid();
-
-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
-	$lvid = $_GET['lvid'];
-else
-	die($p->t('global/fehlerBeiDerParameteruebergabe'));
-
-if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehreinheit_id
-	$lehreinheit_id = $_GET['lehreinheit_id'];
-else
-	$lehreinheit_id = '';
-
-//Angabedatei ausliefern
-if (isset($_GET["download"])){
-	$file=$_GET["download"];
-	$uebung_id = $_GET["uebung_id"];
-	$ueb = new uebung();
-	$ueb->load($uebung_id);
-	$filename = BENOTUNGSTOOL_PATH."angabe/".$ueb->angabedatei;
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="'.$file.'"');
-	readfile($filename);
-	exit;
-}
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="../../../../skin/style.css.php" rel="stylesheet" type="text/css">
-<title>Kreuzerltool</title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function MM_jumpMenu(targ, selObj, restore)
-	{
-	  eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
-
-	  if(restore)
-	  {
-	  	selObj.selectedIndex = 0;
-	  }
-	}
-	function confirmdelete()
-	{
-		return confirm('<?php echo $p->t('gesamtnote/wollenSieWirklichLoeschen');?>');
-	}
-
-	function set_notenschluessel_prozent()
-	{
-		document.ns.schluessel_punkte_1.value=89;
-		document.ns.schluessel_punkte_2.value=76;
-		document.ns.schluessel_punkte_3.value=63;
-		document.ns.schluessel_punkte_4.value=50;
-		document.ns.schluessel_punkte_5.value=0;
-	}
-  //-->
-</script>
-</head>
-
-<body>
-<?php
-
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
-
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-	$stsem = '';
-
-//Vars
-$datum_obj = new datum();
-$global_msg ='';
-$error_thema='';
-$error_anzahlderbeispiele='';
-$error_punkteprobeispiel='';
-$error_freigabebis='';
-$error_freigabevon='';
-$error_maxstd = '';
-$error_maxbsp = '';
-$error_gewicht = '';
-
-$thema = (isset($_POST['thema'])?$_POST['thema']:'');
-$liste_id = (isset($_REQUEST['liste_id'])?$_REQUEST['liste_id']:'');
-$anzahlderbeispiele = (isset($_POST['anzahlderbeispiele'])?$_POST['anzahlderbeispiele']:'');
-$punkteprobeispiel = (isset($_POST['punkteprobeispiel'])?$_POST['punkteprobeispiel']:'');
-$punkteprobeispiel = mb_ereg_replace(',','.',$punkteprobeispiel);
-$freigabebis = (isset($_POST['freigabebis'])?$_POST['freigabebis']:'');
-$freigabevon = (isset($_POST['freigabevon'])?$_POST['freigabevon']:'');
-$maxstd = (isset($_POST['maxstd'])?$_POST['maxstd']:'');
-$maxbsp = (isset($_POST['maxbsp'])?$_POST['maxbsp']:'');
-$gewicht = (isset($_POST['gewicht'])?$_POST['gewicht']:'');
-if (isset($_FILES["angabedatei"]))
-	$angabedatei_up = $_FILES["angabedatei"]["tmp_name"];
-else
-	$angabedatei_up = null;
-
-$beispiel_id = (isset($_GET['beispiel_id'])?$_GET['beispiel_id']:'');
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-
-//Angabedatei löschen
-if (isset($_GET["deletefile"])){
-	$file=$_GET["deletefile"];
-	$ueb = new uebung();
-	$ueb->load($uebung_id);
-	$filename = BENOTUNGSTOOL_PATH."angabe/".$ueb->angabedatei;
-	$ueb->angabedatei = '';
-	$ueb->save(false);
-	unlink($filename);
-}
-
-//notenschlüssel anlegen
-if (isset($_POST["schluessel"]) && $_POST["schluessel"]=='Speichern')
-{
-	$punkte_arr = array();
-	$punkte_arr[1] = $_POST["schluessel_punkte_1"];
-	$punkte_arr[2] = $_POST["schluessel_punkte_2"];
-	$punkte_arr[3] = $_POST["schluessel_punkte_3"];
-	$punkte_arr[4] = $_POST["schluessel_punkte_4"];
-	$punkte_arr[5] = $_POST["schluessel_punkte_5"];
-	for ($i=1;$i<=5;$i++)
-	{
-		if (is_numeric($punkte_arr[$i]))
-		{
-			$qry = "select * from campus.tbl_notenschluesseluebung where uebung_id = ".$db->db_add_param($liste_id, FHC_INTEGER)." and note = ".$db->db_add_param($i);
-			$result = $db->db_query($qry);
-			if($db->db_num_rows($result)>0)
-				$str = "update campus.tbl_notenschluesseluebung set punkte = ".$db->db_add_param($punkte_arr[$i])." where uebung_id = ".$db->db_add_param($liste_id, FHC_INTEGER)." and note = ".$db->db_add_param($i);
-			else
-				$str = "insert into campus.tbl_notenschluesseluebung (uebung_id, note, punkte) values (".$db->db_add_param($liste_id).",".$db->db_add_param($i).",".$db->db_add_param($punkte_arr[$i]).")";
-			if (!$db->db_query($str))
-				echo "<span class='error'>Daten konnten nicht gespeichert werden</span>";
-		}
-	}
-}
-//Kopfzeile
-echo '<table class="tabcontent">';
-echo ' <tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo '<td><h1>'.$p->t('benotungstool/benotungstool');
-echo '</h1></td><td align="right">'."\n";
-
-//Studiensemester laden
-$stsem_obj = new studiensemester();
-if($stsem=='')
-	$stsem = $stsem_obj->getaktorNext();
-
-$stsem_obj->getAll();
-
-
-//Studiensemester DropDown
-$stsem_content = $p->t('global/studiensemester').": <SELECT name='stsem' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-
-foreach($stsem_obj->studiensemester as $studiensemester)
-{
-	$selected = ($stsem == $studiensemester->studiensemester_kurzbz?'selected':'');
-	$stsem_content.= "<OPTION value='verwaltung.php?lvid=$lvid&stsem=$studiensemester->studiensemester_kurzbz' $selected>$studiensemester->studiensemester_kurzbz</OPTION>\n";
-}
-$stsem_content.= "</SELECT>\n";
-
-//Lehreinheiten laden
-if($rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
-{
-	$qry = "SELECT
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz
-			FROM
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-else
-{
-	$qry = "SELECT
-				distinct lehrfach.kurzbz as lfbez, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz
-			FROM
-				lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung as lehrfach, lehre.tbl_lehreinheitmitarbeiter
-			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-				tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id AND
-				tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id IN (SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE mitarbeiter_uid=".$db->db_add_param($user).") AND
-				tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($stsem);
-}
-
-if($result = $db->db_query($qry))
-{
-	$result_alle_lehreinheiten = $result;
-	if($db->db_num_rows($result)>1)
-	{
-		//Lehreinheiten DropDown
-		echo " ".$p->t('global/lehreinheit').": <SELECT name='lehreinheit_id' onChange=\"MM_jumpMenu('self',this,0)\">\n";
-		while($row = $db->db_fetch_object($result))
-		{
-			if($lehreinheit_id=='')
-				$lehreinheit_id=$row->lehreinheit_id;
-			$selected = ($row->lehreinheit_id == $lehreinheit_id?'selected':'');
-			//Zugeteilte Lektoren
-			$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter using(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_lektoren = $db->db_query($qry_lektoren))
-			{
-				$lektoren = '( ';
-				$i=0;
-				while($row_lektoren = $db->db_fetch_object($result_lektoren))
-				{
-					$lektoren .= $row_lektoren->kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_lektoren))
-						$lektoren.=', ';
-					else
-						$lektoren.=' ';
-				}
-				$lektoren .=')';
-			}
-
-
-			//Zugeteilte Gruppen
-			$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
-			if($result_gruppen = $db->db_query($qry_gruppen))
-			{
-				$gruppen = '';
-				$i=0;
-				while($row_gruppen = $db->db_fetch_object($result_gruppen))
-				{
-					if($row_gruppen->gruppe_kurzbz=='')
-						$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-					else
-						$gruppen.=$row_gruppen->gruppe_kurzbz;
-					$i++;
-					if($i<$db->db_num_rows($result_gruppen))
-						$gruppen.=', ';
-					else
-						$gruppen.=' ';
-				}
-			}
-			echo "<OPTION value='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$row->lehreinheit_id' $selected>$row->lfbez-$row->lehrform_kurzbz - $gruppen $lektoren</OPTION>\n";
-		}
-		echo '</SELECT> ';
-	}
-	else
-	{
-		if($row = $db->db_fetch_object($result))
-			$lehreinheit_id = $row->lehreinheit_id;
-	}
-}
-else
-{
-	echo $p->t('benotungstool/fehlerBeimAuslesen');
-}
-echo $stsem_content;
-echo '</td><tr></table>';
-echo '<table width="100%"><tr>';
-echo '<td class="tdwidth10">&nbsp;</td>';
-echo "<td>\n";
-echo "<h2>".$lv_obj->bezeichnung_arr[$sprache]."</h2>";
-
-if($lehreinheit_id=='')
-	die($p->t('benotungstool/esGibtKeineLehreinheiten'));
-
-//Menue
-include("menue.inc.php");
-/*
-echo "\n<!--Menue-->\n";
-echo "<br>
-<a href='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Verwaltung</font>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='anwesenheitstabelle.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Anwesenheits- und Übersichtstabelle</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='studentenpunkteverwalten.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Studentenpunkte verwalten</font></a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href='statistik.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id' class='Item'><font size='3'><img src='../../../../skin/images/menu_item.gif' width='7' height='9'>&nbsp;Statistik</font></a>
-<br><br>
-<!--Menue Ende-->\n";
-*/
-
-//echo "studiensemester: $stsem<br>";
-//echo "lehrveranstaltung: $lvid<br>";
-//echo "lehreinheit: $lehreinheit_id<br>";
-
-echo "<h3>".$p->t('benotungstool/uebungVerwalten')."</h3>";
-
-//Anlegen einer neuen Uebung
-if(isset($_POST['uebung_neu']) || isset($_POST['abgabe_neu']))
-{
-	if(isset($thema))
-	{
-		//pruefen ob alle Daten eingegeben wurden
-		$error=false;
-		if($thema=='')
-		{
-			$error_thema.= "<span class='error'>".$p->t('benotungstool/themaMussEingegebenWerden')."</span>";
-			$error=true;
-		}
-		if(!is_numeric($gewicht))
-		{
-			echo "<span class='error'>".$p->t('benotungstool/gewichtMussEineZahlSein')."</span>";
-			$error = true;
-		}
-		if (isset($_POST['uebung_neu']))
-		{
-			if(!is_numeric($punkteprobeispiel))
-			{
-				$error_punkteprobeispiel= "<span class='error'>".$p->t('benotungstool/punkteProBeispielGueltigeZahl')."</span>";
-				$error=true;
-			}
-			elseif($punkteprobeispiel<0)
-			{
-				$error_punkteprobeispiel = "<span class='error'>".$p->t('benotungstool/punkteProBeispielNichtNegativ')."</span>";
-				$error=true;
-			}
-			if(!is_numeric($anzahlderbeispiele))
-			{
-				$error_anzahlderbeispiele = "<span class='error'>".$p->t('benotungstool/anzahlDerBeispieleGueltigeZahl')."</span>";
-				$error=true;
-			}
-			elseif($anzahlderbeispiele<0)
-			{
-				$error_anzahlderbeispiele = "<span class='error'>".$p->t('benotungstool/anzahlDerBeispieleNichtNegativ')."</span>";
-				$error=true;
-			}
-			elseif($anzahlderbeispiele>99)
-			{
-				$error_anzahlderbeispiele = "<span class='error'>".$p->t('benotungstool/anzahlDerBeispieleKleiner100')."</span>";
-				$error=true;
-			}
-
-			if ($maxstd != '')
-			{
-				if(!is_numeric($maxstd))
-				{
-					$error_maxstd = "<span class='error'>".$p->t('benotungstool/anzahlStudentenGueltigeZahl')."</span>";
-					$error=true;
-				}
-				elseif($maxstd<0)
-				{
-					$error_maxstd = "<span class='error'>".$p->t('benotungstool/anzahlStudentenNichtNegativ')."</span>";
-					$error=true;
-				}
-				elseif($maxstd>99)
-				{
-					$error_maxd = "<span class='error'>".$p->t('benotungstool/anzahlStudentenKleiner100')."</span>";
-					$error=true;
-				}
-			}
-			else
-				$maxstd = null;
-
-			if ($maxbsp != '')
-			{
-				if(!is_numeric($maxbsp))
-				{
-					$error_maxbsp = "<span class='error'>".$p->t('benotungstool/anzahlStudentenGueltigeZahl')."</span>";
-					$error=true;
-				}
-				elseif($maxbsp<0)
-				{
-					$error_maxbsp = "<span class='error'>".$p->t('benotungstool/anzahlStudentenNichtNegativ')."</span>";
-					$error=true;
-				}
-				elseif($maxbsp>99)
-				{
-					$error_maxbsp = "<span class='error'>".$p->t('benotungstool/anzahlStudentenKleiner100')."</span>";
-					$error=true;
-				}
-			}
-			else
-				$maxbsp = null;
-		}
-
-		$freigabevon_sav = $datum_obj->mktime_datumundzeit($freigabevon);
-		$freigabebis_sav = $datum_obj->mktime_datumundzeit($freigabebis);
-
-		if(!$freigabebis_sav)
-		{
-			$error_freigabebis = "<span class='error'>".$p->t('benotungstool/bisDatumUngueltigesFormat')."</span>";
-			$error=true;
-		}
-
-		if(!$freigabevon_sav)
-		{
-			$error_freigabevon = "<span class='error'>".$p->t('benotungstool/vonDatumUngueltigesFormat')."</span>";
-			$error=true;
-		}
-
-		if($freigabevon_sav && $freigabebis_sav && $freigabevon_sav>$freigabebis_sav)
-		{
-					$error_freigabevon = "<span class='error'>".$p->t('benotungstool/vonDatumNichtGroesserAlsBisDatum')."</span>";
-					$error=true;
-		}
-
-		if(!$error)
-		{
-
-			//Uebung anlegen (KL oder Abgabe)
-			$datum_obj = new datum();
-			$uebung_obj = new uebung();
-			//$uebung_obj->gewicht='';
-			$uebung_obj->punkte='';
-			$uebung_obj->angabedatei='';
-			$uebung_obj->freigabevon = date('Y-m-d H:i',$freigabevon_sav);
-			$uebung_obj->freigabebis = date('Y-m-d H:i',$freigabebis_sav);
-			if (isset($_POST["uebung_neu"]))
-			{
-				if (isset($_POST["kl_abgabe"]))
-					$uebung_obj->abgabe=true;
-				else
-					$uebung_obj->abgabe=false;
-				$uebung_obj->beispiele=true;
-			}
-			else
-			{
-				$uebung_obj->abgabe=true;
-				$uebung_obj->beispiele=false;
-			}
-			$uebung_obj->bezeichnung=$thema;
-			$uebung_obj->positiv=isset($_POST['positiv']);
-			$uebung_obj->defaultbemerkung='';
-			$uebung_obj->lehreinheit_id=$lehreinheit_id;
-			$uebung_obj->updateamum = date('Y-m-d H:i:s');
-			$uebung_obj->updatevon = $user;
-			$uebung_obj->insertamum = date('Y-m-d H:i:s');
-			$uebung_obj->insertvon = $user;
-			$uebung_obj->statistik = isset($_POST['statistik']);
-			$uebung_obj->liste_id = $liste_id;
-			$uebung_obj->maxstd = $maxstd;
-			$uebung_obj->maxbsp = $maxbsp;
-			$uebung_obj->gewicht = $gewicht;
-			$uebung_obj->get_next_nummer();
-			$uebung_obj->nummer = $uebung_obj->next_nummer;
-
-			if($uebung_obj->save(true))
-			{
-				$uebung_id = $uebung_obj->uebung_id;
-
-				//Angabedatei ablegen
-				if ($angabedatei_up)
-				{
-					$name_up = pathinfo($_FILES["angabedatei"]["name"]);
-					//Handle double file extensions (e.g.: .tar.gz)
-					//Array of possible double extensions
-					$ext_array = array('.tar.gz','.tar.bz2','.tar.xz','.tar.lzma','.tar.Z');
-					//Find occurence of extensions ending with ".tar."
-					if (in_array(substr($_FILES["angabedatei"]["name"], strripos($_FILES["angabedatei"]["name"], '.tar.')), $ext_array))
-						$extension = substr($_FILES["angabedatei"]["name"], strripos($_FILES["angabedatei"]["name"]+1, '.tar.'));
-					else
-						$extension = $name_up["extension"];
-
-					$name_neu = makeUploadName($db, $which='angabe', $lehreinheit_id=$lehreinheit_id, $uebung_id=$uebung_id, $ss=$stsem);
-					$angabedatei = $name_neu.".".$extension;
-
-					$angabepfad = BENOTUNGSTOOL_PATH."angabe/".$angabedatei;
-					//$angabepfad = BENOTUNGSTOOL_PATH.$angabedatei;
-					//unlink($angabepfad);
-					//echo $angabepfad;
-					move_uploaded_file($_FILES['angabedatei']['tmp_name'], $angabepfad);
-					$uebung_obj->angabedatei = $angabedatei;
-					$uebung_obj->save(false);
-				}
-				//Beispiele anlegen
-
-				$error_msg='';
-				for($i=0;$i<$anzahlderbeispiele;$i++)
-				{
-					$beispiel_obj = new beispiel();
-					$beispiel_obj->uebung_id = $uebung_id;
-					$beispiel_obj->bezeichnung = "Beispiel ".($i<9?'0'.($i+1):($i+1));
-					$beispiel_obj->punkte = $punkteprobeispiel;
-					$beispiel_obj->updateamum = date('Y-m-d H:i:s');
-					$beispiel_obj->updatevon = $user;
-					$beispiel_obj->insertamum = date('Y-m-d H:i:s');
-					$beispiel_obj->insertvon = $user;
-					$beispiel_obj->get_next_nummer();
-					$beispiel_obj->nummer = $beispiel_obj->next_nummer;
-
-					if(!$beispiel_obj->save(true))
-						$error_msg = $beispiel_obj->errormsg;
-				}
-				if($error_msg!='')
-					echo "<span class='error'>$error_msg</span>";
-			}
-			else
-				echo "<span class='error'>$uebung_obj->errormsg</span>";
-		}
-
-	}
-	else
-		echo "<span class='error'>".$p->t('benotungstool/kreuzerllisteNichtAngelegt')."!</span><br>";
-}
-
-//Loeschen eines Beispiels
-if(isset($_POST['beispiel_delete']))
-{
-	if(isset($_POST['beispiel']))
-	{
-		$beispiel_obj = new beispiel();
-		$error_msg='';
-		//Ausgewaehlte Beispiele holen
-		$delete_ids = $_POST['beispiel'];
-		foreach($delete_ids as $id)
-		{
-			//Beispiel loeschen
-			if(!$beispiel_obj->delete($id))
-				$error_msg=$beispiel_obj->errormsg;
-		}
-		if($error_msg!='')
-			echo "<span class='error'>$error_msg</span>";
-	}
-}
-
-//Loeschen einer Uebung
-if(isset($_POST['delete_uebung']))
-{
-	if(isset($_POST['uebung']))
-	{
-		$ueb_obj = new uebung();
-		$error_msg='';
-		//Ausgewaehlte Beispiele holen
-		$delete_ids = $_POST['uebung'];
-		foreach($delete_ids as $id)
-		{
-			//Beispiel loeschen
-			if(!$ueb_obj->delete($id))
-				$error_msg=$ueb_obj->errormsg;
-		}
-		if($error_msg!='')
-			echo "<span class='error'>$error_msg</span>";
-	}
-}
-
-//Editieren einer Uebung
-if(isset($_POST['uebung_edit']))
-{
-	$error = false;
-	if($thema=='')
-	{
-		echo "<span class='error'>".$p->t('benotungstool/themaMussEingegebenWerden')."</span>";
-		$error = true;
-	}
-	if(!is_numeric($gewicht))
-	{
-		echo "<span class='error'>".$p->t('benotungstool/gewichtMussEineZahlSein')."</span>";
-		$error = true;
-	}
-	$freigabevon_sav = $datum_obj->mktime_datumundzeit($freigabevon);
-	$freigabebis_sav = $datum_obj->mktime_datumundzeit($freigabebis);
-
-	if ($maxstd != '')
-		{
-			if(!is_numeric($maxstd))
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenGueltigeZahl')."</span>";
-				$error=true;
-			}
-			elseif($maxstd<0)
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenNichtNegativ')."</span>";
-				$error=true;
-			}
-			elseif($maxstd>99)
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenKleiner100')."</span>";
-				$error=true;
-			}
-		}
-		else
-			$maxstd = null;
-
-		if ($maxbsp != '')
-		{
-			if(!is_numeric($maxbsp))
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenGueltigeZahl')."</span>";
-				$error=true;
-			}
-			elseif($maxbsp<0)
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenNichtNegativ')."</span>";
-				$error=true;
-			}
-			elseif($maxbsp>99)
-			{
-				echo "<span class='error'>".$p->t('benotungstool/anzahlStudentenKleiner100')."</span>";
-				$error=true;
-			}
-		}
-		else
-			$maxbsp = null;
-
-	if($freigabevon_sav>$freigabebis_sav)
-	{
-		echo "<span class='error'>".$p->t('benotungstool/vonDatumNichtGroesserAlsBisDatum')."</span>";
-		$error=true;
-	}
-	if(!$freigabebis_sav)
-	{
-		echo "<span class='error'>".$p->t('benotungstool/bisDatumUngueltigesFormat')."</span>";
-		$error=true;
-	}
-
-	if(!$freigabevon_sav)
-	{
-		echo "<span class='error'>".$p->t('benotungstool/vonDatumUngueltigesFormat')."</span>";
-		$error=true;
-	}
-
-	if(!$error)
-	{
-		//Angabedatei ablegen
-		if ($angabedatei_up)
-		{
-			$name_up = pathinfo($_FILES["angabedatei"]["name"]);
-			//Handle double file extensions (e.g.: .tar.gz)
-			//Array of possible double extensions
-			$ext_array = array('.tar.gz','.tar.bz2','.tar.xz','.tar.lzma','.tar.Z');
-			//Find occurence of extensions ending with ".tar."
-			if (in_array(substr($_FILES["angabedatei"]["name"], strripos($_FILES["angabedatei"]["name"], '.tar.')), $ext_array))
-				$extension = substr($_FILES["angabedatei"]["name"], strripos($_FILES["angabedatei"]["name"]+1, '.tar.'));
-			else
-				$extension = $name_up["extension"];
-			$name_neu = makeUploadName($db, $which='angabe', $lehreinheit_id=$lehreinheit_id, $uebung_id=$uebung_id, $ss=$stsem);
-			$angabedatei_neu = $name_neu.".".$extension;
-
-			$angabepfad = BENOTUNGSTOOL_PATH."angabe/".$angabedatei_neu;
-			//$angabepfad = BENOTUNGSTOOL_PATH.$angabedatei;
-			//unlink($angabepfad);
-			//echo $angabepfad;
-			foreach (glob(BENOTUNGSTOOL_PATH."angabe/*".$uebung_id.".*") as $old)
-				unlink($old);
-			move_uploaded_file($_FILES['angabedatei']['tmp_name'], $angabepfad);
-		}
-		else
-		{
-			$uebung_akt = new uebung();
-			$uebung_akt->load($uebung_id);
-			$angabedatei_neu = $uebung_akt->angabedatei;
-		}
-		$uebung_obj = new uebung();
-		$uebung_obj->load($uebung_id);
-		$uebung_obj->gewicht=$gewicht;
-		$uebung_obj->punkte='';
-		$uebung_obj->angabedatei=$angabedatei_neu;
-		$uebung_obj->freigabevon = date('Y-m-d H:i',$freigabevon_sav);
-		$uebung_obj->freigabebis = date('Y-m-d H:i',$freigabebis_sav);
-		if ($uebung_obj->beispiele)
-			$uebung_obj->abgabe = (isset($_POST['kl_abgabe'])?true:false);
-		//$uebung_obj->beispiele=true;
-		$uebung_obj->bezeichnung=$thema;
-		$uebung_obj->positiv=(isset($_POST['positiv'])?true:false);
-		$uebung_obj->defaultbemerkung='';
-		$uebung_obj->lehreinheit_id=$lehreinheit_id;
-		$uebung_obj->updateamum = date('Y-m-d H:i:s');
-		$uebung_obj->updatevon = $user;
-		$uebung_obj->uebung_id = $uebung_id;
-		$uebung_obj->statistik = (isset($_POST['statistik'])?true:false);
-		$uebung_obj->liste_id = $_POST["liste_id"];
-		$uebung_obj->maxstd = $maxstd;
-		$uebung_obj->maxbsp = $maxbsp;
-
-		if($uebung_obj->save(false))
-			echo "Die &Auml;nderung wurde gespeichert!";
-		else
-			echo "<span class='error'>$uebung_obj->errormsg</span>";
-	}
-
-}
-
-// Notenschluessel toggle
-
-if (isset($_GET['liste_id']) && isset($_GET['notenschluessel']))
-{
-	$ueb_ns = new uebung();
-	$ueb_ns->toggle_prozent_punkte($_GET['liste_id']);
-	echo $ueb_ns->errormsg;
-}
-
-
-//Editieren einer Liste
-if(isset($_POST['liste_edit']))
-{
-	$error = false;
-	if($thema=='')
-	{
-		echo "<span class='error'>".$p->t('benotungstool/themaMussEingegebenWerden')."</span>";
-		$error = true;
-	}
-	if(!is_numeric($gewicht))
-	{
-		echo "<span class='error'>".$p->t('benotungstool/gewichtMussEineZahlSein')."</span>";
-		$error = true;
-	}
-
-
-	if(!$error)
-	{
-
-		$uebung_obj = new uebung();
-		$uebung_obj->load($_GET['liste_id']);
-		$uebung_obj->gewicht=$gewicht;
-		$uebung_obj->punkte='';
-		$uebung_obj->angabedatei='';
-		$uebung_obj->freigabevon = null;
-		$uebung_obj->freigabebis = null;
-		//$uebung_obj->abgabe=false;
-		//$uebung_obj->beispiele=true;
-		$uebung_obj->bezeichnung=$thema;
-		$uebung_obj->positiv=(isset($_POST['positiv'])?true:false);
-		$uebung_obj->defaultbemerkung='';
-		$uebung_obj->lehreinheit_id=$lehreinheit_id;
-		$uebung_obj->updateamum = date('Y-m-d H:i:s');
-		$uebung_obj->updatevon = $user;
-		$uebung_obj->uebung_id = $_REQUEST["liste_id"];
-		//$uebung_obj->statistik = (isset($_POST['statistik'])?true:false);
-		$uebung_obj->liste_id = '';
-		//$uebung_obj->maxstd = $maxstd;
-		//$uebung_obj->maxbsp = $maxbsp;
-
-		if($uebung_obj->save(false))
-			echo $p->t('global/erfolgreichgespeichert')."!";
-		else
-			echo "<span class='error'>$uebung_obj->errormsg</span>";
-	}
-
-}
-
-//Neues Beispiel anlegen
-if(isset($_POST['beispiel_neu']) || isset($_POST['beispiel_edit']))
-{
-	if(isset($_POST['beispiel_edit']) && (!isset($beispiel_id) || !is_numeric($beispiel_id)))
-	{
-		echo "<span class='error'>".$p->t('benotungstool/beispielIdUngueltig')."</span>";
-	}
-	else
-	{
-		if(isset($uebung_id) && $uebung_id!='' && is_numeric($uebung_id))
-		{
-			$punkte = (isset($_POST['punkte'])?$_POST['punkte']:'');
-			$punkte = mb_ereg_replace(',','.',$punkte);
-			$bezeichnung = $_REQUEST["bezeichnung"];
-			if(is_numeric($punkte) && $punkte!='')
-			{
-				if($bezeichnung!='')
-				{
-					$beispiel_obj = new beispiel();
-					if(isset($_POST['beispiel_edit']))
-					{
-						$beispiel_obj->load($beispiel_id);
-						$beispiel_obj->beispiel_id= $beispiel_id;
-						$beispiel_obj->new=false;
-					}
-					else
-					{
-						$beispiel_obj->new=true;
-						$beispiel_obj->insertamum = date('Y-m-d H:i:s');
-						$beispiel_obj->insertvon = $user;
-						$beispiel_obj->get_next_nummer();
-						$beispiel_obj->nummer = $beispiel_obj->next_nummer;
-					}
-
-					$beispiel_obj->uebung_id = $uebung_id;
-					$beispiel_obj->bezeichnung = $bezeichnung;
-					$beispiel_obj->punkte = $punkte;
-					$beispiel_obj->updateamum = date('Y-m-d H:i:s');
-					$beispiel_obj->updatevon = $user;
-					if($beispiel_obj->save())
-					{
-						$beispiel_id='';
-					}
-					else
-						echo "<span class='error'>$beispiel_obj->errormsg</span>";
-				}
-				else
-					echo "<span class='error'>".$p->t('benotungstool/bezeichnungMussEingegebenWerden')."</span>";
-			}
-			else
-				echo "<span class='error'>".$p->t('benotungstool/punkteMuessenEineGueltigeZahlSein')."</span>";
-		}
-		else
-			echo "<span class='error'>".$p->t('benotungstool/zugehoerigeUebungFehlerhaft')."</span>";
-	}
-}
-
-
-
-//Uebersichtstabelle
-if(isset($_GET["uebung_id"]) && $_GET["uebung_id"]!='')
-{
-
-	echo "<table><tr><td valign='top'>";
-	//Bearbeiten der ausgewaehlten Uebung
-	echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&liste_id=$liste_id' method=POST enctype='multipart/form-data'>\n";
-	echo "<table><tr><td colspan='2' width='340' class='ContentHeader3'>".$p->t('benotungstool/ausgewaehlteAufgabeBearbeiten')."</td><td>&nbsp;</td></tr>\n";
-	echo "<tr><td>&nbsp;</td><td></td></tr>";
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load($uebung_id);
-	//$downloadname = mb_ereg_replace($uebung_id,ereg_replace(' ','_',$uebung_obj->bezeichnung), $uebung_obj->angabedatei);
-	$downloadname = mb_str_replace(' ', '_', $uebung_obj->bezeichnung);
-	$downloadname = mb_str_replace($uebung_id, $downloadname, $uebung_obj->angabedatei);
-	$downloadname = preg_replace('/[^A-Za-z0-9\-_.]/', '',$downloadname);
-	echo "
-	<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema'  maxlength='32' value='".htmlentities($uebung_obj->bezeichnung,ENT_QUOTES,'UTF-8')."'></td><td>$error_thema</td></tr>
-	<tr><td>".$p->t('benotungstool/freigabe')."</td><td align='right'>von <input type='text' size='16' name='freigabevon' value='".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabevon))."'></td></tr>
-	<tr><td>".$p->t('benotungstool/format')."</td><td align='right'>bis <input type='text' size='16' name='freigabebis' value='".date('d.m.Y H:i',$datum_obj->mktime_fromtimestamp($uebung_obj->freigabebis))."'></td></tr>";
-
-	if ($uebung_obj->beispiele){
-		echo "<tr><td>".$p->t('benotungstool/maxStudentenBeispiel')."</td><td align='right'><input type='text' name='maxstd' value='$uebung_obj->maxstd'></td><td>$error_maxstd</td></tr>
-	<tr><td>".$p->t('benotungstool/maxBeispieleStudent')."</td><td align='right'><input type='text' name='maxbsp' value='$uebung_obj->maxbsp'></td><td>$error_maxbsp</td></tr>";
-		echo"<tr><td>".$p->t('benotungstool/abgabe')." </td><td><input type='checkbox' name='kl_abgabe' ".($uebung_obj->abgabe?'checked':'')."></td></tr>";
-		echo "<input type='hidden' size='16' name='gewicht' value='0'>";
-	}
-	else if ($uebung_obj->abgabe)
-	{
-		echo "<tr><td>".$p->t('benotungstool/gewicht')."</td><td align='right'><input type='text' size='16' name='gewicht' value='$uebung_obj->gewicht'></td><td>$error_gewicht</td></tr>";
-		echo "<tr><td>".$p->t('benotungstool/positiv')." </td><td><input type='checkbox' name='positiv' ".($uebung_obj->positiv?'checked':'')."></td></tr>";
-	}
-	if ($uebung_obj->beispiele)
-		echo"<tr><td>".$p->t('benotungstool/statistikFuerStudentenAnzeigen')." </td><td><input type='checkbox' name='statistik' ".($uebung_obj->statistik?'checked':'')."></td></tr>";
-	echo "<tr>";
-	echo "<td>".$p->t('benotungstool/angabeidatei')."</td>";
-	if ($uebung_obj->angabedatei != '')
-		echo "<td><a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&liste_id=$liste_id&download=".$downloadname."'>".$downloadname."</a> <a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&liste_id=$liste_id&deletefile=1'>[del]</a></td>";
-	else
-		echo "<td></td>";
-	echo "</tr>";
-	echo "
-	<tr><td></td><td><input type='file' name='angabedatei'></td></tr>
-	<tr><td colspan=2 align='right'><input type='submit' name='uebung_edit' value='".$p->t('global/speichern')."'></td></tr>
-	</table>
-	<input type='hidden' name='liste_id' value='".$liste_id."'>
-	</form>";
-
-	$beispiel_obj = new beispiel();
-	$beispiel_obj->load_beispiel($uebung_id);
-	$anzahl = count($beispiel_obj->beispiele);
-	echo "</td><td valign='top'>";
-
-	//Beispiel neu Anlegen
-	if ($uebung_obj->beispiele)
-	{
-		echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&liste_id=$liste_id' method=POST>\n";
-		echo "<table width='340'><tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/neuesBeispielAnlegen')."</td></tr>\n";
-		echo "<tr><td>&nbsp;</td><td></td></tr>\n\n";
-
-		echo "<tr><td>".$p->t('global/bezeichnung')." <input type='text' name='bezeichnung' maxlength='32' value='".$p->t('benotungstool/beispiel')." ".($anzahl<9?'0'.($anzahl+1):($anzahl+1))."'>";
-		echo "&nbsp;".$p->t('benotungstool/punkte')." <input type='text' size='2' name='punkte' value='1'></td></tr>";
-		echo "<tr><td align='right'><input type='submit' name='beispiel_neu' value='".$p->t('benotungstool/anlegen')."'></td></tr>";
-
-		echo "</table>
-		</form>";
-	}
-
-	echo "</td></tr><tr><td valign='top'>";
-
-
-	//Uebersicht der Beispiele
-	if ($uebung_obj->beispiele)
-	{
-		echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&liste_id=$liste_id' method=POST>\n";
-		echo "<table width='340'><tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/vorhandeneBeispiele')."</td></tr>\n";
-		echo "<tr><td>&nbsp;</td><td></td><td></td></tr>\n\n";
-
-		if($anzahl>0)
-		{
-			echo "<tr><th>".$p->t('benotungstool/beispiel')."</th><th>".$p->t('benotungstool/punkte')."</th><th>".$p->t('benotungstool/auswahl')."</th></tr>\n";
-			foreach ($beispiel_obj->beispiele as $row)
-			{
-				echo "<tr><td><a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&beispiel_id=$row->beispiel_id&liste_id=$liste_id' class='Item'><u>".$row->bezeichnung."</u></a></td>
-				<td align='center'>$row->punkte</td>
-				<td align='center'><input type='Checkbox' name='beispiel[]' value='$row->beispiel_id'></td>";
-			}
-			echo "<tr><td></td><td></td><td align='right'><input type='Submit' value='".$p->t('benotungstool/auswahlLoeschen')."' onclick='return confirmdelete()' name='beispiel_delete'></td></tr>";
-		}
-		else
-			echo "<tr><td colspan='3'>".$p->t('benotungstool/keineBeispieleAngelegt')."</td><td></td></tr>";
-
-		echo "</table></form>";
-	}
-	echo "</td><td valign='top'>";
-
-	//Beispiel Aendern
-	$error_msg = '';
-	if(isset($beispiel_id) && $beispiel_id!='')
-	{
-		//Bearbeiten eines Beispiels
-		if($beispiel_obj->load($beispiel_id))
-		{
-			echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$uebung_id&beispiel_id=$beispiel_id&liste_id=$liste_id' method=POST>\n";
-			echo "<table width='340'><tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/beispielBearbeiten')."</td></tr>\n";
-			echo "<tr><td>&nbsp;</td><td></td></tr>\n\n";
-
-			echo "<tr><td>".$p->t('global/bezeichnung')." <input type='text' name='bezeichnung' maxlength='32' value='".htmlentities($beispiel_obj->bezeichnung,ENT_QUOTES,'UTF-8')."'>";
-			echo "&nbsp;".$p->t('benotungstool/punkte')." <input type='text' size='2' name='punkte' value='$beispiel_obj->punkte'></td></tr>";
-			echo "<tr><td align='right'><input type='submit' name='beispiel_edit' value='".$p->t('global/aendern')."'></td></tr>";
-
-			echo "</table>
-					</form><br><br>";
-		}
-		else
-			$error_msg = $beispiel_obj->errormsg;
-	}
-	echo "</td></tr></table>";
-}
-else
-{
-	if(isset($liste_id) && $liste_id!='')
-	{
-		echo "<table><tr><td valign='top'>";
-		//Bearbeiten der ausgewaehlten Liste
-		echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id' method=POST>\n";
-		echo "<table><tr><td colspan='2' width='340' class='ContentHeader3'>".$p->t('benotungstool/uebungBearbeiten')."</td><td>&nbsp;</td></tr>\n";
-		echo "<tr><td>&nbsp;</td><td></td></tr>";
-
-		$liste_obj = new uebung();
-		$liste_obj->load($liste_id);
-
-		echo "
-		<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema'  maxlength='32' value='".htmlentities($liste_obj->bezeichnung,ENT_QUOTES,'UTF-8')."'></td><td>$error_thema</td></tr><tr><td>".$p->t('benotungstool/gewicht')."</td><td align='right'><input type='text' size='16' name='gewicht' value='$liste_obj->gewicht'></td><td>$error_gewicht</td></tr>
-		<tr><td>".$p->t('benotungstool/positiv')." </td><td><input type='checkbox' name='positiv' ".($liste_obj->positiv?'checked':'')."></td></tr>
-		<tr><td colspan=2 align='right'><input type='submit' name='liste_edit' value='".$p->t('global/speichern')."'></td></tr>
-		</table>
-		</form>";
-	}
-
-	//Gesamtuebersicht ueber alle Listen innerhalb der Uebung
-	echo "<table><tr><td valign='top'>";
-	echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id' method=POST>";
-	echo "<table width='440'>";
-	$studentuebung = new uebung();
-	if (!$studentuebung->check_studentuebung($liste_id))
-		echo "<tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/vorhandeneAufgabeBearbeiten')."</td></tr>";
-
-	$uebung_obj = new uebung();
-	$uebung_obj->load_uebung($lehreinheit_id,$level=2,$uebung_id=$liste_id);
-	$anzahl = count($uebung_obj->uebungen);
-	$copy_content="<table cellpadding=0><tr><td class='ContentHeader3'>".$p->t('benotungstool/uebungInAndereLeKopieren')."</td></tr><tr><td></td><td></td><td>&nbsp;</td></tr><tr><th>&nbsp;</th></tr>";
-	$has_copy_content=false;
-	if($anzahl>0)
-	{
-		echo "<tr><td></td><td></td><td>&nbsp;</td></tr><tr><th>".$p->t('benotungstool/thema')."</th><th>".$p->t('benotungstool/freigeschalten')."</th><th>".$p->t('benotungstool/auswahl')."</th><th>&nbsp;</th></tr>";
-
-		//Alle Lehreinheiten holen die zu dieser lehrveranstaltung gehoeren
-		//und der angemeldete User berechtigt ist
-		$copy_option_content = array();
-		for($i=0;$i<$db->db_num_rows($result_alle_lehreinheiten);$i++)
-		{
-			$row_alle_lehreinheiten = $db->db_fetch_object($result_alle_lehreinheiten,$i);
-			if($lehreinheit_id!=$row_alle_lehreinheiten->lehreinheit_id)
-			{
-				//zugeteilte Lektoren holen
-				$qry_lektoren = "SELECT * FROM lehre.tbl_lehreinheitmitarbeiter JOIN public.tbl_mitarbeiter using(mitarbeiter_uid) WHERE lehreinheit_id=".$db->db_add_param($row_alle_lehreinheiten->lehreinheit_id, FHC_INTEGER);
-				if($result_lektoren = $db->db_query($qry_lektoren))
-				{
-					$lektoren = '( ';
-					$j=0;
-					while($row_lektoren = $db->db_fetch_object($result_lektoren))
-					{
-						$lektoren .= $row_lektoren->kurzbz;
-						$j++;
-						if($j<$db->db_num_rows($result_lektoren))
-							$lektoren.=', ';
-						else
-							$lektoren.=' ';
-					}
-					$lektoren .=')';
-				}
-				//zugeteilte Gruppen holen
-				$qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row_alle_lehreinheiten->lehreinheit_id,FHC_INTEGER);
-				if($result_gruppen = $db->db_query($qry_gruppen))
-				{
-					$gruppen = '';
-					$j=0;
-					while($row_gruppen = $db->db_fetch_object($result_gruppen))
-					{
-						if($row_gruppen->gruppe_kurzbz=='')
-							$gruppen.=$row_gruppen->semester.$row_gruppen->verband.$row_gruppen->gruppe;
-						else
-							$gruppen.=$row_gruppen->gruppe_kurzbz;
-						$j++;
-						if($j<$db->db_num_rows($result_gruppen))
-							$gruppen.=', ';
-						else
-							$gruppen.=' ';
-					}
-				}
-				//$copy_option_content.= "<OPTION value='$row_alle_lehreinheiten->lehreinheit_id'>$row_alle_lehreinheiten->lfbez - $gruppen $lektoren</OPTION>\n";
-				$copy_le_content[$row_alle_lehreinheiten->lehreinheit_id] = "$row_alle_lehreinheiten->lfbez-$row_alle_lehreinheiten->lehrform_kurzbz - $gruppen $lektoren";
-			}
-		}
-
-		//Uebungen durchlaufen
-		foreach ($uebung_obj->uebungen as $row)
-		{
-			$has_option_content=false;
-			echo "<tr height=23><td align='left'><a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&uebung_id=$row->uebung_id&liste_id=$liste_id' class='Item'><u>".$row->bezeichnung."</u></a></td><td align='center'>";
-
-			if((strtotime(strftime($row->freigabevon))<=time()) && (strtotime(strftime($row->freigabebis))>=time()))
-				echo $p->t('global/ja');
-			else
-				echo $p->t('global/nein');
-			echo "</td><td align='center'><input type='Checkbox' name='uebung[]' value='$row->uebung_id'></td>";
-			//Wenn andere Lehreinheiten vorhanden sind dann wird die moeglichkeit zum kopieren von
-			//Uebungen in diese Lehreinheiten angeboten.
-			if(isset($result_alle_lehreinheiten) && $db->db_num_rows($result_alle_lehreinheiten)>1)
-			{
-				$copy_content.= '<tr height=23>';
-				$copy_content.= '<td nowrap align="right">';
-				$copy_option_content = '';
-				//Lehreinheiten fuer Combo durchgehen und schauen ob
-				//fuer diese Lehreinheit bereits eine Uebung mit gleichem Namen existiert
-				//Falls ja wird diese nicht in der Combo angezeigt
-				foreach ($copy_le_content as $id=>$bezeichnung)
-				{
-					$qry = "SELECT uebung_id FROM campus.tbl_uebung WHERE lehreinheit_id=".$db->db_add_param($id, FHC_INTEGER)." AND bezeichnung=".$db->db_add_param($row->bezeichnung);
-					//echo $qry;
-					if($result_vorhanden = $db->db_query($qry))
-					{
-						if($db->db_num_rows($result_vorhanden)==0)
-						{
-							$copy_option_content.= "<OPTION value='$id'>$bezeichnung</OPTION>\n";
-							$has_option_content=true;
-							$has_copy_content=true;
-						}
-					}
-				}
-				//Wenn eintraege fuer Combo vorhanden sind dann wirds angezeigt
-				if($has_option_content)
-				{
-					$copy_content.= "\n<form accept-charset='UTF-8'  style='margin:1px;' action='verwaltung.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&kopieren=true&uebung_copy_id=$row->uebung_id' method='POST'>";
-					$copy_content.= "\n<SELECT name='lehreinheit_copy_id'>\n";
-					$copy_content.= $copy_option_content;
-					$copy_content.= '</SELECT> ';
-					$copy_content.= "&nbsp;&nbsp;&nbsp;<input type='submit' value='COPY'>";
-					$copy_content.= "</form>\n";
-				}
-				else
-				{
-					$copy_content.="&nbsp;";
-				}
-				$copy_content.= "</td></tr>";
-			}
-		}
-		echo "<tr><td></td><td></td><td><input type='Submit' value='".$p->t('benotungstool/auswahlLoeschen')."' name='delete_uebung' onclick='return confirmdelete();'></td></tr>";
-		if ($row->beispiele)
-			$anzeigen = 'beispiele';
-		else
-			$anzeigen = 'abgabe';
-	}
-	else
-	{
-		$studentuebung = new uebung();
-		if (!$studentuebung->check_studentuebung($liste_id))
-		{
-			echo "<tr><td colspan='3'>".$p->t('benotungstool/derzeitSindKeineAufgabenAngelegt')."</td><td></td></tr>";
-			$anzeigen = 'beide';
-		}
-		else
-			$anzeigen = "nada";
-	}
-
-	echo "</table>
-	</form><br><br>";
-
-	//Kopier-Buttons anzeigen
-	$copy_content.='</table>';
-	echo "</td><td valign='top'>";
-	//if($has_copy_content)
-	//	echo $copy_content;
-	echo "</td></tr></table>";
-
-	//Uebung neu anlegen
-	if(!isset($_POST['uebung_neu']))
-	{
-		$thema = $p->t('benotungstool/liste')." ".($anzahl<9?'0'.($anzahl+1):($anzahl+1));
-		$anzahlderbeispiele = 10;
-		$punkteprobeispiel = 1;
-		$freigabevon = date('d.m.Y H:i');
-		$freigabebis = date('d.m.Y H:i');
-		$maxstudentenprobeispiel = '';
-		$maxbeispieleprostudent = '';
-		$gewicht = 1;
-
-	}
-	echo "</td><td valign='top'>";
-
-	if ($anzeigen != 'abgabe' && $anzeigen != 'nada')
-	{
-		echo "
-	<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id' method=POST enctype='multipart/form-data'>
-	<table >
-	<tr><td width='440' colspan=2 class='ContentHeader3'>".$p->t('benotungstool/neueKreuzerllisteAnlegen')."</td><td></td></tr>
-	<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema' maxlength='32' value='$thema'></td><td><span class='error'>$error_thema</td></tr>
-	<tr><td>".$p->t('benotungstool/anzahlDerBeispiele')."</td><td align='right'><input type='text' name='anzahlderbeispiele' maxlength='2' size='2' value='$anzahlderbeispiele'></td><td>$error_anzahlderbeispiele</td></tr>
-	<tr><td>".$p->t('benotungstool/anzahlPunkteProBeispiel')."</td><td align='right'><input type='text' name='punkteprobeispiel' value='$punkteprobeispiel'></td><td>$error_punkteprobeispiel</td></tr>
-	<tr><td>".$p->t('benotungstool/maxStudentenBeispiel')."</td><td align='right'><input type='text' name='maxstd' value='$maxstd'></td><td>$error_maxstd</td></tr>
-	<tr><td>".$p->t('benotungstool/maxBeispieleStudent')."</td><td align='right'><input type='text' name='maxbsp' value='$maxbsp'></td><td>$error_maxbsp</td></tr>
-	<tr><td>".$p->t('benotungstool/freigabe')."</td><td align='right'>von <input type='text' size='16' name='freigabevon' value='$freigabevon'></td><td>$error_freigabevon</td></tr>
-	<tr><td>".$p->t('benotungstool/format')."</td><td align='right'>bis <input type='text' size='16' name='freigabebis' value='$freigabebis'></td><td>$error_freigabebis</td></tr>
-	<input type='hidden' size='16' name='gewicht' value='0'>
-	<tr><td>".$p->t('benotungstool/abgabe')." </td><td><input type='checkbox' name='kl_abgabe'></td></tr>
-	<tr><td>".$p->t('benotungstool/statistikFuerStudentenAnzeigen')." </td><td><input type='checkbox' name='statistik'></td></tr>
-	<tr><td>".$p->t('benotungstool/angabeidatei')."</td><td><input type='file' name='angabedatei'></td></tr>
-	<tr><td colspan=2 align='right'><input type='submit' name='uebung_neu' value='".$p->t('benotungstool/anlegen')."'></td></tr>
-	</table>
-	</form>
-	";
-		// notenschlüssel
-		$qry = "select * from campus.tbl_notenschluesseluebung where uebung_id = ".$db->db_add_param($liste_id, FHC_INTEGER)." order by note";
-		if($result = $db->db_query($qry))
-		{
-			$notenschluessel = array();
-			$notenschluessel[1] = '';
-			$notenschluessel[2] = '';
-			$notenschluessel[3] = '';
-			$notenschluessel[4] = '';
-			$notenschluessel[5] = '';
-			if($db->db_num_rows($result)>=1)
-			{
-				while($schluesselrow = $db->db_fetch_object($result))
-				{
-					$notenschluessel[$schluesselrow->note] = $schluesselrow->punkte;
-				}
-			}
-		}
-
-		if ($anzeigen != "beide")
-		{
-			if ($liste_obj->prozent == 't')
-			{
-				$einheit = " %";
-				$einheit_link = $p->t('benotungstool/notenschluesselInProzent')." / <a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id&notenschluessel=punkte'>".$p->t('benotungstool/punkten')."</a>";
-			}
-			else
-			{
-				$einheit=" ".$p->t('benotungstool/punkte');
-				$einheit_link = $p->t('benotungstool/notenschluesselIn')." <a href='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id&notenschluessel=prozent'>".$p->t('benotungstool/prozentPunkten');
-			}
-
-			echo "<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id' method='POST' name='ns'>\n";
-			echo "<table><tr><td colspan='3' class='ContentHeader3'>".$p->t('benotungstool/notenschluesselDefinieren')."</td></tr>\n";
-			echo "<tr>";
-			echo "<td colspan='3'>";
-			echo $einheit_link;
-			echo "</td>";
-			echo "</tr>";
-			echo "<tr><td colspan='3'>&nbsp;</td></tr>\n";
-			echo "<tr><td>".$p->t('benotungstool/note')."</td><td>".$p->t('benotungstool/minimum')."</td></tr>";
-			echo "<tr><td><input type='text' name='schluessel_note_1' maxlength='2' size='2' value='1' readonly></td><td><input type='text' size='4' name='schluessel_punkte_1' value='$notenschluessel[1]'>$einheit</td></tr>";
-			echo "<tr><td><input type='text' name='schluessel_note_2' maxlength='2' size='2' value='2' readonly></td><td><input type='text' size='4' name='schluessel_punkte_2' value='$notenschluessel[2]'>$einheit</td></tr>";
-			echo "<tr><td><input type='text' name='schluessel_note_3' maxlength='2' size='2' value='3' readonly></td><td><input type='text' size='4' name='schluessel_punkte_3' value='$notenschluessel[3]'>$einheit</td></tr>";
-			echo "<tr><td><input type='text' name='schluessel_note_4' maxlength='2' size='2' value='4' readonly></td><td><input type='text' size='4' name='schluessel_punkte_4' value='$notenschluessel[4]'>$einheit</td></tr>";
-			echo "<tr><td><input type='text' name='schluessel_note_5' maxlength='2' size='2' value='5' readonly></td><td><input type='text' size='4' name='schluessel_punkte_5' value='$notenschluessel[5]'>$einheit</td></tr>";
-			echo "<tr>";
-			echo "<td align='right' colspan='3'>";
-			if ($liste_obj->prozent == 't')
-				echo "<input type='button' onclick='set_notenschluessel_prozent();' value='".$p->t('benotungstool/standardwerteSetzen')."'><br>";
-			echo "<input type='submit' name='schluessel' value='".$p->t('global/speichern')."'></td>";
-			echo "</tr>";
-
-			echo "</table>
-			</form>";
-		}
-	}
-	if(!isset($_POST['uebung_neu']))
-		$thema = "Abgabe ".($anzahl<9?'0'.($anzahl+1):($anzahl+1));
-
-	if ($anzeigen != 'beispiele' && $anzeigen != 'nada')
-	{
-		echo "
-	<form accept-charset='UTF-8' action='verwaltung_listen.php?lvid=$lvid&stsem=$stsem&lehreinheit_id=$lehreinheit_id&liste_id=$liste_id' method=POST enctype='multipart/form-data'>
-	<table >
-	<tr><td width='440' colspan=2 class='ContentHeader3'>".$p->t('benotungstool/neueAbgabeAnlegen')."</td><td></td></tr>
-	<tr><td>".$p->t('benotungstool/thema')."</td><td align='right'><input type='text' name='thema' maxlength='32' value='".htmlentities($thema,ENT_QUOTES,'UTF-8')."'></td><td><span class='error'>$error_thema</td></tr>
-	<tr><td>".$p->t('benotungstool/freigabe')."</td><td align='right'>von <input type='text' size='16' name='freigabevon' value='$freigabevon'></td><td>$error_freigabevon</td></tr>
-	<tr><td>".$p->t('benotungstool/format')."</td><td align='right'>bis <input type='text' size='16' name='freigabebis' value='$freigabebis'></td><td>$error_freigabebis</td></tr>
-	<tr><td>".$p->t('benotungstool/gewicht')."</td><td align='right'><input type='text' size='16' name='gewicht' value='$gewicht'></td><td>$error_gewicht</td></tr>
-	<tr><td>".$p->t('benotungstool/positiv')." </td><td><input type='checkbox' name='positiv'></td></tr>
-	<!--<tr><td>".$p->t('benotungstool/statistikFuerStudentenAnzeigen')." </td><td><input type='checkbox' name='statistik'></td></tr>-->
-	<tr><td>".$p->t('benotungstool/angabeidatei')."</td><td><input type='file' name='angabedatei'></td></tr>
-	<tr><td colspan=2 align='right'><input type='submit' name='abgabe_neu' value='".$p->t('benotungstool/anlegen')."'></td></tr>
-	</table>
-	</form>
-	";
-	}
-}
-?>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/cis/private/lehre/benotungstool/zipdownload_benotungstool.php b/cis/private/lehre/benotungstool/zipdownload_benotungstool.php
deleted file mode 100644
index 9e177dba7..000000000
--- a/cis/private/lehre/benotungstool/zipdownload_benotungstool.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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>
- *          Rudolf Hangl 		< rudolf.hangl@technikum-wien.at >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
- */
-/**
- * Erstellt ein Zip Archiv des Download-Bereichs und leitet dann zum Download weiter
- * @create 20-03-2006
- * Aufruf: zipdownload.php?stg=255&sem=1$short=eng
- */
-require_once('../../../../config/cis.config.inc.php');
-require_once('../../../../include/functions.inc.php');
-
-$user = get_uid();
-
-if(!check_lektor($user))
-	die('Sie haben keine Berechtigung fuer diese Seite');
-
-//Gueltigkeit der Parameter pruefen
-if(!isset($_GET['uebung_id']) || !is_numeric($_GET['uebung_id']))
-{
-	die('Fehler bei der Parameteruebergabe');
-}
-if(!isset($_GET['lehreinheit_id']) || !is_numeric($_GET['lehreinheit_id']))
-{
-	die('Fehler bei der Parameteruebergabe');
-}
-if(!isset($_GET['stsem']))
-{
-	die('Fehler bei der Parameteruebergabe');
-}
-if(!isset($_GET['downloadname']))
-{
-	die('Fehler bei der Parameteruebergabe');
-}
-
-$uebung_id   = $_GET['uebung_id'];
-$lehreinheit_id   = $_GET['lehreinheit_id'];
-$stsem   = $_GET['stsem'];
-$downloadname   = $_GET['downloadname'];
-
-if(mb_strstr($downloadname,'..'))
-	die('Ungueltiger Parameter gefunden');
-
-//Pfade bauen
-$pfad = BENOTUNGSTOOL_PATH.'abgabe/';
-$filename = 'download_'.$user.'_'.$downloadname.'.zip';
-$filename_tmp = 'download_'.$user.'_'.$uebung_id.'.zip';
-
-if(!check_filename($filename) || !check_filename($filename_tmp))
-	die('Ungueltiger Parameter gefunden');
-
-//Pfad wechseln
-if(chdir($pfad))
-{
-	//File loeschen falls es existiert
-	//if(file_exists("download_".$user."*"))
-	exec('rm download_'.$user.'*');
-
-	//Zip File erstellen
-	exec("zip -r ".escapeshellarg($filename_tmp).' *_[WS]S[0-9][0-9][0-9][0-9]_'.$uebung_id.'_*');
-
-	//Auf Zip File Verweisen
-	//header("Location: $pfad$filename");
-	header('Content-Type: application/octet-stream');
-	header('Content-disposition: attachment; filename="'.$filename.'"');
-	readfile($filename_tmp);
-	unlink($filename_tmp);
-}
-else
-{
-	die('Path change failed');
-}
-?>
diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
index b207c94e5..aafcf9710 100644
--- a/cis/private/lehre/pruefung/pruefung.js.php
+++ b/cis/private/lehre/pruefung/pruefung.js.php
@@ -337,10 +337,10 @@ function writePruefungsTable(e, data, anmeldung)
 {
 	var row = "";
 	var teilnehmer = "";
-	var button = "";
 	row += "<tr><td>"+e.organisationseinheit+"</td><td style='cursor: pointer; text-decoration: underline;' onclick='showPruefungsDetails(\""+e.pruefung.pruefung_id+"\",\""+e.lehrveranstaltung[0].lehrveranstaltung_id+"\");'>"+e.lehrveranstaltung[0].bezeichnung+" <br>("+e.lehrveranstaltung[0].lehrform_kurzbz+", "+e.lehrveranstaltung[0].ects+" ECTS, "+e.pruefung.mitarbeiter_uid+")</td><td>";
 	e.pruefung.termine.forEach(function(d){
-		var storno = false;
+        var button = "";
+	    var storno = false;
 		var anmeldung_id = null;
 		data.result.anmeldungen.forEach(function(anmeldung){
 			if((anmeldung.pruefungstermin_id === d.pruefungstermin_id) && (anmeldung.lehrveranstaltung_id === e.lehrveranstaltung[0].lehrveranstaltung_id))
diff --git a/cis/private/lehre/zipdownload.php b/cis/private/lehre/zipdownload.php
deleted file mode 100644
index 76160abf6..000000000
--- a/cis/private/lehre/zipdownload.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>
- *          Rudolf Hangl 		< rudolf.hangl@technikum-wien.at >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
- */
-
-/**
- * Erstellt ein Zip Archiv des Download-Bereichs und leitet dann zum Download weiter
- * @create 20-03-2006
- * Aufruf: zipdownload.php?stg=255&sem=1$short=eng
- */
-
-	 require_once('../../../config/cis.config.inc.php');
-   require_once('../../../include/studiengang.class.php');
-   require_once('../../../include/functions.inc.php');
-      
-   //Gueltigkeit der Parameter pruefen		
-   if(!isset($_GET['stg']) || !is_numeric($_GET['stg']))
-   {
-   		die('Fehler bei der Parameteruebergabe');
-   }
-   
-   if(!isset($_GET['sem']) || !is_numeric($_GET['sem']))
-   {
-   		die('Fehler bei der Parameteruebergabe');
-   }
-   		
-   if(!isset($_GET['short']) || mb_strstr("..",$_GET['short'],false))
-   {
-   		die("Fehler bei der Parameteruebergabe");
-   }
-   
-   $stg   = $_GET['stg'];
-   $sem   = $_GET['sem'];
-   $short = $_GET['short'];
-   
-   //Studiengangskuerzel holen
-   $stg_obj = new studiengang();
-   $stg_obj->load($stg);
-
-   $kurzbz = mb_strtolower($stg_obj->kuerzel);
-
-   //Pfade bauen
-   $pfad = '../../../documents/'.$kurzbz.'/'.$sem.'/'.$short.'/download/';
-   $filename = $kurzbz.'_'.$sem.'_'.$short.'_download.zip';
-   $pfad2 = '../../../documents/'.$kurzbz.'/'.$sem.'/'.$short.'/';
-   
-   //Pfad wechseln
-   chdir($pfad);
-   
-   //File loeschen falls es existiert
-   if(file_exists('../'.$filename))
-   		exec("rm ../$filename");
-   		
-   //Zip File erstellen
-   exec("zip -r ../".$filename." ./*");
-
-   //Auf Zip File Verweisen
-   header("Location: $pfad2$filename");
-?>
\ No newline at end of file
diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
index c7da148dd..e58ce03ed 100644
--- a/cis/private/lvplan/stpl_week.php
+++ b/cis/private/lvplan/stpl_week.php
@@ -497,19 +497,19 @@ $stdplan->user_uid=$uid;
 // Zusaetzliche Daten laden
 if (! $stdplan->load_data($type,$pers_uid,$ort_kurzbz,$stg_kz,$sem,$ver,$grp,$gruppe_kurzbz,null,$lva) )
 {
-	die($stdplan->errormsg);
+	die(htmlentities($stdplan->errormsg));
 }
 
 // Stundenplan einer Woche laden
 if (! $stdplan->load_week($datum))
 {
-	die($stdplan->errormsg);
+	die(htmlentities($stdplan->errormsg));
 }
 
 // Kopfbereich drucken
 if (! $stdplan->draw_header())
 {
-	die($stdplan->errormsg);
+	die(htmlentities($stdplan->errormsg));
 }
 
 // Stundenplan der Woche drucken
diff --git a/cis/private/profile/zahlungen_details.php b/cis/private/profile/zahlungen_details.php
index a6d35cc72..650ee81c0 100644
--- a/cis/private/profile/zahlungen_details.php
+++ b/cis/private/profile/zahlungen_details.php
@@ -26,6 +26,8 @@ require_once('../../../include/organisationseinheit.class.php');
 require_once('../../../include/addon.class.php');
 require_once('../../../include/benutzer.class.php');
 require_once('../../../include/benutzerberechtigung.class.php');
+require_once('../../../include/student.class.php');
+require_once('../../../include/prestudent.class.php');
 	
 $uid = get_uid();
 
@@ -66,7 +68,19 @@ $studiengang=new studiengang();
 $studiengang->load($konto->studiengang_kz);
 $bankverbindung=new bankverbindung();
 
-$kontodaten = getBankverbindung($studiengang->oe_kurzbz);
+// Wenn Person StudentIn ist, auch die OrgForm laden um die richtige Kontonummer anzeigen zu können
+$student = new student();
+$orgform = '';
+if ($student->load($uid))
+{
+	$laststatus = new prestudent();
+	if ($laststatus->getLastStatus($student->prestudent_id))
+	{
+		$orgform = $laststatus->orgform_kurzbz;
+	}
+}
+
+$kontodaten = getBankverbindung($studiengang->oe_kurzbz, $orgform);
 $iban=$kontodaten["iban"];
 $bic=$kontodaten["bic"];
 
@@ -156,56 +170,63 @@ $addon = new addon();
 $addon->loadAddons();
 foreach($addon->result as $a)
 {
-    if($a->kurzbz === "eps")
-    {
+	if($a->kurzbz === "eps")
+	{
 	echo '<table class="tablesorter">
-	    <thead>
+		<thead>
 		<tr>
-		    <th width="40%">Zahlung anweisen</th>
-		    <th width="60%"></th>
+			<th width="40%">Zahlung anweisen</th>
+			<th width="60%"></th>
 		</tr>
-	    </thead>
-	    <tbody>
+		</thead>
+		<tbody>
 		<tr>
-		    <td>EPS</td>
-		    <td>
-		    <a href="../../../addons/eps/cis/index.php?buchungsnummer='.$buchungsnr.'"><img src="../../../skin/images/eps-logo_full.gif" width="30" height="30" alt="EPS Überweisung"></a>
-		    </td>
+			<td>EPS</td>
+			<td>
+			<a href="../../../addons/eps/cis/index.php?buchungsnummer='.$buchungsnr.'"><img src="../../../skin/images/eps-logo_full.gif" width="30" height="30" alt="EPS Überweisung"></a>
+			</td>
 		</tr>
-	    </tbody>
+		</tbody>
 	</table>';
-    }
-    
+	}
+	
 }
 
 echo '</body></html>';
 
-function getBankverbindung($oe_kurzbz)
+function getBankverbindung($oe_kurzbz, $orgform_kurzbz = null)
 {
-    $iban = "";
-    $bic = "";
-    $result = array();
-    $bankverbindung=new bankverbindung();
-    if($bankverbindung->load_oe($oe_kurzbz) && count($bankverbindung->result)>0)
-    {
-	$result["iban"]=$bankverbindung->result[0]->iban;
-	$result["bic"]=$bankverbindung->result[0]->bic;
-	return $result;
-    }
-    else
-    {
-	$organisationseinheit = new organisationseinheit();
-	$organisationseinheit->load($oe_kurzbz);
-	if($organisationseinheit->oe_parent_kurzbz !== NULL)
+	$iban = "";
+	$bic = "";
+	$result = array();
+	$bankverbindung=new bankverbindung();
+	if($bankverbindung->load_oe($oe_kurzbz, $orgform_kurzbz) && count($bankverbindung->result) > 0)
 	{
-	    $result = getBankverbindung($organisationseinheit->oe_parent_kurzbz);
-	    return $result;
+		$result["iban"] = $bankverbindung->result[0]->iban;
+		$result["bic"] = $bankverbindung->result[0]->bic;
+		return $result;
+	}
+	// Nochmal ohne $orgform_kurzbz versuchen
+	elseif($bankverbindung->load_oe($oe_kurzbz) && count($bankverbindung->result) > 0)
+	{
+		$result["iban"] = $bankverbindung->result[0]->iban;
+		$result["bic"] = $bankverbindung->result[0]->bic;
+		return $result;
 	}
 	else
 	{
-	    $result["iban"]="";
-	    $result["bic"]="";
+		$organisationseinheit = new organisationseinheit();
+		$organisationseinheit->load($oe_kurzbz);
+		if($organisationseinheit->oe_parent_kurzbz !== NULL)
+		{
+			$result = getBankverbindung($organisationseinheit->oe_parent_kurzbz, $orgform_kurzbz);
+			return $result;
+		}
+		else
+		{
+			$result["iban"] = "";
+			$result["bic"] = "";
+		}
 	}
-    }
 }
 ?>
diff --git a/cis/private/stud_in_grp.php b/cis/private/stud_in_grp.php
index abf3a67a1..d2f9e2d2c 100644
--- a/cis/private/stud_in_grp.php
+++ b/cis/private/stud_in_grp.php
@@ -183,7 +183,7 @@ else
 				AND studiengang_kz=".$db->db_add_param($_GET['kz']);
 
 	if (isset($_GET['sem']))
-		$qry.=" AND semester=".$db->db_add_param($_GET['sem']);
+		$qry.=" AND semester=".$db->db_add_param($_GET['sem'], FHC_INTEGER);
 
 	if (isset($_GET['verband']))
 		$qry.=" AND verband=".$db->db_add_param($_GET['verband']);
diff --git a/cis/testtool/admin/edit_gebiet.php b/cis/testtool/admin/edit_gebiet.php
index afe81dae7..2fe6af39f 100644
--- a/cis/testtool/admin/edit_gebiet.php
+++ b/cis/testtool/admin/edit_gebiet.php
@@ -186,6 +186,7 @@ if (isset($_POST['speichern']))
 		$gebiet->zufallvorschlag = isset($_POST['zufallvorschlag']);
 		$gebiet->levelgleichverteilung = isset($_POST['levelgleichverteilung']);
 		$gebiet->maxpunkte = $_POST['maxpunkte'];
+		$gebiet->offsetpunkte = $_POST['offsetpunkte'];
 		$gebiet->maxfragen = $_POST['maxfragen'];
 		$gebiet->level_start = $_POST['level_start'];
 		$gebiet->level_sprung_auf = $_POST['level_sprung_auf'];
@@ -257,6 +258,18 @@ if ($gebiet_id != '')
 		$hinweis = '';
 	echo '<td>Maximale Punkteanzahl</td><td><input type="text" size="5" maxlength="5" name="maxpunkte" value="'.$gebiet->maxpunkte.'">'.$hinweis.'</td>';
 	echo '</tr><tr>';
+	// empfohlene offsetpunkte berechnen und anzeigen
+	$offsethinweis = '';
+	$offsetpunkte = $gebiet->berechneOffsetpunkte($gebiet_id);
+	if ($offsetpunkte)
+	{
+		$offsetwarnung = strlen($gebiet->errormsg) > 0 ? ' (HINWEIS: '.$gebiet->errormsg.')' : '';
+
+		$offsethinweis = ' <span class="error">empfohlene Offsetpunkteanzahl: '.round($offsetpunkte).(round($offsetpunkte) != $offsetpunkte ? ' ('.$offsetpunkte.' gerundet)' : '').'</span>';
+		$offsethinweis .= '<span class="error">'.$offsetwarnung.'</span>';
+	}
+	echo '<td>Offsetpunkte (maximale Negativpunkte)</td><td><input type="text" size="5" maxlength="7" name="offsetpunkte" value="'.$gebiet->offsetpunkte.'">'.$offsethinweis.'</td>';
+	echo '</tr><tr>';
 	echo '<td>Maximale Fragenanzahl</td><td><input type="text" size="5" maxlength="5" name="maxfragen" value="'.$gebiet->maxfragen.'"></td>';
 	echo '</tr><tr>';
 	echo '<td>Antworten pro Zeile</td><td><input type="text" size="5" maxlength="2" name="antwortenprozeile" value="'.$gebiet->antwortenprozeile.'" required></td>';
diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
index a6a4be483..6da5040ed 100644
--- a/cis/testtool/admin/index.php
+++ b/cis/testtool/admin/index.php
@@ -160,6 +160,18 @@ textarea {
 font-size: 10pt;
 }
 
+.nummern
+{
+	border: 1px solid lightgrey;
+	border-collapse: collapse;
+	border-spacing: 0;
+	padding: 2px;
+}
+td.nummern
+{
+	width: 15px;
+	text-align: center;
+}
 </style>
 </head>
 
@@ -718,19 +730,29 @@ if (($anzahl !== 0) || ($stg_kz == '-1') && ($stg_kz !== ''))
 	// Liste der Fragen
 	if ($filter == 'aktiv')
 	{
-		$qry = "SELECT distinct nummer, aktiv FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." AND aktiv ORDER BY nummer";
+		$qry = "SELECT distinct nummer, aktiv, level, demo FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." AND aktiv ORDER BY nummer";
 	}
 	elseif ($filter == 'inaktiv')
 	{
-		$qry = "SELECT distinct nummer, aktiv FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." AND NOT aktiv ORDER BY nummer";
+		$qry = "SELECT distinct nummer, aktiv, level, demo FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." AND NOT aktiv ORDER BY nummer";
 	}
 	else
 	{
-		$qry = "SELECT distinct nummer, aktiv FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." ORDER BY nummer";
+		$qry = "SELECT distinct nummer, aktiv, level, demo FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($gebiet_id)." ORDER BY nummer";
 	}
 
 	if ($result = $db->db_query($qry))
 	{
+		$resultArray = array();
+		$i = 0;
+		while ($row = $db->db_fetch_object($result))
+		{
+			$resultArray[$i]['nummer'] = $row->nummer;
+			$resultArray[$i]['aktiv'] = $row->aktiv;
+			$resultArray[$i]['level'] = $row->level;
+			$resultArray[$i]['demo'] = $row->demo;
+			$i++;
+		}
 		// Aktiv / Inaktiv Checkboxes
 		$aktivchecked = ($filter == 'aktiv' || $filter == '')?'checked="checked"':'';
 		$inaktivchecked = ($filter == 'inaktiv' || $filter == '')?'checked="checked"':'';
@@ -756,21 +778,45 @@ if (($anzahl !== 0) || ($stg_kz == '-1') && ($stg_kz !== ''))
 					<a href="'.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$nummer.'&amp;filter=aktiv">
 					<input type="checkbox" name="inaktiv" '.$inaktivchecked.' onclick="window.location.assign(\''.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$nummer.'&amp;filter=aktiv\');"/>inaktiv</a>';
 		}
-		echo '<br/>Nummer: ';
-		while ($row = $db->db_fetch_object($result))
+		echo '<br/><table class="nummern" style="display: inline-table;"><tbody><tr>
+				<td>Nummer:</td>';
+		foreach ($resultArray AS $key=>$value)
 		{
 			if ($nummer == '')
-				$nummer = $row->nummer;
+				$nummer = $value['nummer'];
 
 			$style = '';
-			if ($db->db_parse_bool($row->aktiv) == false)
+			if ($db->db_parse_bool($value['aktiv']) == false)
 				$style = 'style="color: lightgrey"';
 
-			if ($nummer == $row->nummer)
-				echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;nummer=$row->nummer&amp;filter=$filter' class='Item' $style><u>$row->nummer</u></a> -";
-			else
-				echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;nummer=$row->nummer&amp;filter=$filter' class='Item' $style>$row->nummer</a> -";
+			$styleSelected = '';
+			if ($nummer == $value['nummer'])
+			{
+				$styleSelected = 'style="background-color: lightblue"';
+			}
+
+			echo '<td class="nummern" '.$styleSelected.'><a href="'.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$value['nummer'].'&amp;filter='.$filter.'" '.$style.'>'.$value['nummer'].'</a></td>';
 		}
+		echo '</tr><tr>
+				<td>Level:</td>';
+		$leveltext = '';
+		foreach ($resultArray AS $key=>$value)
+		{
+			if ($value['level'] == '')
+			{
+				$leveltext = '-';
+			}
+			else
+			{
+				$leveltext = $value['level'];
+				if ($value['demo'] == 't')
+				{
+					$leveltext .= '*';
+				}
+			}
+			echo '<td class="nummern" style="color: grey">'.$leveltext.'</td>';
+		}
+		echo '</tr></tbody></table>';
 		echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;type=neuefrage&amp;filter=$filter' class='Item'>neue Frage hinzufuegen</a>";
 		$frage_obj = new frage();
 		if ($filter == 'aktiv')
diff --git a/cis/testtool/admin/uebersichtFragen.php b/cis/testtool/admin/uebersichtFragen.php
index 71d154a1b..50963a337 100644
--- a/cis/testtool/admin/uebersichtFragen.php
+++ b/cis/testtool/admin/uebersichtFragen.php
@@ -35,7 +35,7 @@ if (!$db = new basis_db())
 	<title>Testool Fragen Übersicht</title>
 	<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
 </head>
-<body>
+<body style="padding: 10px">
 <?php 
 $user = get_uid();
 $rechte = new benutzerberechtigung();
@@ -47,7 +47,8 @@ if(!$rechte->isBerechtigt('basis/testtool', null, 's'))
 $gebiet = new gebiet(); 
 $gebiet->getAll(); 
 $sprache = (isset($_REQUEST['Sprache'])?$_REQUEST['Sprache']:'German');
-$Auswahlgebiet = (isset($_REQUEST['AuswahlGebiet'])?$_REQUEST['AuswahlGebiet']:''); 
+$Auswahlgebiet = (isset($_REQUEST['AuswahlGebiet'])?$_REQUEST['AuswahlGebiet']:'');
+$loesungen = (isset($_REQUEST['loesungen']) && $_REQUEST['loesungen'] != '' ? true:false);
 
 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="TesttoolUebersicht">
 <table>
@@ -76,6 +77,13 @@ else
 
 echo'</select>
 </td>
+</tr>
+<tr>
+<td>
+Mit Lösungen
+</td>
+<td><input type="checkbox" name="loesungen" '.($loesungen ? 'checked':'').'></td>
+</tr>
 <tr>
 <td colspan="2"><input type="submit" value="Anzeigen"></td></tr>
 </table><br>';
@@ -208,8 +216,17 @@ if(isset($_REQUEST['AuswahlGebiet']))
 			$vorschlag = new vorschlag();
 			$vorschlag->loadVorschlagSprache($vor->vorschlag_id, $sprache);
 			
-			if($vorschlag->bild =='')
-				echo '<tr><td align="right"><b>'.$vor->punkte.'</b></td><td style="border-left:1px solid;">&nbsp;'.$vorschlag->text.'</td></tr>';
+			if($vorschlag->bild == '')
+			{
+				if ($loesungen)
+				{
+					echo '<tr><td style="border-right:1px solid;">'.$vor->nummer.'</td></td><td align="right"><b>'.$vor->punkte.'</b></td><td style="border-left:1px solid;">&nbsp;'.$vorschlag->text.'</td></tr>';
+				}
+				else
+				{
+					echo '<tr><td style="border-right:1px solid;">'.$vor->nummer.'</td><td>&nbsp;'.$vorschlag->text.'</td></tr>';
+				}
+			}
 			if($vorschlag->bild!='')
 			{
 				// zeilenumbruch nach 4 bilder
@@ -217,7 +234,15 @@ if(isset($_REQUEST['AuswahlGebiet']))
 					echo "</tr>";
 				echo "<td>";
 				echo "<img class='testtoolvorschlag' src='../bild.php?src=vorschlag&amp;vorschlag_id=$vor->vorschlag_id&amp;sprache=".$sprache."' /><br/>";
-				echo "<br>".$vor->punkte."</td>";
+				if ($loesungen)
+				{
+					echo "<br>".$vor->punkte."</td>";
+				}
+				else
+				{
+					echo "</td>";
+				}
+
 				$anzahlBild++;
 			}
 			if($vorschlag->audio!='')
diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
index f15c2c2d2..e2c87ed67 100644
--- a/cis/testtool/frage.php
+++ b/cis/testtool/frage.php
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
- *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>,
+ *		  Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ *		  Rudolf Hangl <rudolf.hangl@technikum-wien.at>,
  *			Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>,
  *			Manfred Kindl <manfred.kindl@technikum-wien.at>
  */
@@ -48,8 +48,8 @@ session_start();
 // If language is changed by language select menu, reset language variables
 if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
 {
-    $_SESSION['sprache_user'] = $_GET['sprache_user'];
-    $sprache_user = $_GET['sprache_user'];
+	$_SESSION['sprache_user'] = $_GET['sprache_user'];
+	$sprache_user = $_GET['sprache_user'];
 }
 
 // Set language variable, which impacts the question language
@@ -78,10 +78,10 @@ echo '
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
-    <link rel="stylesheet" href="../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css" type="text/css"/>
+	<link rel="stylesheet" href="../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css" type="text/css"/>
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css" />
-    <script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
-    <script type="text/javascript" src="../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
+	<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
 	<script language="Javascript" type="text/javascript">
 	//<![CDATA[
 	function killChildNodes(an_element)
@@ -132,19 +132,19 @@ echo '
 	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
 	{
 		var check = confirm(<?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?>+' '+stunde+'h '+minute+'m '+sekunde+'s');
-        if (check == true) {
+		if (check == true) {
 			var sprache_user = <?php echo "'".$sprache_user."'"?>;
-        	document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
-        }
-        else {
-            return false;
-        }
+			document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
+		}
+		else {
+			return false;
+		}
 	}
 
 	function letzteFrage()
 	{
 		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
-        return true;
+		return true;
 	}
 
 	//]]>
@@ -357,8 +357,8 @@ if($levelgebiet)
 		<tr>
   			<td valign="top" style="height:1px;font-size:2px;">
   				<table cellpadding="0" cellspacing="0" style="border:0px;height:1px;font-size:2px;">
-      			<tr>
-	      			<td nowrap="nowrap" style="height:1px;font-size:2px;">
+	  			<tr>
+		  			<td nowrap="nowrap" style="height:1px;font-size:2px;">
 						<font size="2" face="Arial, Helvetica, sans-serif">
 						<img src="../../skin/images/entry.gif" width="'.($psolved*3).'" height="10" alt="" border="1" />
 						</font>
@@ -372,32 +372,32 @@ if($levelgebiet)
 }
 //Zeit des Gebietes holen
 echo '
-    <table width="100%">
-        <tr>
-            <td valign="top" width="50%">TeilnehmerIn: '.$info.'</td>
-        </tr>
-        <tr>
-            <td align="center">'.$fortschrittsbalken.'</td>
-        </tr>
-        <tr>
-            <td width="50%"></td>
-        </tr>
-        <tr>
-            <td>';
+	<table width="100%">
+		<tr>
+			<td valign="top" width="50%">TeilnehmerIn: '.$info.'</td>
+		</tr>
+		<tr>
+			<td align="center">'.$fortschrittsbalken.'</td>
+		</tr>
+		<tr>
+			<td width="50%"></td>
+		</tr>
+		<tr>
+			<td>';
 
 if($demo)
 {
 	//Wenn es sich um ein Demobeispiel handelt, dann wird die Maximale Gesamtzeit angezeigt
 	echo
-        $p->t('testtool/bearbeitungszeit').': '.$stunde.'h '.$minute.'m '.$sekunde.'s';
+		$p->t('testtool/bearbeitungszeit').': '.$stunde.'h '.$minute.'m '.$sekunde.'s';
 	echo '
-            </td>
-        </tr>
-        <tr>
-            <td>
-    ';
+			</td>
+		</tr>
+		<tr>
+			<td>
+	';
 	echo "
-	    <input type=\"button\" class='btn btn-default btn-testtool' value=\"".$p->t("testtool/gebietStarten")."\" onclick=\"GebietStarten('".$db->convert_html_chars($gebiet->bezeichnung)."','".$stunde."','".$minute."','".$sekunde."','".$gebiet_id."')\" /> ";
+		<input type=\"button\" class='btn btn-default btn-testtool' value=\"".$p->t("testtool/gebietStarten")."\" onclick=\"GebietStarten('".$db->convert_html_chars($gebiet->bezeichnung)."','".$stunde."','".$minute."','".$sekunde."','".$gebiet_id."')\" /> ";
 }
 else
 {
@@ -458,7 +458,18 @@ else
 if($frage->frage_id!='')
 {
 	$frage_id = $frage->frage_id;
+	$frage->bild = '';
+	$frage->audio = '';
+	$frage->text = '';
 	$frage->getFrageSprache($frage_id, $_SESSION['sprache_user']);
+	$fallbacksprache = $_SESSION['sprache_user'];
+
+	// Fallback auf DEFAULT_LANGUAGE wenn keine Frage in der $_SESSION['sprache_user'] vorhanden ist
+	if ($frage->text == '' && $frage->bild == '' && $frage->audio == '')
+	{
+		$frage->getFrageSprache($frage_id, DEFAULT_LANGUAGE);
+		$fallbacksprache = DEFAULT_LANGUAGE;
+	}
 
 	if(!$demo)
 	{
@@ -489,9 +500,9 @@ if($frage->frage_id!='')
 				WHERE gebiet_id=".$db->db_add_param($gebiet_id, FHC_INTEGER)." AND pruefling_id=".$db->db_add_param($_SESSION['pruefling_id'], FHC_INTEGER)." AND demo=false ORDER BY nummer";
 
 		echo "
-            <table class='table' style='margin-top: 20px; margin-bottom: 40px;'>
-                <tr class='text-center'>
-        ";
+			<table class='table' style='margin-top: 20px; margin-bottom: 40px;'>
+				<tr class='text-center'>
+		";
 		//Nummern der Fragen Anzeigen
 		$result = $db->db_query($qry);
 		while($row = $db->db_fetch_object($result))
@@ -533,59 +544,67 @@ if($frage->frage_id!='')
 		echo " </tr></table>";
 
 	echo '
-        <br/>
-        <div class="row">
-            <div class="col-xs-12 col-lg-offset-1 col-lg-10">
-    ';
+		<br/>
+		<div class="row">
+			<div class="col-xs-12 col-lg-offset-1 col-lg-10">
+	';
 
 	//Bild und Text der Frage anzeigen
 	if($frage->bild!='')
-    {
-       echo '
-            <div class="row text-center">
-                <img class="testtoolfrage" src="bild.php?src=frage&amp;frage_id='. $frage->frage_id.'&amp;sprache='. $_SESSION["sprache_user"].'"></img><br/><br/><br/>
-            </div>
-        ';
-    }
+		{
+	   echo '
+			<div class="row text-center">
+				<img class="testtoolfrage" src="bild.php?src=frage&amp;frage_id='. $frage->frage_id.'&amp;sprache='.$fallbacksprache.'"></img><br/><br/><br/>
+			</div>
+		';
+	}
 	$timestamp = time();
 
 	//Sound einbinden
 	if($frage->audio!='')
 	{
 		echo '
-            <div class="row text-center">
-                <audio src="sound.php?src=frage&amp;frage_id='.$frage->frage_id.'&amp;sprache='.$_SESSION['sprache_user'].'&amp;'.$timestamp.'" controls="controls" type="audio/ogg">
-                     <div>
-                           <p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
-                     </div>
-                </audio>
-            </div>
-        ';
+			<div class="row text-center">
+				<audio src="sound.php?src=frage&amp;frage_id='.$frage->frage_id.'&amp;sprache='.$fallbacksprache.'&amp;'.$timestamp.'" controls="controls" type="audio/ogg">
+					 <div>
+						   <p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
+					 </div>
+				</audio>
+			</div>
+		';
 	}
 
-    $display_well = $frage->nummer == 0 ? '' : 'well'; // don't style frage 0 because this is always the introduction to gebiet
-    echo '
-        <div class="row">
-            <div class="col-xs-offset-1 col-xs-10 col-sm-offset-2 col-sm-8">
-                <div class="'. $display_well. ' text-center">'. $frage->text. '</div>
-            </div>
-        </div>
-    ';
+	$display_well = $frage->nummer == 0 ? '' : 'well'; // don't style frage 0 because this is always the introduction to gebiet
+	echo '
+		<div class="row">
+			<div class="col-xs-offset-1 col-xs-10 col-sm-offset-2 col-sm-8">
+				<div class="'. $display_well. ' text-center">'. $frage->text. '</div>
+			</div>
+		</div>
+	';
 
-    //Vorschlaege laden
+	//Vorschlaege laden
 	$vs = new vorschlag();
 	$vs->getVorschlag($frage->frage_id, $_SESSION['sprache_user'], $gebiet->zufallvorschlag);
+
+	// Fallback auf DEFAULT_LANGUAGE wenn kein Vorschlag in der $_SESSION['sprache_user'] vorhanden ist
+	if (isset($vs->result[0]) && $vs->result[0]->text == '' && $vs->result[0]->bild == '' && $vs->result[0]->audio == '')
+	{
+		$vs = new vorschlag();
+		$vs->getVorschlag($frage->frage_id, DEFAULT_LANGUAGE, $gebiet->zufallvorschlag);
+	}
+
 	$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
 	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
 	echo '
-	    <div class="row text-center">
-            <table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">
-                <tr>
-    ';
+		<div class="row text-center">
+			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">
+				<tr>
+	';
 	$anzahl = 1;
 	$beantwortet = false;
 	$cnt = 0; // counter für foreach-Schleife
-    $len = count($vs->result);
+	$len = count($vs->result);
 
 	//Antworten laden falls bereits vorhanden
 	$antwort = new antwort();
@@ -618,10 +637,10 @@ if($frage->frage_id!='')
 
 		echo '<br/>';
 		if($vorschlag->bild!='')
-			echo "<img class='testtoolvorschlag' src='bild.php?src=vorschlag&amp;vorschlag_id=$vorschlag->vorschlag_id&amp;sprache=".$_SESSION['sprache_user']."' /><br/>";
+			echo "<img class='testtoolvorschlag' src='bild.php?src=vorschlag&amp;vorschlag_id=$vorschlag->vorschlag_id&amp;sprache=".$fallbacksprache."' /><br/>";
 		if($vorschlag->audio!='')
 		{
-			echo '	<audio src="sound.php?src=vorschlag&amp;vorschlag_id='.$vorschlag->vorschlag_id.'&amp;sprache='.$_SESSION['sprache_user'].'" controls="controls">
+			echo '	<audio src="sound.php?src=vorschlag&amp;vorschlag_id='.$vorschlag->vorschlag_id.'&amp;sprache='.$fallbacksprache.'" controls="controls">
 						<div>
 							<p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
 						</div>
@@ -682,9 +701,9 @@ if($frage->frage_id!='')
 			}
 		}
 	}
-    echo '
-        </div>  <!--/.row-->
-    ';
+	echo '
+		</div>  <!--/.row-->
+	';
 	echo "</form>";
 	echo '</div></div>';
 	echo '<br/><br/><br/><br/><br/>';
diff --git a/cis/testtool/index.html b/cis/testtool/index.html
index ac39c5deb..02044a4bc 100644
--- a/cis/testtool/index.html
+++ b/cis/testtool/index.html
@@ -10,7 +10,7 @@
 	<frame src="topbar.php" name="topbar" scrolling="NO" noresize>
 	<frameset rows="*" cols="230,*" framespacing="0" frameborder="NO" border="0">
 		<frame id="menu_testtool" src="menu.php" name="menu" scrolling="AUTO" noresize>
-    	<frame id="content_testtool" style="padding-top: 24px; overflow: hidden;" src="login.php" name="content">
+    	<frame id="content_testtool" style="padding-top: 24px; overflow: hidden; padding-left: 10px" src="login.php" name="content">
   	</frameset>
 	<noframes>
 		<body>
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index e42a623b2..122e3cc2a 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -66,6 +66,7 @@ $gebdatum='';
 $date = new datum();
 
 $reload_menu=false;
+$alertmsg = '';
 
 $sg_var = new studiengang();
 
@@ -125,6 +126,9 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
 		{
 			if($rt->freigeschaltet)
 			{
+				// regenerate Session ID after Login
+				session_regenerate_id();
+
 				$pruefling = new pruefling();
 				if($pruefling->getPruefling($ps->prestudent_id))
 				{
@@ -186,7 +190,7 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
 
                 // * 1. Sprache über Ablauf Vorgaben ermitteln
 				$ablauf = new Ablauf();
-				$ablauf->getAblaufVorgabeStudiengang($firstPrio_studiengang_kz);
+				$ablauf->getAblaufGebiete($firstPrio_studiengang_kz, $firstPrio_studienplan_id);
 				$rt_sprache = '';
 
 				if(!empty($ablauf->result[0]))
@@ -221,17 +225,17 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
 			}
 			else
             {
-                echo '<span class="error">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</span>';
+	            $alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
 			}
 		}
 		else
 		{
-			echo '<span class="error">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</span>';
+			$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
 		}
 	}
 	else
 	{
-		echo '<span class="error">'.$p->t('testtool/geburtsdatumStimmtNichtUeberein').'</span>';
+		$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/geburtsdatumStimmtNichtUeberein').'</div>';
 	}
 }
 
@@ -272,7 +276,15 @@ else
 	//$prestudent_id=null;
 	$ps=new prestudent();
 	$datum=date('Y-m-d');
-	$ps->getPrestudentRT($datum);
+	// An der FHTW wird ein Bewerber nur einmal ausgegeben (1. Prio) falls es mehrere Bewerbungen gibt
+	/*if (CAMPUS_NAME == 'FH Technikum Wien')
+	{
+		$ps->getFirstPrioPrestudentRT($datum);
+	}
+	else*/
+	{
+		$ps->getPrestudentRT($datum);
+	}
 }
 
 
@@ -487,16 +499,19 @@ if (isset($prestudent_id))
                 echo '<tr>';
                 $stg = new Studiengang($ps_obj->studiengang_kz);
 
-                if($ps_obj->lastStatus == "Interessent")
+                if($ps_obj->lastStatus == "Interessent"
+	                || $ps_obj->lastStatus == "Bewerber"
+	                || $ps_obj->lastStatus == "Wartender"
+	                || $ps_obj->lastStatus == "Aufgenommener")
                 {
-                    echo '<td style="width: 50%;">'. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg->english : $stg->bezeichnung). '</td>';
+                    echo '<td style="width: 50%;">'. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg->english : $stg->bezeichnung). ' ('.$ps_obj->orgform_bezeichnung[$sprache_user].')</td>';
                     if($ps_obj->ausbildungssemester == '1')
                     {
                         echo '<td>'. $p->t('testtool/regulaererEinstieg'). ' (1. Semester)</td>';
                     }
                     elseif($ps_obj->ausbildungssemester == '3')
                     {
-                        echo '<td>'. $p->t('testtool/quereinstieg'). ' (3.Semester)</td>';
+                        echo '<td>'. $p->t('testtool/quereinstieg'). ' (3. Semester)</td>';
                     }
                 }
                 // wenn letzter Status \'Abgewiesener\' ist, dann als solchen kennzeichnen
@@ -561,7 +576,8 @@ else // LOGIN Site (vor Login)
     echo '<div class="col-xs-11">';
 
 //    Welcome text
-    echo '
+	echo $alertmsg;
+	echo '
         <div class="row" style="margin-bottom: 10%; margin-top: 3%;">
             <div class="col-xs-6 text-center" style="border-right: 1px solid lightgrey;">
                 <h1 style="white-space: normal">Herzlich Willkommen zum Reihungstest</h1><br><br>
@@ -612,7 +628,7 @@ else // LOGIN Site (vor Login)
     echo '<div class="form-group"> ';
     echo '<label for="datepicker" class="col-sm-offset-1 col-sm-4 control-label">Geburtsdatum | Date of Birth</label>';
     echo '<div class="col-sm-3">';
-    echo '<input type="text" id="datepicker" class="form-control" name="gebdatum" value="'.$date->formatDatum($gebdatum,'d.m.Y').'">';
+    echo '<input type="text" id="datepicker" class="form-control" name="gebdatum" value="'.$date->formatDatum($gebdatum,'d.m.Y').'" placeholder="DD.MM.YYYY">';
     echo '</div>'; // end col-xs
     echo '</div>'; // end form-group
 
diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
index 4d075ee9a..8a8c245de 100644
--- a/cis/testtool/menu.php
+++ b/cis/testtool/menu.php
@@ -69,7 +69,7 @@ if (isset($_SESSION['pruefling_id']))
 	$result = $db->db_query($qry);
 
 	echo '<table width="100%" border="0" cellspacing="0" cellpadding="0" style="border-right-width:1px;border-right-color:#BCBCBC; border-collapse: separate;
-    border-spacing: 0 3px;">';
+	border-spacing: 0 3px;">';
 
 // Link zur Startseite
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
@@ -78,16 +78,16 @@ if (isset($_SESSION['pruefling_id']))
 
 // Link zur Einleitung
 	if ($content_id = $db->db_fetch_object($result))
-    {
+	{
 		if($content_id->content_id!='')
-        {
+		{
 			echo '
-                <tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-                    <a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" target="content">'.$p->t('testtool/einleitung').'</a>
-                </td></tr>
-            ';
-        }
-    }
+				<tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
+					<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" target="content">'.$p->t('testtool/einleitung').'</a>
+				</td></tr>
+			';
+		}
+	}
 	echo '<tr><td style="padding-left: 20px;" nowrap>';
 
 	$studiengang_kz = (isset($_SESSION['studiengang_kz'])) ? $_SESSION['studiengang_kz'] : '';
@@ -98,78 +98,78 @@ if (isset($_SESSION['pruefling_id']))
 
 	/**
 	 * Spaltennamen-Aliase extrahieren um sie im Outer-Select verwenden zu können
-     * $bezeichnung_mehrsprachig liefert: bezeichnung_mehrsprachig[1] as bezeichnung_mehrsprachig_1,...
-     * $bezeichnung_mehrsprachig_sel liefert: bezeichnung_mehrsprachig_1, bezeichnung_mehrsprachig_2,...
+	 * $bezeichnung_mehrsprachig liefert: bezeichnung_mehrsprachig[1] as bezeichnung_mehrsprachig_1,...
+	 * $bezeichnung_mehrsprachig_sel liefert: bezeichnung_mehrsprachig_1, bezeichnung_mehrsprachig_2,...
 	 */
 	$bezeichnung_mehrsprachig_sel = explode(",", $bezeichnung_mehrsprachig);
 	foreach ($bezeichnung_mehrsprachig_sel as &$bm)
-    {
-        $bm = strrchr($bm, ' as ');
-    }
+	{
+		$bm = strrchr($bm, ' as ');
+	}
 	$bezeichnung_mehrsprachig_sel = implode(', ', $bezeichnung_mehrsprachig_sel);
 
 	/**
 	 * Reihungstestgebiete der Person ermitteln; Zusammenfassen, falls RT für mehrere Studien
-     * 1. Aktuelle Prestudenten zur Person über den Prüfling ermitteln,
-     * 2. Einstiegssemester (Erstsemester/Quereinsteiger) und Studienplan pro Prestudent ermitteln,
-     * 3. RT-Gebiete falls vorhanden über Studienplan, sonst über STG ermitteln
-     * 4. Für Quereinsteiger zusätzlich auch Erstsemestrigen-Gebiete
+	 * 1. Aktuelle Prestudenten zur Person über den Prüfling ermitteln,
+	 * 2. Einstiegssemester (Erstsemester/Quereinsteiger) und Studienplan pro Prestudent ermitteln,
+	 * 3. RT-Gebiete falls vorhanden über Studienplan, sonst über STG ermitteln
+	 * 4. Für Quereinsteiger zusätzlich auch Erstsemestrigen-Gebiete
 	 */
 	$qry = "
-        WITH prestudent_data AS
-        (
-        SELECT DISTINCT ON (prestudent_id)
-	        prestudent_id,
-	        studienplan_id,
-            studiengang_kz,
-            typ,
+		WITH prestudent_data AS
+		(
+		SELECT DISTINCT ON (prestudent_id)
+			prestudent_id,
+			studienplan_id,
+			studiengang_kz,
+			typ,
 			tbl_studiengangstyp.bezeichnung AS typ_bz,
-	        ausbildungssemester AS semester
-        FROM
-	        public.tbl_prestudentstatus AS ps_status
-        JOIN
-	        public.tbl_prestudent USING (prestudent_id)
-        JOIN
-            public.tbl_studiengang USING (studiengang_kz)
-        JOIN
-            public.tbl_studiengangstyp USING (typ)
-        WHERE
-	        tbl_prestudent.person_id = (
-		        SELECT
-			        person_id
-		        FROM
-			        public.tbl_prestudent
-		        WHERE
-			        prestudent_id = ".$db->db_add_param($_SESSION['prestudent_id'])."
-	        )
+			ausbildungssemester AS semester
+		FROM
+			public.tbl_prestudentstatus AS ps_status
+		JOIN
+			public.tbl_prestudent USING (prestudent_id)
+		JOIN
+			public.tbl_studiengang USING (studiengang_kz)
+		JOIN
+			public.tbl_studiengangstyp USING (typ)
+		WHERE
+			tbl_prestudent.person_id = (
+				SELECT
+					person_id
+				FROM
+					public.tbl_prestudent
+				WHERE
+					prestudent_id = ".$db->db_add_param($_SESSION['prestudent_id'])."
+			)
 
-        /* Filter only future studiensemester (incl. actual one) */
-        AND
-	        studiensemester_kurzbz IN (
-		        SELECT
-			        studiensemester_kurzbz
-		        FROM
-			        public.tbl_studiensemester
-		        WHERE
-			        ende > now()
-	        )
+		/* Filter only future studiensemester (incl. actual one) */
+		AND
+			studiensemester_kurzbz IN (
+				SELECT
+					studiensemester_kurzbz
+				FROM
+					public.tbl_studiensemester
+				WHERE
+					ende > now()
+			)
 
-        /* Filter out all Abgewiesene */
-        AND NOT EXISTS (
-            SELECT
-                1
-            FROM
-                tbl_prestudentstatus
-            WHERE
-                status_kurzbz = 'Abgewiesener'
-            AND
-                prestudent_id = ps_status.prestudent_id
-        )
+		/* Filter out all Abgewiesene */
+		AND NOT EXISTS (
+			SELECT
+				1
+			FROM
+				tbl_prestudentstatus
+			WHERE
+				status_kurzbz = 'Abgewiesener'
+			AND
+				prestudent_id = ps_status.prestudent_id
+		)
 
-        AND
-	        status_kurzbz = 'Interessent'";
+		AND
+			status_kurzbz = 'Interessent'";
 
-            /*  If the logged-in prestudents study is a Bachelor-study, filter only Bachelor-studies */
+			/*  If the logged-in prestudents study is a Bachelor-study, filter only Bachelor-studies */
 			if ($stg->typ == 'b')
 			{
 				$qry .= "
@@ -184,86 +184,95 @@ if (isset($_SESSION['pruefling_id']))
 
 			$qry .= "
 
-        /* Order to get last semester when using distinct on */
-        ORDER BY
-	        prestudent_id,
-	        datum DESC,
-	        ps_status.insertamum DESC,
-	        ps_status.ext_id DESC
-        )
+		/* Order to get last semester when using distinct on */
+		ORDER BY
+			prestudent_id,
+			datum DESC,
+			ps_status.insertamum DESC,
+			ps_status.ext_id DESC
+		)
 
 
-        SELECT DISTINCT ON
-            (gebiet_id, semester)
-	        semester,
-	        gebiet_id,
-	        STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
-	        bezeichnung,
-	        MIN(reihung) AS reihung,
-            ". $bezeichnung_mehrsprachig_sel. "
-        FROM (
-            SELECT
-                *
-            FROM (
-                (SELECT
-                    prestudent_data.semester AS ps_sem,
-                    gebiet_id,
-                    bezeichnung,
-                    tbl_ablauf.studienplan_id,
-                    tbl_ablauf.studiengang_kz,
-                    tbl_ablauf.semester,
-                    tbl_ablauf.reihung,
-                    ".$bezeichnung_mehrsprachig. "
-                FROM
-                    prestudent_data
-                JOIN
-                    testtool.tbl_ablauf USING (studiengang_kz)
-                JOIN
-                    testtool.tbl_gebiet USING (gebiet_id)
-                WHERE
-                    (prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-                OR
-                    (prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-                )
+		SELECT DISTINCT ON
+			(gebiet_id, semester, reihung)
+			semester,
+			gebiet_id,
+			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
+			bezeichnung,
+			MIN(reihung) AS reihung,
+			". $bezeichnung_mehrsprachig_sel. "
+		FROM (
+			SELECT
+				*
+			FROM (
+				(SELECT
+					prestudent_data.semester AS ps_sem,
+					gebiet_id,
+					bezeichnung,
+					tbl_ablauf.studienplan_id,
+					tbl_ablauf.studiengang_kz,
+					tbl_ablauf.semester,
+					tbl_ablauf.reihung,
+					".$bezeichnung_mehrsprachig. "
+				FROM
+					prestudent_data
+				JOIN
+					testtool.tbl_ablauf USING (studiengang_kz)
+				JOIN
+					testtool.tbl_gebiet USING (gebiet_id)
+				WHERE
+					(
+						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+						OR
+						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					)
+				AND (   
+						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
+						OR
+						tbl_ablauf.studienplan_id IS NULL
+					)
+				)
 
-                UNION
+				UNION
 
-                (
-                SELECT
-                    prestudent_data.semester AS ps_sem,
-                    gebiet_id,
-                    bezeichnung,
-                    tbl_ablauf.studienplan_id,
-                    tbl_ablauf.studiengang_kz,
-                    tbl_ablauf.semester,
-                    tbl_ablauf.reihung,
-                    ". $bezeichnung_mehrsprachig. "
-                FROM
-                    prestudent_data
-                JOIN
-                    testtool.tbl_ablauf USING (studienplan_id)
-                JOIN
-                    testtool.tbl_gebiet USING (gebiet_id)
-                WHERE
-                    (prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-                OR
-                    (prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-                )
-            ) temp
-        ) temp2
+				(
+				SELECT
+					prestudent_data.semester AS ps_sem,
+					gebiet_id,
+					bezeichnung,
+					tbl_ablauf.studienplan_id,
+					tbl_ablauf.studiengang_kz,
+					tbl_ablauf.semester,
+					tbl_ablauf.reihung,
+					". $bezeichnung_mehrsprachig. "
+				FROM
+					prestudent_data
+				JOIN
+					testtool.tbl_ablauf USING (studienplan_id)
+				JOIN
+					testtool.tbl_gebiet USING (gebiet_id)
+				WHERE
+					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+				OR
+					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+				)
+			) temp
+		) temp2
 
-        GROUP BY
-            semester,
-             gebiet_id,
-             bezeichnung,
+		GROUP BY
+			semester,
+			 gebiet_id,
+			 bezeichnung,
 			". $bezeichnung_mehrsprachig_sel ." 
 
-        ORDER BY
-	        semester,
-	        gebiet_id
-        ";
+		ORDER BY
+			semester,
+			reihung,
+			gebiet_id
+		";
 
 	$result = $db->db_query($qry);
+	$anzahlGebiete = $db->db_num_rows($result);
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	while($row = $db->db_fetch_object($result))
@@ -355,10 +364,22 @@ if (isset($_SESSION['pruefling_id']))
 				$class='ItemTesttool';
 			}
 
+			// Fallback für Gebietbezeichnung, falls nicht in gewählter Sprache vorhanden
+			$gebietbezeichnung = $sprache_mehrsprachig->parseSprachResult("bezeichnung_mehrsprachig", $row)[$sprache_user];
+			if ($gebietbezeichnung == '')
+			{
+				$gebietbezeichnung = $sprache_mehrsprachig->parseSprachResult("bezeichnung_mehrsprachig", $row)[DEFAULT_LANGUAGE];
+
+				if ($gebietbezeichnung == '')
+				{
+					$gebietbezeichnung = $row->bezeichnung;
+				}
+			}
+
 			echo '<tr>
 					<!--<td width="10" class="ItemTesttoolLeft" nowrap>&nbsp;</td>-->
 						<td class="'.$class.'">
-							<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="document.location.reload()" target="content" style="'.$style.'">'.$sprache_mehrsprachig->parseSprachResult("bezeichnung_mehrsprachig", $row)[$sprache_user].'</a>
+							<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="document.location.reload()" target="content" style="'.$style.'">'.$gebietbezeichnung.'</a>
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
@@ -368,9 +389,13 @@ if (isset($_SESSION['pruefling_id']))
 			$invalid_gebiete = true;
 		}
 	}
-	echo '</table>';
+	if ($anzahlGebiete > 0)
+	{
+		echo '</table>';
+	}
 
 	// Link zum Logout
+
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
 			<a class="ItemTesttool navButton" href="login.php?logout=true" target="content">Logout</a>
 		</td></tr>';
diff --git a/composer.json b/composer.json
index 636c6da42..145927be0 100644
--- a/composer.json
+++ b/composer.json
@@ -177,9 +177,9 @@
 			"type": "package",
 			"package": {
 				"name": "nicolaskruchten/pivottable",
-				"version": "2.15.0",
+				"version": "2.23.0",
 				"dist": {
-					"url": "https://github.com/nicolaskruchten/pivottable/archive/v2.21.0.zip",
+					"url": "https://github.com/nicolaskruchten/pivottable/archive/v2.23.0.zip",
 					"type": "zip"
 				}
 			}
@@ -244,65 +244,72 @@
 	"require": {
 		"php": ">=5.6.40",
 
-		"afarkas/html5shiv": "^3.7",
-		"alvaro-prieto/colResizable": "^1.6",
+		"afarkas/html5shiv": "3.7.*",
 
-		"borgar/textile-js": "2.0.4",
-		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
-
-		"chriskacerguis/codeigniter-restserver": "^3.0",
-		"christianbach/tablesorter": "^1.0",
+		"chriskacerguis/codeigniter-restserver": "3.0.*",
+		"christianbach/tablesorter": "1.0.*",
 		"codeigniter/framework": "3.*",
-		"components/jquery": "^3.2",
-		"components/jqueryui": "^1.12",
-		"components/font-awesome": "^4.7",
-		"components/angular.js": "1.3.16",
+		"components/jquery": "3.*",
+		"components/jqueryui": "1.*",
+		"components/font-awesome": "4.*",
+		"components/angular.js": "1.3.*",
+
+		"dapphp/securimage": "3.6.7",
 
 		"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",
-
-		"moment/momentjs": "2.24.0",
 		"michelf/php-markdown": "1.5.0",
 		"ml/json-ld": "1.*",
-		"mottie/tablesorter": "^2.29",
+		"mottie/tablesorter": "2.*",
 
-		"nategood/httpful": "^0.2.20",
-		"netcarver/textile": "^3.5",
-		"nicolaskruchten/pivottable": "^2.21.0",
+		"nategood/httpful": "0.2.*",
+		"netcarver/textile": "3.7.*",
 
-		"olifolkerd/tabulator": "4.2.7",
+		"phpseclib/phpseclib": "2.0.*",
 
-		"phpseclib/phpseclib": "^2.0",
+		"tinymce/tinymce": "4.9.*",
 
-		"rmariuzzo/jquery-checkboxes": "1.0.7",
-		"rougin/combustor": "1.1.*",
-		"rougin/refinery": "*",
-
-		"scottjehl/Respond": "^1.4",
-
-		"tapmodo/Jcrop": "^2.0",
-		"tinymce/tinymce": "4.*",
-		"tomazdragar/SimpleCropper": "^1.0",
-		"twbs/bootstrap": "^3.3",
+		"twbs/bootstrap": "3.4.*",
 
 		"zetacomponents/workflow": "1.*",
 		"zetacomponents/document": "1.*",
 		"zetacomponents/workflow-database-tiein": "1.*",
-		"zetacomponents/workflow-event-log-tiein": "1.*"
+		"zetacomponents/workflow-event-log-tiein": "1.*",
+
+
+		"alvaro-prieto/colResizable": "1.6",
+
+		"BlackrockDigital/startbootstrap-sb-admin-2": "3.3.*",
+		"borgar/textile-js": "2.0.4",
+
+		"fgelinas/timepicker": "0.3.3",
+
+		"joeldbirch/superfish": "1.7.*",
+		"jquery/jqueryV1": "1.*",
+		"jquery/jqueryV2": "2.*",
+		"jquery/sizzle": "1.0.*",
+		"jquery-archive/jquery-metadata": "1.0.*",
+		"json-forms": "1.4.0",
+		"jsoneditor": "5.5.6",
+
+		"ludo/jquery-treetable": "3.2.0",
+
+		"moment/momentjs": "2.24.0",
+
+		"nicolaskruchten/pivottable": "2.23.0",
+
+		"olifolkerd/tabulator": "4.2.7",
+
+		"rmariuzzo/jquery-checkboxes": "1.0.7",
+
+		"scottjehl/Respond": "1.4.2",
+
+		"tapmodo/Jcrop": "2.0.4",
+		"tomazdragar/SimpleCropper": "1.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
diff --git a/composer.lock b/composer.lock
index 0b869361a..d707ce776 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": "44a02c1e72626f05e682de2030c8adad",
-    "content-hash": "e0898c2ba3d18593851989029e54bedb",
+    "hash": "d9941245360c86434d18413999bdc812",
+    "content-hash": "fbeb5d4ef943f6d1d55220cb844d11f1",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -47,7 +47,7 @@
             ],
             "description": "Defacto way to enable use of HTML5 sectioning elements in legacy Internet Explorer.",
             "homepage": "http://paulirish.com/2011/the-history-of-the-html5-shiv/",
-            "time": "2015-07-20T20:04:00+00:00"
+            "time": "2015-07-20 20:04:00"
         },
         {
             "name": "alvaro-prieto/colResizable",
@@ -126,20 +126,20 @@
             },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
-            "time": "2016-09-02T11:31:54+00:00"
+            "time": "2016-09-02 11:31:54"
         },
         {
             "name": "codeigniter/framework",
-            "version": "3.1.10",
+            "version": "3.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bcit-ci/CodeIgniter.git",
-                "reference": "c576995304fc3609cca0b7b92d1b2cd611ec82f5"
+                "reference": "b73eb19aed66190c10c9cad476da7c36c271d6dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/c576995304fc3609cca0b7b92d1b2cd611ec82f5",
-                "reference": "c576995304fc3609cca0b7b92d1b2cd611ec82f5",
+                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/b73eb19aed66190c10c9cad476da7c36c271d6dc",
+                "reference": "b73eb19aed66190c10c9cad476da7c36c271d6dc",
                 "shasum": ""
             },
             "require": {
@@ -159,7 +159,7 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
-            "time": "2019-01-16T15:49:35+00:00"
+            "time": "2019-09-19 12:08:45"
         },
         {
             "name": "components/angular.js",
@@ -463,7 +463,7 @@
             ],
             "description": "Shim repository for Angular.js",
             "homepage": "http://angularjs.org",
-            "time": "2015-06-07T20:10:38+00:00"
+            "time": "2015-06-07 20:10:38"
         },
         {
             "name": "components/font-awesome",
@@ -498,20 +498,20 @@
                 "OFL-1.1"
             ],
             "description": "The iconic font designed for use with Twitter Bootstrap.",
-            "time": "2016-10-25T10:56:23+00:00"
+            "time": "2016-10-25 10:56:23"
         },
         {
             "name": "components/jquery",
-            "version": "3.3.1",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/components/jquery.git",
-                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649"
+                "reference": "901828b7968b18319e377dc23d466f28426ee083"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/components/jquery/zipball/459648cda77875519c5da3ae1dd0ed5d170aa649",
-                "reference": "459648cda77875519c5da3ae1dd0ed5d170aa649",
+                "url": "https://api.github.com/repos/components/jquery/zipball/901828b7968b18319e377dc23d466f28426ee083",
+                "reference": "901828b7968b18319e377dc23d466f28426ee083",
                 "shasum": ""
             },
             "type": "component",
@@ -540,7 +540,7 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
-            "time": "2018-03-04T13:23:48+00:00"
+            "time": "2019-10-23 05:15:13"
         },
         {
             "name": "components/jqueryui",
@@ -625,7 +625,56 @@
                 }
             ],
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
-            "time": "2016-09-16T05:47:55+00:00"
+            "time": "2016-09-16 05:47:55"
+        },
+        {
+            "name": "dapphp/securimage",
+            "version": "3.6.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dapphp/securimage.git",
+                "reference": "1ecb884797c66e01a875c058def46c85aecea45b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dapphp/securimage/zipball/1ecb884797c66e01a875c058def46c85aecea45b",
+                "reference": "1ecb884797c66e01a875c058def46c85aecea45b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-gd": "*",
+                "php": ">=5.4"
+            },
+            "suggest": {
+                "ext-pdo": "For database storage support",
+                "ext-pdo_mysql": "For MySQL database support",
+                "ext-pdo_sqlite": "For SQLite3 database support"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "securimage.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Drew Phillips",
+                    "email": "drew@drew-phillips.com"
+                }
+            ],
+            "description": "PHP CAPTCHA Library",
+            "homepage": "https://www.phpcaptcha.org",
+            "keywords": [
+                "Forms",
+                "anti-spam",
+                "captcha",
+                "security"
+            ],
+            "time": "2018-03-09 06:07:41"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -687,7 +736,7 @@
                 "rdfa",
                 "sparql"
             ],
-            "time": "2015-02-27T09:45:49+00:00"
+            "time": "2015-02-27 09:45:49"
         },
         {
             "name": "fgelinas/timepicker",
@@ -697,26 +746,20 @@
                 "url": "https://github.com/fgelinas/timepicker",
                 "reference": "9aebe413b784696639220bc36b7c1e8a30fda129"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://fgelinas.com/code/timepicker/releases/jquery-ui-timepicker-0.3.3.zip",
-                "reference": null,
-                "shasum": null
-            },
             "type": "library"
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.8.0",
+            "version": "v1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+                "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fc10d778e4b84d5bd315dad194661e091d307c6f",
+                "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f",
                 "shasum": ""
             },
             "require": {
@@ -725,12 +768,12 @@
             "require-dev": {
                 "ext-intl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^1.5"
+                "squizlabs/php_codesniffer": "^2.9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -753,7 +796,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2018-07-12T10:23:15+00:00"
+            "time": "2019-12-12 13:22:17"
         },
         {
             "name": "joeldbirch/superfish",
@@ -895,58 +938,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2014-08-25T02:48:14+00:00"
-        },
-        {
-            "name": "kevinlebrun/colors.php",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kevinlebrun/colors.php.git",
-                "reference": "cdda5eee41314b87cd5a8bb91b1ffc7c0210e673"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kevinlebrun/colors.php/zipball/cdda5eee41314b87cd5a8bb91b1ffc7c0210e673",
-                "reference": "cdda5eee41314b87cd5a8bb91b1ffc7c0210e673",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "satooshi/php-coveralls": "1.0.*",
-                "squizlabs/php_codesniffer": "1.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Colors": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kevin Le Brun",
-                    "email": "lebrun.k@gmail.com",
-                    "homepage": "http://kevinlebrun.fr",
-                    "role": "developer"
-                }
-            ],
-            "description": "Colors for PHP CLI scripts",
-            "homepage": "https://github.com/kevinlebrun/colors.php",
-            "keywords": [
-                "cli",
-                "color",
-                "colors",
-                "console",
-                "shell"
-            ],
-            "time": "2018-05-30T08:34:23+00:00"
+            "time": "2014-08-25 02:48:14"
         },
         {
             "name": "kingsquare/json-schema-form",
@@ -980,11 +972,17 @@
                 }
             ],
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
-            "time": "2014-07-10T12:27:19+00:00"
+            "time": "2014-07-10 12:27:19"
         },
         {
             "name": "ludo/jquery-treetable",
             "version": "3.2.0",
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/ludo/jquery-treetable/archive/3.2.0.zip",
+                "reference": null,
+                "shasum": null
+            },
             "type": "library"
         },
         {
@@ -1036,7 +1034,7 @@
             "keywords": [
                 "markdown"
             ],
-            "time": "2015-03-01T12:03:08+00:00"
+            "time": "2015-03-01 12:03:08"
         },
         {
             "name": "ml/iri",
@@ -1083,7 +1081,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2014-01-21T13:43:39+00:00"
+            "time": "2014-01-21 13:43:39"
         },
         {
             "name": "ml/json-ld",
@@ -1132,7 +1130,7 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2018-11-18T20:26:18+00:00"
+            "time": "2018-11-18 20:26:18"
         },
         {
             "name": "moment/momentjs",
@@ -1147,16 +1145,16 @@
         },
         {
             "name": "mottie/tablesorter",
-            "version": "v2.31.1",
+            "version": "v2.31.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Mottie/tablesorter.git",
-                "reference": "fa56764ad5630ed3ab9da4a30fdb8dd34bfbaf1f"
+                "reference": "6a32e5acc294be5b6c420c83d70d66e096533d8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/fa56764ad5630ed3ab9da4a30fdb8dd34bfbaf1f",
-                "reference": "fa56764ad5630ed3ab9da4a30fdb8dd34bfbaf1f",
+                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/6a32e5acc294be5b6c420c83d70d66e096533d8f",
+                "reference": "6a32e5acc294be5b6c420c83d70d66e096533d8f",
                 "shasum": ""
             },
             "require": {
@@ -1177,11 +1175,11 @@
             ],
             "authors": [
                 {
-                    "name": "Rob Garrison",
-                    "email": "wowmotty@gmail.com"
+                    "name": "Christian Bach"
                 },
                 {
-                    "name": "Christian Bach"
+                    "name": "Rob Garrison",
+                    "email": "wowmotty@gmail.com"
                 }
             ],
             "description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
@@ -1194,7 +1192,7 @@
                 "sorting",
                 "table"
             ],
-            "time": "2018-11-20T21:54:28+00:00"
+            "time": "2019-12-01 13:49:52"
         },
         {
             "name": "nategood/httpful",
@@ -1244,20 +1242,20 @@
                 "rest",
                 "restful"
             ],
-            "time": "2015-10-26T16:11:30+00:00"
+            "time": "2015-10-26 16:11:30"
         },
         {
             "name": "netcarver/textile",
-            "version": "v3.7.2",
+            "version": "v3.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/textile/php-textile.git",
-                "reference": "c24d68d9f4d099f9c2434e71024f2a6140dc1594"
+                "reference": "1846fd5aeace2a0dd57c4f770f693d12bcd7fa26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/textile/php-textile/zipball/c24d68d9f4d099f9c2434e71024f2a6140dc1594",
-                "reference": "c24d68d9f4d099f9c2434e71024f2a6140dc1594",
+                "url": "https://api.github.com/repos/textile/php-textile/zipball/1846fd5aeace2a0dd57c4f770f693d12bcd7fa26",
+                "reference": "1846fd5aeace2a0dd57c4f770f693d12bcd7fa26",
                 "shasum": ""
             },
             "require": {
@@ -1297,50 +1295,18 @@
                 "plaintext",
                 "textile"
             ],
-            "time": "2019-01-26T17:03:58+00:00"
+            "time": "2020-01-08 21:13:37"
         },
         {
             "name": "nicolaskruchten/pivottable",
-            "version": "v2.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nicolaskruchten/pivottable.git",
-                "reference": "a9cabee5382be0aaf0984ac906d9fa2e0376d2c1"
-            },
+            "version": "2.23.0",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nicolaskruchten/pivottable/zipball/a9cabee5382be0aaf0984ac906d9fa2e0376d2c1",
-                "reference": "a9cabee5382be0aaf0984ac906d9fa2e0376d2c1",
-                "shasum": ""
+                "url": "https://github.com/nicolaskruchten/pivottable/archive/v2.23.0.zip",
+                "reference": null,
+                "shasum": null
             },
-            "require": {
-                "components/jquery": ">=1.9"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Kruchten",
-                    "email": "nicolas@kruchten.com"
-                }
-            ],
-            "description": "Javascript Pivot Table (aka Pivot Grid, Pivot Chart, Cross-Tab) implementation with drag'n'drop.",
-            "homepage": "https://pivottable.js.org/",
-            "keywords": [
-                "crosstab",
-                "grid",
-                "jquery",
-                "jquery-plugin",
-                "pivot",
-                "pivotchart",
-                "pivotgrid",
-                "pivottable",
-                "table"
-            ],
-            "time": "2018-11-04T18:21:09+00:00"
+            "type": "library"
         },
         {
             "name": "olifolkerd/tabulator",
@@ -1355,16 +1321,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.20",
+            "version": "2.0.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "d6819a55b05e123db1e881d8b230d57f912126be"
+                "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d6819a55b05e123db1e881d8b230d57f912126be",
-                "reference": "d6819a55b05e123db1e881d8b230d57f912126be",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
+                "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
                 "shasum": ""
             },
             "require": {
@@ -1398,28 +1364,28 @@
             "authors": [
                 {
                     "name": "Jim Wigginton",
-                    "role": "Lead Developer",
-                    "email": "terrafrost@php.net"
+                    "email": "terrafrost@php.net",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Patrick Monnerat",
-                    "role": "Developer",
-                    "email": "pm@datasphere.ch"
+                    "email": "pm@datasphere.ch",
+                    "role": "Developer"
                 },
                 {
                     "name": "Andreas Fischer",
-                    "role": "Developer",
-                    "email": "bantu@phpbb.com"
+                    "email": "bantu@phpbb.com",
+                    "role": "Developer"
                 },
                 {
                     "name": "Hans-Jürgen Petrich",
-                    "role": "Developer",
-                    "email": "petrich@tronic-media.com"
+                    "email": "petrich@tronic-media.com",
+                    "role": "Developer"
                 },
                 {
                     "name": "Graham Campbell",
-                    "role": "Developer",
-                    "email": "graham@alt-three.com"
+                    "email": "graham@alt-three.com",
+                    "role": "Developer"
                 }
             ],
             "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
@@ -1443,414 +1409,19 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2019-03-10T16:53:45+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2018-11-20T15:27:04+00:00"
-        },
-        {
-            "name": "rdlowrey/auryn",
-            "version": "v1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rdlowrey/auryn.git",
-                "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rdlowrey/auryn/zipball/8c4dc07943599ba84f4f89eab8cf43efeef80395",
-                "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1",
-                "fabpot/php-cs-fixer": "~1.9",
-                "phpunit/phpunit": "^4.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Auryn\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dan Ackroyd",
-                    "email": "Danack@basereality.com",
-                    "homepage": "http://www.basereality.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Levi Morrison",
-                    "email": "levim@php.net",
-                    "homepage": "http://morrisonlevi.github.com/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@gmail.com",
-                    "homepage": "https://github.com/rdlowrey",
-                    "role": "Creator / Main Developer"
-                }
-            ],
-            "description": "Auryn is a dependency injector for bootstrapping object-oriented PHP applications.",
-            "homepage": "https://github.com/rdlowrey/auryn",
-            "keywords": [
-                "dependency injection",
-                "dic",
-                "ioc"
-            ],
-            "time": "2017-05-15T06:26:46+00:00"
+            "time": "2019-09-17 03:41:22"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
             "version": "1.0.7",
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/rmariuzzo/checkboxes.js/archive/v1.0.7.zip",
+                "reference": null,
+                "shasum": null
+            },
             "type": "library"
         },
-        {
-            "name": "rougin/blueprint",
-            "version": "v0.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rougin/blueprint.git",
-                "reference": "979dac046fb5d251dea6e8140b85463c7928a5e2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rougin/blueprint/zipball/979dac046fb5d251dea6e8140b85463c7928a5e2",
-                "reference": "979dac046fb5d251dea6e8140b85463c7928a5e2",
-                "shasum": ""
-            },
-            "require": {
-                "kevinlebrun/colors.php": "^1.0",
-                "php": ">=5.3.0",
-                "rdlowrey/auryn": "^1.0",
-                "symfony/console": "^2.7",
-                "symfony/yaml": "^2.7",
-                "twig/twig": "^1.19"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "bin": [
-                "bin/blueprint",
-                "bin/blueprint.php"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Rougin\\Blueprint\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "description": "A tool for generating files for your PHP projects",
-            "keywords": [
-                "blueprint",
-                "generator",
-                "php",
-                "template"
-            ],
-            "time": "2016-02-01T16:31:13+00:00"
-        },
-        {
-            "name": "rougin/combustor",
-            "version": "v1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rougin/combustor.git",
-                "reference": "ed775e2e1738b7682f2ca9e8ab6f968a7c8507dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rougin/combustor/zipball/ed775e2e1738b7682f2ca9e8ab6f968a7c8507dd",
-                "reference": "ed775e2e1738b7682f2ca9e8ab6f968a7c8507dd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "rougin/blueprint": "0.1.*",
-                "rougin/describe": "1.2.*",
-                "rougin/spark-plug": "0.2.*"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "suggest": {
-                "rougin/codeigniter": "Yet another way to install CodeIgniter via Composer",
-                "rougin/refinery": "A command line interface for Migrations Class in CodeIgniter"
-            },
-            "bin": [
-                "bin/combustor",
-                "bin/combustor.php"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Rougin\\Combustor\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rougin Royce Gutib",
-                    "email": "rougingutib@gmail.com",
-                    "homepage": "http://rougin.github.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A tool for speeding up workflow in CodeIgniter",
-            "homepage": "https://github.com/rougin/combustor",
-            "keywords": [
-                "codeigniter",
-                "combustor",
-                "generator",
-                "php"
-            ],
-            "time": "2016-02-14T10:36:58+00:00"
-        },
-        {
-            "name": "rougin/describe",
-            "version": "v1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rougin/describe.git",
-                "reference": "bd6b934d3ab2b28ddc936a5eb0cafa2eed02e360"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rougin/describe/zipball/bd6b934d3ab2b28ddc936a5eb0cafa2eed02e360",
-                "reference": "bd6b934d3ab2b28ddc936a5eb0cafa2eed02e360",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Rougin\\Describe\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rougin Royce Gutib",
-                    "email": "rougingutib@gmail.com",
-                    "homepage": "http://rougin.github.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Get the information about the database you're working on in PHP",
-            "homepage": "https://github.com/rougin/describe",
-            "keywords": [
-                "database",
-                "describe",
-                "php"
-            ],
-            "time": "2016-03-24T18:17:47+00:00"
-        },
-        {
-            "name": "rougin/refinery",
-            "version": "v0.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rougin/refinery.git",
-                "reference": "d32a49dfb61072dcf9619b181de9d9c762e6e26c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rougin/refinery/zipball/d32a49dfb61072dcf9619b181de9d9c762e6e26c",
-                "reference": "d32a49dfb61072dcf9619b181de9d9c762e6e26c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "rougin/blueprint": "0.1.*",
-                "rougin/describe": "1.2.*",
-                "rougin/spark-plug": "0.2.*"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "suggest": {
-                "rougin/codeigniter": "Yet another way to install CodeIgniter via Composer",
-                "rougin/combustor": "A tool for speeding up web development in CodeIgniter"
-            },
-            "bin": [
-                "bin/refinery",
-                "bin/refinery.php"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Rougin\\Refinery\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rougin Royce Gutib",
-                    "email": "rougingutib@gmail.com",
-                    "homepage": "http://rougin.github.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "'Ready-to-eat' migrations for Codeigniter",
-            "homepage": "https://github.com/rougin/refinery",
-            "keywords": [
-                "database",
-                "migrations",
-                "php",
-                "refinery"
-            ],
-            "time": "2016-03-04T16:55:32+00:00"
-        },
-        {
-            "name": "rougin/spark-plug",
-            "version": "v0.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rougin/spark-plug.git",
-                "reference": "71b7bafacf2854d4dc296cfdf354a6cf54417f9b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rougin/spark-plug/zipball/71b7bafacf2854d4dc296cfdf354a6cf54417f9b",
-                "reference": "71b7bafacf2854d4dc296cfdf354a6cf54417f9b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "suggest": {
-                "rougin/codeigniter": "Yet another way to install CodeIgniter via Composer",
-                "rougin/combustor": "A tool for speeding up web development in CodeIgniter",
-                "rougin/refinery": "A command line interface for Migrations Class in CodeIgniter"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Rougin\\SparkPlug\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rougin Royce Gutib",
-                    "email": "rougingutib@gmail.com",
-                    "homepage": "http://rougin.github.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Yet another way to access CodeIgniter's instance",
-            "homepage": "https://github.com/rougin/spark-plug",
-            "keywords": [
-                "codeigniter",
-                "instance",
-                "php",
-                "spark-plug"
-            ],
-            "time": "2015-10-23T08:27:10+00:00"
-        },
         {
             "name": "scottjehl/Respond",
             "version": "1.4.2",
@@ -1862,136 +1433,18 @@
             },
             "type": "library"
         },
-        {
-            "name": "symfony/console",
-            "version": "v2.8.50",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12",
-                "reference": "cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/debug": "^2.7.2|~3.0.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
-            },
-            "suggest": {
-                "psr/log-implementation": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-11-20T15:55:20+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
-                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/class-loader": "~2.8|~3.0",
-                "symfony/http-kernel": "~2.8|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-07-30T07:22:48+00:00"
-        },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.11.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "82ebae02209c21113908c229e9883c419720738a"
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
                 "shasum": ""
             },
             "require": {
@@ -2003,7 +1456,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -2019,13 +1472,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Gert de Pagter",
                     "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -2036,116 +1489,7 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.11-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2019-02-06T07:57:58+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.50",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "02c1859112aa779d9ab394ae4f3381911d84052b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/02c1859112aa779d9ab394ae4f3381911d84052b",
-                "reference": "02c1859112aa779d9ab394ae4f3381911d84052b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-11-11T11:18:13+00:00"
+            "time": "2019-11-27 13:56:44"
         },
         {
             "name": "tapmodo/Jcrop",
@@ -2160,16 +1504,16 @@
         },
         {
             "name": "tinymce/tinymce",
-            "version": "4.9.5",
+            "version": "4.9.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tinymce/tinymce-dist.git",
-                "reference": "5c6d8f4a6dda33b379068bb12678a2b2b2271fb4"
+                "reference": "912df2bc85015c758e32d1262219f1653bbf9783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/5c6d8f4a6dda33b379068bb12678a2b2b2271fb4",
-                "reference": "5c6d8f4a6dda33b379068bb12678a2b2b2271fb4",
+                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/912df2bc85015c758e32d1262219f1653bbf9783",
+                "reference": "912df2bc85015c758e32d1262219f1653bbf9783",
                 "shasum": ""
             },
             "type": "component",
@@ -2202,7 +1546,7 @@
                 "tinymce",
                 "wysiwyg"
             ],
-            "time": "2019-03-20T13:56:58+00:00"
+            "time": "2020-01-28 05:03:01"
         },
         {
             "name": "tomazdragar/SimpleCropper",
@@ -2263,30 +1607,30 @@
                 "responsive",
                 "web"
             ],
-            "time": "2019-02-13T15:55:38+00:00"
+            "time": "2019-02-13 15:55:38"
         },
         {
             "name": "twig/twig",
-            "version": "v1.42.2",
+            "version": "v1.42.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "21707d6ebd05476854805e4f91b836531941bcd4"
+                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/21707d6ebd05476854805e4f91b836531941bcd4",
-                "reference": "21707d6ebd05476854805e4f91b836531941bcd4",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
+                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
+                "php": ">=5.5.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0"
+                "symfony/debug": "^3.4|^4.2",
+                "symfony/phpunit-bridge": "^4.4@dev|^5.0"
             },
             "type": "library",
             "extra": {
@@ -2309,19 +1653,19 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "role": "Lead Developer",
                     "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "role": "Project Founder",
-                    "email": "armin.ronacher@active-4.com"
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Twig Team",
-                    "role": "Contributors",
-                    "homepage": "https://twig.symfony.com/contributors"
+                    "homepage": "https://twig.symfony.com/contributors",
+                    "role": "Contributors"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
                 }
             ],
             "description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -2329,7 +1673,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2019-05-14T11:59:08+00:00"
+            "time": "2019-11-11 16:49:32"
         },
         {
             "name": "zetacomponents/base",
@@ -2393,7 +1737,7 @@
             ],
             "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2017-11-28T11:30:00+00:00"
+            "time": "2017-11-28 11:30:00"
         },
         {
             "name": "zetacomponents/database",
@@ -2470,7 +1814,7 @@
             ],
             "description": "A lightweight database layer on top of PHP's PDO that allows you to utilize a database without having to take care of differences in SQL dialects.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2017-11-28T10:55:26+00:00"
+            "time": "2017-11-28 10:55:26"
         },
         {
             "name": "zetacomponents/document",
@@ -2521,7 +1865,7 @@
             ],
             "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2013-12-19T11:40:00+00:00"
+            "time": "2013-12-19 11:40:00"
         },
         {
             "name": "zetacomponents/workflow",
@@ -2587,7 +1931,7 @@
             ],
             "description": "The purpose of the Workflow component is to provide the core functionality of an activity-based workflow system including the definition and execution of workflow specifications.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2014-09-27T19:26:10+00:00"
+            "time": "2014-09-27 19:26:10"
         },
         {
             "name": "zetacomponents/workflow-database-tiein",
@@ -2654,7 +1998,7 @@
             ],
             "description": "Contains the database backend for the Workflow component.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2014-09-27T19:26:10+00:00"
+            "time": "2014-09-27 19:26:10"
         },
         {
             "name": "zetacomponents/workflow-event-log-tiein",
@@ -2714,7 +2058,7 @@
             ],
             "description": "Contains the EventLog listener for the Workflow component.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2007-12-17T09:04:44+00:00"
+            "time": "2007-12-17 09:04:44"
         }
     ],
     "packages-dev": [],
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 308058fba..05da2cb94 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -16,7 +16,6 @@ define('DEFAULT_MITARBEITER_FIXANGESTELLT', true);
 define('CIS_LEHRVERANSTALTUNG_NEWSGROUPS_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN',true);
-define('CIS_LEHRVERANSTALTUNG_UEBUNGSTOOL_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN',true);
@@ -109,6 +108,10 @@ define('FAS_ANWESENHEIT_GELB', 90);
 // Legt einen Prüfungstermin an wenn eine neue Note erfasst wird
 define('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN',false);
 
+// Legt fest ob die Uebernahme der Reihungstestpunkte im FAS moeglich ist
+// true | false
+define('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME', true);
+
 // Legt fest ob bei der Uebernahme der Reihungstestpunkte die Punkte
 //oder Prozentpunkte uebernommen werden true=Punkte, false=Prozentpunkte
 define('FAS_REIHUNGSTEST_PUNKTE', false);
diff --git a/content/fas.xul.php b/content/fas.xul.php
index 2aecae047..3b273cd54 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -96,7 +96,6 @@ foreach($addon_obj->result as $addon)
   <command id="menu-prefs-stpltable-stundenplandev:command" oncommand="stpltableChange('stundenplandev');"/>
   <command id="menu-prefs-kontofilterstg:command" oncommand="EinstellungenKontoFilterStgChange();"/>
   <command id="menu-prefs-number_displayed_past_studiensemester:command" oncommand="variableChangeValue('number_displayed_past_studiensemester');"/>
-  <command id="menu-statistic-koordinatorstunden:command" oncommand="StatistikPrintKoordinatorstunden();"/>
   <command id="menu-statistic-lehrauftraege:command" oncommand="StatistikPrintLehrauftraege();"/>
   <command id="menu-statistic-lvplanung:command" oncommand="StatistikPrintLVPlanung();"/>
   <command id="menu-statistic-lvplanungexcel:command" oncommand="StatistikPrintLVPlanungExcel();"/>
@@ -115,14 +114,12 @@ foreach($addon_obj->result as $addon)
   <command id="menu-statistic-substatistik-studentenprosemester-html:command" oncommand="StatistikPrintStudentenProSemester('');"/>
   <command id="menu-statistic-substatistik-alvsstatistik-excel:command" oncommand="StatistikPrintALVSStatistik('xls');"/>
   <command id="menu-statistic-substatistik-alvsstatistik-html:command" oncommand="StatistikPrintALVSStatistik('');"/>
-  <command id="menu-statistic-substatistik-lvplanunggesamtsj-excel:command" oncommand="StatistikPrintLvPlanungGesamtSJ();"/>
   <command id="menu-statistic-absolventenstatistik:command" oncommand="StatistikPrintAbsolventenstatistik();"/>
   <command id="menu-statistic-absolventenzahlen:command" oncommand="StatistikPrintAbsolventenZahlen();"/>
   <command id="menu-statistic-studentenstatistik:command" oncommand="StatistikPrintStudentenstatistik();"/>
   <command id="menu-statistic-oehbeitraege:command" oncommand="StatistikPrintOehBeitrag();"/>
   <command id="menu-statistic-mitarbeiterstatistik:command" oncommand="StatistikPrintMitarbeiterstatistik();"/>
   <command id="menu-statistic-studentendetails:command" oncommand="StatistikPrintStudentExportExtended();"/>
-  <command id="menu-statistic-lektorenstatistik:command" oncommand="StatistikPrintLektorenstatistik();"/>
   <command id="menu-statistic-stromanalyse:command" oncommand="StatistikPrintStromanalyse();"/>
   <command id="menu-dokumente-bewerberakt:command" oncommand="StudentPrintBewerberakt(event);"/>
   <command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung(event);"/>
@@ -317,12 +314,6 @@ foreach($addon_obj->result as $addon)
 			<menu id="menu-statistic-mitarbeiter" label="&menu-statistic-mitarbeiter.label;" accesskey="&menu-statistic-mitarbeiter.accesskey;">
 				<menupopup id="menu-statistic-mitarbeiter-popup">
 					<menuitem
-		               id        =  "menu-statistic-koordinatorstunden"
-		               key       =  "menu-statistic-koordinatorstunden:key"
-		               label     = "&menu-statistic-koordinatorstunden.label;"
-		               command   =  "menu-statistic-koordinatorstunden:command"
-		               accesskey = "&menu-statistic-koordinatorstunden.accesskey;"/>
-		            <menuitem
 		               id        =  "menu-statistic-lehrauftragsliste"
 		               key       =  "menu-statistic-lehrauftragsliste:key"
 		               label     = "&menu-statistic-lehrauftragsliste.label;"
@@ -422,23 +413,6 @@ foreach($addon_obj->result as $addon)
 				               accesskey = "&menu-statistic-substatistik-alvsstatistik-html.accesskey;"/>
 						</menupopup>
 					</menu>
-					<?php
-					if($rechte->isBerechtigt('admin'))
-					{
-						echo '
-						<menu id="menu-statistic-substatistik-lvplanunggesamtsj" label="&menu-statistic-substatistik-lvplanunggesamtsj.label;" accesskey="&menu-statistic-substatistik-lvplanunggesamtsj.accesskey;">
-							<menupopup id="menu-statistic-substatistik-lvplanunggesamtsj-popup">
-					             <menuitem
-					               id        =  "menu-statistic-substatistik-lvplanunggesamtsj-excel"
-					               key       =  "menu-statistic-substatistik-lvplanunggesamtsj-excel:key"
-					               label     = "&menu-statistic-substatistik-lvplanunggesamtsj-excel.label;"
-					               command   =  "menu-statistic-substatistik-lvplanunggesamtsj-excel:command"
-					               accesskey = "&menu-statistic-substatistik-lvplanunggesamtsj-excel.accesskey;"/>
-							</menupopup>
-						</menu>
-						';
-					}
-					?>
 					<menu id="menu-statistic-substatistik-bewerberstatistik" label="&menu-statistic-substatistik-bewerberstatistik.label;" accesskey="&menu-statistic-substatistik-bewerberstatistik.accesskey;">
 						<menupopup id="menu-statistic-substatistik-bewerberstatistik-popup">
 				             <menuitem
@@ -480,12 +454,6 @@ foreach($addon_obj->result as $addon)
 		               command   =  "menu-statistic-studentenstatistik:command"
 		               accesskey = "&menu-statistic-studentenstatistik.accesskey;"/>
 					<menuitem
-		               id        =  "menu-statistic-lektorenstatistik"
-		               key       =  "menu-statistic-lektorenstatistik:key"
-		               label     = "&menu-statistic-lektorenstatistik.label;"
-		               command   =  "menu-statistic-lektorenstatistik:command"
-		               accesskey = "&menu-statistic-lektorenstatistik.accesskey;"/>
-					<menuitem
 		               id        =  "menu-statistic-mitarbeiterstatistik"
 		               key       =  "menu-statistic-mitarbeiterstatistik:key"
 		               label     = "&menu-statistic-mitarbeiterstatistik.label;"
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index c0674d2f1..39571b32a 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -797,30 +797,6 @@ function loadURL(event)
         if (url) contentFrame.setAttribute('src', url);
 };
 
-// ****
-// * Liefert eine HTML Liste mit den Koordinatorstunden
-// * fuer einen Fachbereich
-// ****
-function StatistikPrintKoordinatorstunden()
-{
-	tree = document.getElementById('tree-organisationseinheit');
-
-	try
-	{
-		//Organisationseinheit holen
-		var col;
-		col = tree.columns ? tree.columns["organisationseinheit-treecol-oe_kurzbz"] : "organisationseinheit-treecol-oe_kurzbz";
-		var oe_kurzbz=tree.view.getCellText(tree.currentIndex,col);
-
-		window.open('<?php echo APP_ROOT ?>content/statistik/koordinatorstunden.php?oe_kurzbz='+oe_kurzbz,'Koordinatorstunden');
-	}
-	catch(e)
-	{
-		alert('Bitte einen Fachbereich auswaehlen');
-		return false;
-	}
-}
-
 // ****
 // * Erstellt das PDF File fuer die Lehrauftraege
 // * Studiengang muss ausgewaehlt sein
@@ -1209,16 +1185,6 @@ function StatistikPrintStudentenstatistik()
 	window.open('<?php echo APP_ROOT ?>content/statistik/studentenstatistik.php?stsem='+stsem,'Studentenstatistik');
 }
 
-// ****
-// * Liefert eine statistik ueber die Lektorenverteilung auf die Institute
-// ****
-function StatistikPrintLektorenstatistik()
-{
-	var stsem = getStudiensemester();
-
-	window.open('<?php echo APP_ROOT ?>content/statistik/lektorenstatistik.php?stsem='+stsem,'Lektorenstatistik');
-}
-
 // ****
 // * Liefert eine statistik ueber die Institutszuordnungen und Aufteilung auf intern/extern
 // ****
@@ -1300,7 +1266,7 @@ function MessageNew()
 	{
 		var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
 
-		var action = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/write/' + <?php echo $benutzer->person_id; ?>;
+		var action = '<?php echo APP_ROOT ?>index.ci.php/system/messages/FASMessages/writeTemplate/' + <?php echo $benutzer->person_id; ?>;
 
 		openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
 	}
@@ -1584,14 +1550,6 @@ function StatistikPrintALVSStatistik(format)
 	window.open('<?php echo APP_ROOT ?>content/statistik/alvsstatistik.php?format='+format,'ALVS-Statistik','');
 }
 
-// ****
-// * Oeffnet die LVPlanunggesamtSJ Statistik
-// ****
-function StatistikPrintLvPlanungGesamtSJ()
-{
-	window.open('<?php echo APP_ROOT ?>content/statistik/lvplanunggesamtsj.php','LVPlanungGesamtSJ','');
-}
-
 // ****
 // * Oeffnet Studenten/Semester Statistik
 // ****
diff --git a/content/lvplanung/lehrveranstaltungDBDML.php b/content/lvplanung/lehrveranstaltungDBDML.php
index d506f0459..5e4a3ba61 100644
--- a/content/lvplanung/lehrveranstaltungDBDML.php
+++ b/content/lvplanung/lehrveranstaltungDBDML.php
@@ -157,8 +157,6 @@ function getStundenproInstitut($mitarbeiter_uid, $studiensemester_kurzbz, $oe_ar
 			WHERE
 				mitarbeiter_uid=".$db->db_add_param($mitarbeiter_uid)." AND
 				studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
-				faktor>0 AND
-				stundensatz>0 AND
 				bismelden AND
 				tbl_studiengang.oe_kurzbz in(".$db->db_implode4SQL($oe_arr).")
 			GROUP BY tbl_studiengang.bezeichnung";
@@ -305,12 +303,12 @@ if(!$error)
 					$le = new lehreinheit();
 					$le->load($lem->lehreinheit_id);
 
-					if($lem->stundensatz<=0 || $lem->faktor<=0 || $lem->bismelden==false)
+					if($lem->bismelden==false)
 						$neue_stunden_eingerechnet=false;
 					else
 						$neue_stunden_eingerechnet=true;
 
-					if(($stundensatz_alt<=0 || $faktor_alt<=0 || $bismelden_alt==false))
+					if($bismelden_alt==false)
 						$alte_stunden_eingerechnet=false;
 					else
 						$alte_stunden_eingerechnet=true;
@@ -337,8 +335,6 @@ if(!$error)
 								WHERE
 									mitarbeiter_uid=".$db->db_add_param($lem->mitarbeiter_uid)." AND
 									studiensemester_kurzbz=".$db->db_add_param($le->studiensemester_kurzbz)." AND
-									faktor>0 AND
-									stundensatz>0 AND
 									bismelden";
 
 						if(count($oe_arr)>0)
@@ -559,8 +555,6 @@ if(!$error)
 							WHERE
 								mitarbeiter_uid=".$db->db_add_param($lem->mitarbeiter_uid)." AND
 								studiensemester_kurzbz=".$db->db_add_param($le->studiensemester_kurzbz)." AND
-								faktor>0 AND
-								stundensatz>0 AND
 								bismelden";
 
 					if(count($oe_arr)>0)
diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
index 55fd91bfd..ebb525cbc 100644
--- a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
@@ -117,9 +117,9 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 				class="sortDirectionIndicator"
 				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"  onclick="LehrveranstaltungNotenTreeSort()"/>
 			<splitter class="tree-splitter"/>
-            <treecol id="lehrveranstaltung-noten-tree-lv_studiengang_kz" label="LehrveranstaltungStudiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
+            <treecol id="lehrveranstaltung-noten-tree-studiengang_kz_lv" label="LehrveranstaltungStudiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
                      class="sortDirectionIndicator"
-                     sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lv_studiengang_kz"  onclick="LehrveranstaltungNotenTreeSort()"/>
+                     sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv"  onclick="LehrveranstaltungNotenTreeSort()"/>
 			<splitter class="tree-splitter"/>
 			<treecol id="lehrveranstaltung-noten-tree-student_semester" label="Semester" flex="2" hidden="true" persist="hidden, width, ordinal"
 				class="sortDirectionIndicator"
@@ -148,7 +148,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lv_studiengang_kz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_semester"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
 					</treerow>
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
index fef975304..49fd1c8f2 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.js.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.js.php
@@ -2428,7 +2428,7 @@ function LehrveranstaltungFFZertifikatPrint(event)
 		}
 	}
 	var ss = getStudiensemester();
-	col = tree.columns ? tree.columns["lehrveranstaltung-noten-tree-lv_studiengang_kz"] : "lehrveranstaltung-noten-tree-lv_studiengang_kz";
+	col = tree.columns ? tree.columns["lehrveranstaltung-noten-tree-studiengang_kz_lv"] : "lehrveranstaltung-noten-tree-studiengang_kz_lv";
 	stg_kz = tree.view.getCellText(tree.currentIndex,col);
 
 	if (event.shiftKey)
@@ -2546,8 +2546,8 @@ function LeMitarbeiterGesamtkosten()
 	faktor = document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-textbox-faktor').value
 	stundensatz = document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-textbox-stundensatz').value
 
-	if(!isNaN(semesterstunden) && !isNaN(faktor) && !isNaN(stundensatz))
-		gesamtkosten = semesterstunden*faktor*stundensatz;
+	if(!isNaN(semesterstunden) && !isNaN(stundensatz))
+		gesamtkosten = semesterstunden*stundensatz;
 	else
 		gesamtkosten = 0;
 
diff --git a/content/messages.js.php b/content/messages.js.php
index fae1db4ba..3e72748ec 100644
--- a/content/messages.js.php
+++ b/content/messages.js.php
@@ -104,7 +104,7 @@ function MessagesNewMessage()
 	{
 		var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
 
-		var action = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/write/' + MessageSenderPersonID;
+		var action = '<?php echo APP_ROOT ?>index.ci.php/system/messages/FASMessages/writeTemplate';
 
 		openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
 	}
@@ -128,7 +128,7 @@ function MessagesSendAnswer()
 		var RecipientID = getTreeCellText(messagesTree, 'messages-tree-recipient_id', messagesTree.currentIndex);
 		var prestudentIdArray = new Array(getTreeCellText(studentsTree, 'student-treecol-prestudent_id', studentsTree.currentIndex));
 
-		var action = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/writeReply/' + MessageSenderPersonID + '/' + MessageId + '/' + RecipientID;
+		var action = '<?php echo APP_ROOT ?>index.ci.php/system/messages/FASMessages/writeReplyTemplate/' + MessageId + '/' + RecipientID;
 
 		openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
 	}
diff --git a/content/mitarbeiter/lehrtaetigkeit.pdf.php b/content/mitarbeiter/lehrtaetigkeit.pdf.php
index 1c5760531..28acffcf1 100644
--- a/content/mitarbeiter/lehrtaetigkeit.pdf.php
+++ b/content/mitarbeiter/lehrtaetigkeit.pdf.php
@@ -31,14 +31,12 @@ require_once('../../include/studiensemester.class.php');
 require_once('../../include/phrasen.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
 
-
 $user = get_uid();
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
 $doc = new dokument_export('Lehrtaetigkeit');
 
-
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
 
@@ -86,12 +84,12 @@ foreach($active_semester_arr as $active_semester)
 	$studiensemester_start_date = $ss->start;
 	$studiensemester_end_date = $ss->ende;
 
-	// * get total amount of semesterstunden of the lehreinheiten, where stundensatz > 0
+	// * get total amount of semesterstunden of the lehreinheiten
 	$total_semesterstunden = 0;
 	foreach ($le_id_arr as $le_id)
 	{
 		$le_ma = new Lehreinheitmitarbeiter($le_id, $uid);
-		if ($le_ma && (!is_null ($le_ma->stundensatz) && $le_ma->stundensatz > 0))
+		if ($le_ma)
 		{
 			$total_semesterstunden = $total_semesterstunden + $le_ma->semesterstunden;
 		}
@@ -140,15 +138,16 @@ foreach ($project_arr as $project)
 	}, $projektstunden_per_semester
 	));
 
-	// * if studiensemester exists, sum up hours of projektarbeit, where stundensatz > 0
+	// * if studiensemester exists, sum up hours of projektarbeit
 	if ($studiensemester_index !== false)
 	{
-		$projektstunden_per_semester [$studiensemester_index]['total_semesterstunden'] = $projektstunden_per_semester [$studiensemester_index]['total_semesterstunden'] + $projektstunden;
+		$projektstunden_per_semester[$studiensemester_index]['total_semesterstunden'] =
+			$projektstunden_per_semester[$studiensemester_index]['total_semesterstunden'] + $projektstunden;
 	}
 	// * if not, create new index
 	else
 	{
-		$projektstunden_per_semester []= (
+		$projektstunden_per_semester[] = (
 			array(
 				'studiensemester_kurzbz'=> $studiensemester_kurzbz,
 				'total_semesterstunden' => $projektstunden,
@@ -171,7 +170,9 @@ foreach ($projektstunden_per_semester as $item)
 	// * if studiensemester exists, merge lehreinheit- and projektarbeit hours
 	if ($studiensemester_index !== false)
 	{
-		$semesterstunden_per_semester [$studiensemester_index]['total_semesterstunden'] = $semesterstunden_per_semester [$studiensemester_index]['total_semesterstunden'] + $item['total_semesterstunden'];
+		$semesterstunden_per_semester[$studiensemester_index]['total_semesterstunden'] =
+			$semesterstunden_per_semester [$studiensemester_index]['total_semesterstunden']
+			+ $item['total_semesterstunden'];
 	}
 	// * if not, create new index
 	else
@@ -202,12 +203,15 @@ $actual_studiensemester_index = array_search($actual_studiensemester, array_map(
 }, $semesterstunden_per_semester
 ));
 
-// * if lector is teaching actually, split former teaching activities from actual teaching activities of actual studiensemester
+// if lector is teaching actually, split former teaching activities
+// from actual teaching activities of actual studiensemester
 $semesterstunden_of_actual_semester = array();
 if ($actual_studiensemester_index !== false)
 {
-	$semesterstunden_of_actual_semester = array_slice($semesterstunden_per_semester, $actual_studiensemester_index);	// array with actual + future semester
-	$semesterstunden_per_semester = array_slice($semesterstunden_per_semester, 0, $actual_studiensemester_index);	// array with all former semester
+	// array with actual + future semester
+	$semesterstunden_of_actual_semester = array_slice($semesterstunden_per_semester, $actual_studiensemester_index);
+	// array with all former semester
+	$semesterstunden_per_semester = array_slice($semesterstunden_per_semester, 0, $actual_studiensemester_index);
 }
 
 // Semester begin and ending date of lehreinheit- and projektarbeit studiensemester
@@ -257,7 +261,8 @@ if (!empty($semesterstunden_per_semester))
 }
 else
 {
-	$data[]= array('total_ss_per_semester'=> '');	// empty if lector has no lehreinheit- or projektarbeitsstunden in the past (before the actual studiensemester)
+	// empty if lector has no lehreinheit- or projektarbeitsstunden in the past (before the actual studiensemester)
+	$data[]= array('total_ss_per_semester'=> '');
 }
 
 // Add data to lehrtaetigkeit.xsl
@@ -275,5 +280,3 @@ $doc->output();
 
 // unlink doc from tmp-folder
 $doc->close();
-
-
diff --git a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
index 8eb009473..1cc8fb34e 100644
--- a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
+++ b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
@@ -143,13 +143,18 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						</row>
 							<row>
 									<label value="Geschlecht" control="mitarbeiter-detail-menulist-geschlecht"/>
-									<menulist id="mitarbeiter-detail-menulist-geschlecht" disabled="true" oncommand="MitarbeiterDetailValueChange()">
-								<menupopup>
-										<menuitem value="m" label="maennlich"/>
-										<menuitem value="w" label="weiblich"/>
-										<menuitem value="u" label="unbekannt"/>
-								</menupopup>
-							</menulist>
+									<menulist id="mitarbeiter-detail-menulist-geschlecht" disabled="true"
+										datasources="<?php echo APP_ROOT ?>rdf/geschlecht.rdf.php"
+										ref="http://www.technikum-wien.at/geschlecht"
+										oncommand="MitarbeiterDetailValueChange()">
+										<template>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/geschlecht/rdf#geschlecht"
+													label="rdf:http://www.technikum-wien.at/geschlecht/rdf#bezeichnung"
+													uri="rdf:*"/>
+												</menupopup>
+										</template>
+									</menulist>
 							<label value="Familienstand" control="mitarbeiter-detail-menulist-familienstand" <?php echo ($rechte->isBerechtigt('mitarbeiter/persoenlich'))?'':'hidden="true"'; ?> />
 									<menulist id="mitarbeiter-detail-menulist-familienstand" disabled="true" oncommand="MitarbeiterDetailValueChange()" <?php echo ($rechte->isBerechtigt('mitarbeiter/persoenlich'))?'':'hidden="true"'; ?> >
 								<menupopup>
diff --git a/content/statistik/alvsstatistik.php b/content/statistik/alvsstatistik.php
index 982427c9a..ad2352896 100644
--- a/content/statistik/alvsstatistik.php
+++ b/content/statistik/alvsstatistik.php
@@ -64,7 +64,8 @@ $db = new basis_db();
 $qry = "
 SELECT * FROM (
 	SELECT
-		lehrfach.oe_kurzbz as lehrfach_oe_kurzbz, tbl_lehrveranstaltung.studiengang_kz, geschlecht,sum(tbl_lehreinheitmitarbeiter.semesterstunden) as semesterstunden
+		lehrfach.oe_kurzbz as lehrfach_oe_kurzbz, tbl_lehrveranstaltung.studiengang_kz, geschlecht,
+		sum(tbl_lehreinheitmitarbeiter.semesterstunden) as semesterstunden
 	FROM
 		lehre.tbl_lehreinheit,
 		lehre.tbl_lehrveranstaltung,
@@ -79,8 +80,6 @@ SELECT * FROM (
 		tbl_lehreinheitmitarbeiter.mitarbeiter_uid = tbl_benutzer.uid AND
 		tbl_benutzer.person_id = tbl_person.person_id AND
 		tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND
-		faktor<>0 AND
-		stundensatz<>0 AND
 		tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
 	GROUP BY lehrfach.oe_kurzbz, geschlecht, tbl_lehrveranstaltung.studiengang_kz
 	) as a JOIN public.tbl_studiengang USING(studiengang_kz)
@@ -116,9 +115,7 @@ WHERE
 	tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
 	tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 	tbl_projektbetreuer.person_id=tbl_person.person_id AND
-	tbl_projektbetreuer.faktor<>0 AND
 	tbl_projektbetreuer.stunden<>0 AND
-	tbl_projektbetreuer.stundensatz<>0 AND
 	tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
 GROUP BY studiengang_kz,geschlecht";
 
diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php
index ff61e92f4..932a8c6cb 100644
--- a/content/statistik/bewerberstatistik.php
+++ b/content/statistik/bewerberstatistik.php
@@ -1344,7 +1344,7 @@ else
 		//im Kopf des Mails Links zu den anderen Statistiken anzeigen
 		$content .= 'Dies ist ein automatisches Mail!<br><br>';
 		$content .= '<b>Links zu den Statistiken:</b><br>
-		- <a href="'.APP_ROOT.'content/statistik/lektorenstatistik.php" target="_blank">LektorInnenstatisitk</a><br>
+		- <a href="'.APP_ROOT.'content/statistik/lektorenstatistik.php" target="_blank">LektorInnenstatistik</a><br>
 		- <a href="'.APP_ROOT.'content/statistik/mitarbeiterstatistik.php" target="_blank">MitarbeiterInnenstatistik</a><br>
 		- <a href="'.APP_ROOT.'content/statistik/bewerberstatistik.php" target="_blank">BewerberInnenstatistik</a><br>
 		- <a href="'.APP_ROOT.'content/statistik/studentenstatistik.php" target="_blank">Studierendenstatistik</a><br>
@@ -1437,7 +1437,7 @@ else
 	}
 
 	$content .= '
-		<h2>BewerberInnenstatistik '.$stsem.'<span style="position:absolute; right:15px;">'.date('d.m.Y').'</span></h2><br>
+		<h2>BewerberInnenstatistik '.$stsem.' <span style="position:absolute; right:15px;">'.date('d.m.Y').'</span></h2><br>
 		';
 	if ($stsem != '')
 	{
@@ -1891,7 +1891,7 @@ else
 
 		$content .= '
 		<br><br>
-		<h2>BewerberInnenstatistik '.$stsem.'<span style="position:absolute; right:15px;">'.$datum_obj->formatDatum($datum, 'd.m.Y').'</span></h2><br>
+		<h2>BewerberInnenstatistik '.$stsem.' <span style="position:absolute; right:15px;">'.$datum_obj->formatDatum($datum, 'd.m.Y').'</span></h2><br>
 		';
 		//Bewerberdaten holen
 		$qry = "SELECT studiengang_kz, kurzbz, typ, kurzbzlang, bezeichnung, orgform_kurzbz,
diff --git a/content/statistik/koordinatorstunden.php b/content/statistik/koordinatorstunden.php
deleted file mode 100644
index c9870a9e4..000000000
--- a/content/statistik/koordinatorstunden.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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>.
- */
-/*
- * Erstellt eine Liste der Koordinatoren eines Instituts und der Anzahl der Stunden
- * die er in den jeweiligen Studiengaengen unterrichtet
- */
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/studiengang.class.php');
-
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Koordinatorstunden</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
-<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
-</head>
-<body>';
-
-$user = get_uid();
-loadVariables($user);
-$db = new basis_db();
-
-if(isset($_GET['oe_kurzbz']))
-	$oe_kurzbz = $_GET['oe_kurzbz'];
-else 
-	die('Falsche Parameteruebergabe');
-	
-echo '<h2>Koordinatorstunden - Organisationseinheit '.$oe_kurzbz.'</h2>';
-
-$stg_arr = array();
-$data = array();
-$name = array();
-
-//alle Studiengaenge holen
-$studiengang = new studiengang();
-$studiengang->getAll();
-
-foreach ($studiengang->result as $row)
-	$stg_arr[$row->studiengang_kz]=$row->kuerzel;
-	
-//Alle Fachbereichsleiter des uebergebenen Studienganges holen und
-//Die Anzahl der Stunden die dieser in den einzelnen Studiengaengen haelt ermitteln
-$qry = "SELECT 
-			distinct on(tbl_lehreinheit.lehreinheit_id)
-			tbl_benutzerfunktion.uid, 
-			tbl_lehreinheitmitarbeiter.semesterstunden, 
-			tbl_lehrveranstaltung.studiengang_kz,
-			tbl_person.vorname,
-			tbl_person.nachname
-		FROM 
-			public.tbl_benutzerfunktion
-			JOIN lehre.tbl_lehreinheitmitarbeiter ON(tbl_benutzerfunktion.uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-			JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-			JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_benutzerfunktion.uid)
-			JOIN public.tbl_person ON(tbl_person.person_id=tbl_benutzer.person_id)
-			JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-			JOIN public.tbl_fachbereich ON(tbl_benutzerfunktion.fachbereich_kurzbz=tbl_fachbereich.fachbereich_kurzbz)
-		WHERE 
-			tbl_benutzerfunktion.funktion_kurzbz='fbk' AND
-			tbl_fachbereich.oe_kurzbz=".$db->db_add_param($oe_kurzbz)." AND
-			tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-			(tbl_benutzerfunktion.datum_von is null OR tbl_benutzerfunktion.datum_von<=now()) AND
-			(tbl_benutzerfunktion.datum_bis is null OR tbl_benutzerfunktion.datum_bis>=now())
-		ORDER BY tbl_lehreinheit.lehreinheit_id, nachname, vorname
-		";
-
-if($db->db_query($qry))
-{
-	while($row = $db->db_fetch_object())
-	{
-		if(array_key_exists($row->uid, $data))
-		{
-			if(array_key_exists($row->studiengang_kz, $data[$row->uid]))
-			{
-				$data[$row->uid][$row->studiengang_kz] += $row->semesterstunden;
-			}
-			else 
-				$data[$row->uid][$row->studiengang_kz] = $row->semesterstunden;
-		}
-		else 
-			$data[$row->uid][$row->studiengang_kz] = $row->semesterstunden;
-			
-		$name[$row->uid]['vorname']=$row->vorname;
-		$name[$row->uid]['nachname']=$row->nachname;
-	}
-}
-
-echo '<br /><table class="liste table-autosort:0 table-stripeclass:alternate table-autostripe">
-		<thead>
-			<tr class="liste">
-				<th class="table-sortable:default">Name</th>
-				<th class="table-sortable:default">Studiengang</th>
-				<th class="table-sortable:numeric">Stunden</th>
-			</tr>
-		</thead>
-		<tbody>';
-
-$i=0;
-foreach ($name as $uid=>$row) 
-{		
-	foreach ($data[$uid] as $stg=>$row2)	
-	{
-		echo '<tr>
-				<td>'.$name[$uid]['vorname'].' '.$name[$uid]['nachname'].'</td>
-				<td>'.$stg_arr[$stg].'</td>
-				<td>'.$row2.'</td>
-			  </tr>';
-		$i++;
-	}
-}
-echo '</tbody></table>';
-?>
-</body>
-</html>
diff --git a/content/statistik/lehrauftragsgesamtliste.php b/content/statistik/lehrauftragsgesamtliste.php
deleted file mode 100644
index 19a7fdd46..000000000
--- a/content/statistik/lehrauftragsgesamtliste.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?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>.
- */
-/**
- * Erstellt ein Excel File mit allen Lektoren und den Studiengaengen in denen diese Unterrichten
- * Diese Liste wird dann per Mail an die Geschaeftsstelle gesendet.
- */
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/Excel/excel.php');
-require_once('../../include/studiengang.class.php');
-require_once('../../include/studiensemester.class.php');
-require_once('../../include/mail.class.php');
-
-$stsem = new studiensemester();
-$semester_aktuell  = $stsem->getaktorNext();
-
-$file = 'lehrauftragsgesamtliste.xls';
-
-// Creating a workbook
-$workbook = new Spreadsheet_Excel_Writer($file);
-$workbook->setVersion(8);
-// Creating a worksheet
-$worksheet =& $workbook->addWorksheet("Lektoren");
-$worksheet->setInputEncoding('utf-8');
-
-//Formate Definieren
-$format_left =& $workbook->addFormat();
-$format_left->setLeft(2);
-
-$format_bold =& $workbook->addFormat();
-$format_bold->setBold();
-
-$format_bold_border =& $workbook->addFormat();
-$format_bold_border->setBold();
-$format_bold_border->setBorder(2);
-
-$format_bold_center =& $workbook->addFormat();
-$format_bold_center->setBold();
-$format_bold_center->setAlign('center');
-$format_bold_center->setBorder(2);
-
-$format_number =& $workbook->addFormat();
-$format_number->setNumFormat('0,0.00');
-
-$format_number_bold =& $workbook->addFormat();
-$format_number_bold->setNumFormat('0,0.00');
-$format_number_bold->setBold();
-$format_number_bold->setLeft(2);
-
-$i=0;
-$studiensemester = new studiensemester();
-$stsem = $studiensemester->getNearest();
-
-$worksheet->write(0,0,'Erstellt am '.date('d.m.Y')." Studiensemester: $stsem", $format_bold);
-//Ueberschriften
-$zeile=1;
-$spalte=0;
-$maxlength[$spalte]=10;
-$worksheet->write($zeile+1,$spalte++,"Nachname", $format_bold);
-$maxlength[$spalte]=10;
-$worksheet->write($zeile+1,$spalte++,"Vorname", $format_bold);
-$maxlength[$spalte]=10;
-$worksheet->write($zeile+1,$spalte++,"UID", $format_bold);
-$db = new basis_db();
-$qry = "SELECT 
-			distinct tbl_studiengang.studiengang_kz, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel
-		FROM 
-			lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) 
-			JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id) 
-			JOIN public.tbl_studiengang USING(studiengang_kz)
-		WHERE 
-			tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)." AND
-			tbl_lehreinheitmitarbeiter.faktor is not null AND
-			tbl_lehreinheitmitarbeiter.faktor<>0 AND
-			tbl_lehreinheitmitarbeiter.stundensatz is not null AND
-			tbl_lehreinheitmitarbeiter.stundensatz<>0 AND
-			tbl_lehreinheitmitarbeiter.semesterstunden is not null AND
-			tbl_lehreinheitmitarbeiter.semesterstunden<>0 ORDER BY kuerzel";
-if(!$result = $db->db_query($qry))
-	die('Fehler in qry');
-
-while($row = $db->db_fetch_object($result)) 
-{
-	$worksheet->write($zeile, $spalte,$row->kuerzel, $format_bold_center);
-	$worksheet->write($zeile, $spalte+1,$row->kuerzel, $format_bold_center);
-	$worksheet->write($zeile, $spalte+2,$row->kuerzel, $format_bold_center);
-	$worksheet->write($zeile, $spalte+3,$row->kuerzel, $format_bold_center);
-	$stg_spalte[$row->studiengang_kz]=$spalte;
-	$maxlength[$spalte]=7;
-	$worksheet->write($zeile+1, $spalte++,'Stunden', $format_bold_border);
-	$maxlength[$spalte]=5;
-	$worksheet->write($zeile+1, $spalte++,'Sätze', $format_bold_border);
-	$maxlength[$spalte]=6;
-	$worksheet->write($zeile+1, $spalte++,'Faktor', $format_bold_border);
-	$maxlength[$spalte]=6;
-	$worksheet->write($zeile+1, $spalte++,'Gesamt', $format_bold_border);	
-	$worksheet->mergeCells($zeile,$spalte-4,$zeile,$spalte-1); 
-}
-$maxlength[$spalte]=12;
-$worksheet->write($zeile+1, $spalte,'Gesamtsumme', $format_bold);	
-$maxspalten = $spalte;
-
-function drawStg($stg)
-{
-	global $faktor_arr, $satz_arr, $stunden, $gesamt, $worksheet, $stg_spalte;
-	global $zeile, $gesamtsumme, $format_number, $maxlength, $format_left;
-	
-	$faktoren = '';
-	$saetze = '';
-	
-	foreach ($faktor_arr as $faktor)
-	{
-		if($faktoren!='')
-			$faktoren.=', ';
-		$faktoren.=$faktor;
-	}
-	
-	foreach ($satz_arr as $satz)
-	{
-		if($saetze!='')
-			$saetze.=', ';
-		$saetze.=$satz;
-	}
-	
-	if(strlen($stunden)>$maxlength[$stg_spalte[$stg]])
-		$maxlength[$stg_spalte[$stg]]=strlen($stunden);
-	$worksheet->write($zeile, $stg_spalte[$stg], $stunden, $format_left);
-	
-	if(strlen($saetze)>$maxlength[$stg_spalte[$stg]+1])
-		$maxlength[$stg_spalte[$stg]+1]=strlen($saetze);
-	$worksheet->write($zeile, $stg_spalte[$stg]+1, $saetze);
-	
-	if(strlen($faktoren)>$maxlength[$stg_spalte[$stg]+2])
-		$maxlength[$stg_spalte[$stg]+2]=strlen($faktoren);
-	$worksheet->write($zeile, $stg_spalte[$stg]+2, $faktoren);
-	
-	if(strlen($gesamt)>$maxlength[$stg_spalte[$stg]+3])
-		$maxlength[$stg_spalte[$stg]+3]=strlen($gesamt)+5;
-	$worksheet->write($zeile, $stg_spalte[$stg]+3, $gesamt, $format_number);
-	
-	$gesamtsumme += $gesamt;
-	$faktor_arr = array();
-	$satz_arr = array();
-	$stunden = 0;
-	$gesamt = 0;
-}
-
-function drawGesamtsumme()
-{
-	global $maxspalten, $zeile, $gesamtsumme, $worksheet, $format_number_bold, $maxlength;
-	
-	if(strlen($gesamtsumme)>$maxlength[$maxspalten])
-		$maxlength[$maxspalten]=strlen($gesamtsumme);
-	$worksheet->write($zeile, $maxspalten, $gesamtsumme, $format_number_bold);
-}
-
-$qry = "
-SELECT 
-	mitarbeiter_uid, stundensatz, faktor, sum(tbl_lehreinheitmitarbeiter.semesterstunden) as stunden, 
-	stundensatz*sum(tbl_lehreinheitmitarbeiter.semesterstunden)*faktor AS gesamt, studiengang_kz,
-	nachname, vorname
-FROM 
-	lehre.tbl_lehreinheitmitarbeiter JOIN campus.vw_benutzer ON (mitarbeiter_uid=uid) 
-	JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) 
-	JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id) 
-WHERE 
-	studiensemester_kurzbz=".$db->db_add_param($stsem)." AND 
-	tbl_lehreinheitmitarbeiter.faktor is not null AND
-	tbl_lehreinheitmitarbeiter.faktor<>0 AND
-	tbl_lehreinheitmitarbeiter.stundensatz is not null AND
-	tbl_lehreinheitmitarbeiter.stundensatz<>0 AND
-	tbl_lehreinheitmitarbeiter.semesterstunden is not null AND
-	tbl_lehreinheitmitarbeiter.semesterstunden<>0
-GROUP BY mitarbeiter_uid, studiengang_kz, stundensatz, faktor, nachname, vorname ORDER BY nachname, vorname, studiengang_kz 
- ";
-
-if($result = $db->db_query($qry))
-{
-	$lastuid='';
-	$laststg='';
-	$zeile++;
-	
-	while($row = $db->db_fetch_object($result))
-	{
-		if($lastuid!=$row->mitarbeiter_uid)
-		{
-			if($lastuid!='')
-			{
-				// letzten Studiengang ausgeben
-				drawStg($laststg);
-				//Gesamtsumme ausgeben
-				drawGesamtsumme();
-			}
-			$zeile++;
-			$lastuid=$row->mitarbeiter_uid;
-			$laststg=$row->studiengang_kz;
-			$faktor_arr = array();
-			$satz_arr = array();
-			$stunden = 0;
-			$gesamt = 0;
-			$gesamtsumme=0;
-			
-			if(strlen($row->nachname)>$maxlength[0])
-				$maxlength[0]=strlen($row->nachname);
-			$worksheet->write($zeile, 0, $row->nachname);
-			
-			if(strlen($row->vorname)>$maxlength[1])
-				$maxlength[1]=strlen($row->vorname);
-			$worksheet->write($zeile, 1, $row->vorname);
-			
-			if(strlen($row->mitarbeiter_uid)>$maxlength[2])
-				$maxlength[2]=strlen($row->mitarbeiter_uid);
-			$worksheet->write($zeile, 2, $row->mitarbeiter_uid);
-			
-			foreach ($stg_spalte as $spalte)
-			{
-				$worksheet->write($zeile, $spalte, null, $format_left);
-			}
-			
-		}
-		
-		if($laststg!=$row->studiengang_kz && $laststg!='')
-		{
-			drawStg($laststg);			
-		}
-		
-		if($row->faktor!='' && $row->faktor!='0' && $row->stunden!='' && $row->stunden!='0' && $row->stundensatz!='' && $row->stundensatz!='0')
-		{
-			if(!in_array($row->faktor, $faktor_arr))
-				$faktor_arr[]=$row->faktor;
-				
-			if(!in_array($row->stundensatz, $satz_arr))
-				$satz_arr[]=$row->stundensatz;
-				
-			$stunden += $row->stunden;
-			$gesamt += $row->gesamt;
-		}
-		$laststg = $row->studiengang_kz;
-	}
-	drawStg($laststg);
-	drawGesamtsumme();
-}
-else 
-	die('Fehler in qry');
-
-$workbook->close();
-
-//Mail versenden mit Excel File im Anhang
-	
-	$to = MAIL_GST; 
-    
-    $subject = "Lehrauftragsgesamtliste ".date('d.m.Y');
-    $message = "Dies ist eine automatische eMail!\nAnbei die Lehrauftragsgesamtliste vom ".date('d.m.Y');
-    $fileatttype = "application/xls"; 
-    $fileattname = "lehrauftragsgesamtliste_".date('Y_m_d').".xls";
-
-    $mail = new mail($to, 'vilesci@'.DOMAIN, $subject, $message);
-    $mail->addAttachmentBinary($file, $fileatttype, $fileattname);
-    
-    if($mail->send())
-		echo "Email mit Lehrauftragsgesamtliste wurde versandt"; 
-     else    
-        echo "Fehler beim Versenden der Lehrauftragsgesamtliste"; 
-?>
diff --git a/content/statistik/lehrauftragsliste_gst.xls.php b/content/statistik/lehrauftragsliste_gst.xls.php
index b641ef05e..990216c09 100644
--- a/content/statistik/lehrauftragsliste_gst.xls.php
+++ b/content/statistik/lehrauftragsliste_gst.xls.php
@@ -30,12 +30,12 @@ require_once('../../include/studiengang.class.php');
 
 if(isset($_GET['studiengang_kz']) && is_numeric($_GET['studiengang_kz']))
 	$studiengang_kz=$_GET['studiengang_kz'];
-else 
+else
 	die('studiengangs_kz muss uebergeben werden');
-	
+
 if(isset($_GET['semester']) && is_numeric($_GET['semester']))
 	$semester=$_GET['semester'];
-else 
+else
 	$semester='';
 
 $user = get_uid();
@@ -78,46 +78,48 @@ $worksheet->write(2,++$i,"Kosten", $format_bold);
 $db = new basis_db();
 //Daten holen
 $qry = "SELECT * FROM (
-		SELECT 
-			tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre, 
-			tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid, tbl_mitarbeiter.fixangestellt,
-			tbl_lehreinheitmitarbeiter.faktor as faktor, tbl_lehreinheitmitarbeiter.stundensatz as stundensatz,
+		SELECT
+			tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
+			tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
+			tbl_mitarbeiter.fixangestellt,
+			tbl_lehreinheitmitarbeiter.stundensatz as stundensatz,
 			tbl_lehreinheitmitarbeiter.semesterstunden as semesterstunden
-		FROM 
-			lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_mitarbeiter, 
+		FROM
+			lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_mitarbeiter,
 			public.tbl_benutzer, public.tbl_person, lehre.tbl_lehrveranstaltung
-		WHERE 
-			tbl_person.person_id = tbl_benutzer.person_id AND 
-			tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid AND
-			tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid AND
-			tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-			tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND
-			studiengang_kz=".$db->db_add_param($studiengang_kz)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND 
-			tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND tbl_lehreinheitmitarbeiter.semesterstunden is not null 
-			AND tbl_lehreinheitmitarbeiter.stundensatz<>0 AND tbl_lehreinheitmitarbeiter.faktor<>0 AND
-			EXISTS (SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id)";
+		WHERE
+			tbl_person.person_id = tbl_benutzer.person_id AND
+			tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid AND
+			tbl_lehreinheitmitarbeiter.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid AND
+			tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id AND
+			tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id AND
+			studiengang_kz = ".$db->db_add_param($studiengang_kz)."
+			AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+			tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND tbl_lehreinheitmitarbeiter.semesterstunden is not null
+			AND	EXISTS (SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id)";
 if($semester!='')
 	$qry.=" AND semester=".$db->db_add_param($semester);
 
 //Projektsbetreuungen
-$qry.= " UNION 
-		 SELECT 
+$qry.= " UNION
+		 SELECT
 		 	tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
-		 	tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid, tbl_mitarbeiter.fixangestellt,
-			0 as faktor, 0 as stundensatz,
+		 	tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
+			tbl_mitarbeiter.fixangestellt,
+			0 as stundensatz,
 			0 as semesterstunden
-		 FROM 
-		 	lehre.tbl_lehreinheit, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, 
+		 FROM
+		 	lehre.tbl_lehreinheit, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer,
 		 	public.tbl_mitarbeiter, public.tbl_benutzer, lehre.tbl_lehrveranstaltung, public.tbl_person
 		 WHERE
-		 	tbl_mitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
-		 	tbl_benutzer.person_id=tbl_projektbetreuer.person_id AND
+		 	tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid AND
+		 	tbl_benutzer.person_id = tbl_projektbetreuer.person_id AND
 		 	tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id AND
 		 	tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
-		 	tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND 
+		 	tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
 		 	tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-		 	tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-		 	tbl_person.person_id=tbl_projektbetreuer.person_id";
+		 	tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
+		 	tbl_person.person_id = tbl_projektbetreuer.person_id";
 if($semester!='')
 	$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);
 $qry.=") as foo";
@@ -129,19 +131,19 @@ if($result = $db->db_query($qry))
 	$gesamtkosten = 0;
 	$gesamtstunden = 0;
 	$liste=array();
-	
+
 	while($row = $db->db_fetch_object($result))
 	{
 		//Gesamtstunden und Kosten ermitteln
 		if(array_key_exists($row->mitarbeiter_uid, $liste))
 		{
 			$liste[$row->mitarbeiter_uid]['gesamtstunden'] = $liste[$row->mitarbeiter_uid]['gesamtstunden'] + $row->semesterstunden;
-			$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $liste[$row->mitarbeiter_uid]['gesamtkosten'] + ($row->semesterstunden*$row->stundensatz*$row->faktor);
+			$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $liste[$row->mitarbeiter_uid]['gesamtkosten'] + ($row->semesterstunden*$row->stundensatz);
 		}
-		else 
+		else
 		{
 			$liste[$row->mitarbeiter_uid]['gesamtstunden'] = $row->semesterstunden;
-			$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $row->semesterstunden*$row->stundensatz*$row->faktor;
+			$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $row->semesterstunden*$row->stundensatz;
 		}
 		$liste[$row->mitarbeiter_uid]['personalnummer'] = $row->personalnummer;
 		$liste[$row->mitarbeiter_uid]['titelpre'] = $row->titelpre;
@@ -149,18 +151,24 @@ if($result = $db->db_query($qry))
 		$liste[$row->mitarbeiter_uid]['vorname'] = $row->vorname;
 		$liste[$row->mitarbeiter_uid]['nachname'] = $row->nachname;
 	}
-	
+
 	//Betreuungen fuer Projektarbeiten
 	foreach ($liste as $uid=>$arr)
 	{
-		$qry = "SELECT tbl_projektbetreuer.faktor, tbl_projektbetreuer.stunden, tbl_projektbetreuer.stundensatz
-	        FROM lehre.tbl_projektbetreuer, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, 
-	               public.tbl_benutzer, lehre.tbl_projektarbeit, campus.vw_student 
-	        WHERE tbl_projektbetreuer.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid=".$db->db_add_param($uid)." AND 
-	              tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND student_uid=vw_student.uid
-	              AND tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
-	              tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-	              tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
+		$qry = "
+			SELECT
+				tbl_projektbetreuer.stunden, tbl_projektbetreuer.stundensatz
+			FROM lehre.tbl_projektbetreuer, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
+				public.tbl_benutzer, lehre.tbl_projektarbeit, campus.vw_student
+			WHERE
+				tbl_projektbetreuer.person_id=tbl_benutzer.person_id
+				AND tbl_benutzer.uid=".$db->db_add_param($uid)."
+				AND tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id
+				AND student_uid=vw_student.uid
+				AND tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id
+				AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+				AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 		if($semester!='')
 			$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);
 		if($result = $db->db_query($qry))
@@ -168,14 +176,14 @@ if($result = $db->db_query($qry))
 			while($row = $db->db_fetch_object($result))
 			{
 				$liste[$uid]['gesamtstunden'] = $liste[$uid]['gesamtstunden'] + $row->stunden;
-				$liste[$uid]['gesamtkosten'] = $liste[$uid]['gesamtkosten'] + ($row->stunden*$row->stundensatz*$row->faktor);
+				$liste[$uid]['gesamtkosten'] = $liste[$uid]['gesamtkosten'] + ($row->stunden*$row->stundensatz);
 			}
 		}
 	}
-	
+
 	//Daten ausgeben
 	foreach ($liste as $row)
-	{			
+	{
 		$i=0;
 		//Studiengang
 		$worksheet->write($zeile,$i,$studiengang->kuerzel);
@@ -186,24 +194,24 @@ if($result = $db->db_query($qry))
 		//Vorname
 		$worksheet->write($zeile,++$i,$row['vorname']);
 		//Nachname
-		$worksheet->write($zeile,++$i,$row['nachname']);		
+		$worksheet->write($zeile,++$i,$row['nachname']);
 		//Fixangestellt
-		$worksheet->write($zeile,++$i,($row['fixangestellt']=='t'?'Ja':'Nein'));		
+		$worksheet->write($zeile,++$i,($row['fixangestellt']=='t'?'Ja':'Nein'));
 		//Stunden
 		$worksheet->write($zeile,++$i,$row['gesamtstunden']);
 		//Kosten
 		$worksheet->writeNumber($zeile,++$i,$row['gesamtkosten'], $format_number);
-		
+
 		//Kosten zu den Gesamtkosten hinzurechnen
 		$gesamtkosten = $gesamtkosten + $row['gesamtkosten'];
 		$gesamtstunden = $gesamtstunden + $row['gesamtstunden'];
 		$zeile++;
 	}
-	
+
 	//Gesamtkosten und Gesamtstunden anzeigen
 	$worksheet->writeNumber($zeile,6,$gesamtstunden, $format_bold);
 	$worksheet->writeNumber($zeile,7,$gesamtkosten, $format_number_bold);
 }
-	
+
 	$workbook->close();
 ?>
diff --git a/content/statistik/lehrauftragsliste_mail.xls.php b/content/statistik/lehrauftragsliste_mail.xls.php
index 40ec7a616..853be72fe 100644
--- a/content/statistik/lehrauftragsliste_mail.xls.php
+++ b/content/statistik/lehrauftragsliste_mail.xls.php
@@ -33,24 +33,24 @@ require_once('../../include/mail.class.php');
 
 $stsem = new studiensemester();
 
-if(isset($_GET['stsem']))
+if (isset($_GET['stsem']))
 {
-	if(check_stsem($_GET['stsem']))
+	if (check_stsem($_GET['stsem']))
 		$semester_aktuell = $_GET['stsem'];
 	else
 		die('Studiensemester ist ungueltig');
 }
 else
-	$semester_aktuell  = $stsem->getaktorNext();
+	$semester_aktuell = $stsem->getaktorNext();
 
 //UID als Kommandozeilenparameter
-if(isset($_SERVER['argv']) && isset($_SERVER['argv'][1]) && !strstr($_SERVER['argv'][1],'='))
+if (isset($_SERVER['argv']) && isset($_SERVER['argv'][1]) && !strstr($_SERVER['argv'][1], '='))
 {
 	$oe_kurzbz = $_SERVER['argv'][1];
 }
 else
 {
-	if(isset($_GET['oe_kurzbz']))
+	if (isset($_GET['oe_kurzbz']))
 		$oe_kurzbz = $_GET['oe_kurzbz'];
 	else
 	{
@@ -61,7 +61,7 @@ else
 }
 
 $file = 'lehrauftragsliste.xls';
-$file = tempnam('/tmp','lehrauftragsliste_').'.xls';
+$file = tempnam('/tmp', 'lehrauftragsliste_').'.xls';
 
 // Creating a workbook
 echo 'Lehrauftragslisten werden erstellt. Bitte warten!<BR>';
@@ -72,10 +72,10 @@ $db = new basis_db();
 
 $stg = new studiengang();
 $stg->getStudiengaengeFromOe($oe_kurzbz);
-$stg_arr=array();
-if(count($stg->result)>0)
+$stg_arr = array();
+if (count($stg->result) > 0)
 {
-	foreach($stg->result as $row)
+	foreach ($stg->result as $row)
 	{
 		$stg_arr[] = $row->studiengang_kz;
 	}
@@ -91,9 +91,7 @@ $qry_stg = "SELECT distinct studiengang_kz, typ, kurzbz
 				WHERE
 					lehre.tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 					tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND
-					tbl_lehreinheitmitarbeiter.semesterstunden is not null AND
-					tbl_lehreinheitmitarbeiter.stundensatz<>0 AND
-					tbl_lehreinheitmitarbeiter.faktor<>0
+					tbl_lehreinheitmitarbeiter.semesterstunden is not null
 				UNION
 				SELECT
 					studiengang_kz
@@ -107,16 +105,16 @@ $qry_stg = "SELECT distinct studiengang_kz, typ, kurzbz
 				) as foo
 				JOIN public.tbl_studiengang USING (studiengang_kz)
 				";
-if(count($stg_arr)>0)
-	$qry_stg.=" WHERE studiengang_kz in (".$db->db_implode4SQL($stg_arr).")";
+if (count($stg_arr) > 0)
+	$qry_stg .= " WHERE studiengang_kz in (".$db->db_implode4SQL($stg_arr).")";
 
-	$qry_stg.=" ORDER BY typ, kurzbz";
+	$qry_stg .= " ORDER BY typ, kurzbz";
 
 $liste_gesamt = array();
 
 $gesamt =& $workbook->addWorksheet('Gesamt');
 $gesamt->setInputEncoding('utf-8');
-$gesamtsheet_row=1;
+$gesamtsheet_row = 1;
 
 //Formate Definieren
 $format_bold =& $workbook->addFormat();
@@ -140,56 +138,58 @@ $format_number_bold->setNumFormat('0,0.00');
 $format_number_bold->setBold();
 
 $format_normal = & $workbook->addFormat();
-if($result_stg = $db->db_query($qry_stg))
+if ($result_stg = $db->db_query($qry_stg))
 {
-	while($row_stg = $db->db_fetch_object($result_stg))
+	while ($row_stg = $db->db_fetch_object($result_stg))
 	{
 		//Studiengang laden
 		$studiengang = new studiengang($row_stg->studiengang_kz);
-		$studiengang_kz=$row_stg->studiengang_kz;
+		$studiengang_kz = $row_stg->studiengang_kz;
 
 		// Creating a worksheet
 		$worksheet =& $workbook->addWorksheet($studiengang->kuerzel);
 		$worksheet->setInputEncoding('utf-8');
 		//echo "Writing $studiengang->kuerzel ...".microtime()."<br>";
 
-		$i=0;
+		$i = 0;
 		$gesamtsheet_row++;
-		//$gesamt->write(0,0,"", $format_colored); Mag er nicht. Wirft Fehler in MS Excel
-		//$gesamt->write(0,1,"Kennzeichnet Änderungen am Lehrauftrag innerhalb der letzten 31 Tage", $format_normal); Mag er nicht. Wirft Fehler in MS Excel
-		$worksheet->write(0,0,'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' '.$studiengang->kuerzel, $format_bold);
-		$gesamt->write($gesamtsheet_row,0,'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' '.$studiengang->kuerzel, $format_bold);
-		$gesamtsheet_row+=2;
+		$worksheet->write(0, 0, 'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' '.$studiengang->kuerzel, $format_bold);
+		$gesamt->write($gesamtsheet_row, 0, 'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' '.$studiengang->kuerzel, $format_bold);
+		$gesamtsheet_row += 2;
 		//Ueberschriften
-		$worksheet->write(2,$i,"Studiengang", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Studiengang", $format_bold);
-		$worksheet->write(2,++$i,"Personalnr", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Personalnr", $format_bold);
-		$worksheet->write(2,++$i,"Titel", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Titel", $format_bold);
-		$worksheet->write(2,++$i,"Vorname", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Vorname", $format_bold);
-		$worksheet->write(2,++$i,"Familienname", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Familienname", $format_bold);
-		$worksheet->write(2,++$i,"Fixangestellt", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Fixangestellt", $format_bold);
-		$worksheet->write(2,++$i,"Disz. Zuordnung", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Disz. Zuordnung", $format_bold);
-		$worksheet->write(2,++$i,"Department", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Department", $format_bold);
-		$worksheet->write(2,++$i,"LV-Stunden", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"LV-Stunden", $format_bold);
-		$worksheet->write(2,++$i,"LV-Kosten", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"LV-Kosten", $format_bold);
-		$worksheet->write(2,++$i,"Betreuerstunden", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Betreuerstunden", $format_bold);
-		$worksheet->write(2,++$i,"Betreuerkosten", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Betreuer-Kosten", $format_bold);
-		$worksheet->write(2,++$i,"Gesamtstunden", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Gesamtstunden", $format_bold);
-		$worksheet->write(2,++$i,"Gesamtkosten", $format_bold);
-		$gesamt->write($gesamtsheet_row,$i,"Gesamtkosten", $format_bold);
-		
+		$worksheet->write(2, $i, "Studiengang", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Studiengang", $format_bold);
+		$worksheet->write(2, ++$i, "Personalnr", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Personalnr", $format_bold);
+		$worksheet->write(2, ++$i, "Titel", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Titel", $format_bold);
+		$worksheet->write(2, ++$i, "Vorname", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Vorname", $format_bold);
+		$worksheet->write(2, ++$i, "Familienname", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Familienname", $format_bold);
+		$worksheet->write(2, ++$i, "Fixangestellt", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Fixangestellt", $format_bold);
+		$worksheet->write(2, ++$i, "Disz. Zuordnung", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Disz. Zuordnung", $format_bold);
+		$worksheet->write(2, ++$i, "Department", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Department", $format_bold);
+		$worksheet->write(2, ++$i, "LV-Stunden", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "LV-Stunden", $format_bold);
+		$worksheet->write(2, ++$i, "LV-Kosten", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "LV-Kosten", $format_bold);
+		$worksheet->write(2, ++$i, "Betreuerstunden", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Betreuerstunden", $format_bold);
+		$worksheet->write(2, ++$i, "Betreuerkosten", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Betreuer-Kosten", $format_bold);
+		$worksheet->write(2, ++$i, "Gesamtstunden", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Gesamtstunden", $format_bold);
+		$worksheet->write(2, ++$i, "Gesamtkosten", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Gesamtkosten", $format_bold);
+		$worksheet->write(2, ++$i, "Gesamtstunden angenommen", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Gesamtstunden angenommen", $format_bold);
+		$worksheet->write(2, ++$i, "Gesamtkosten angenommen", $format_bold);
+		$gesamt->write($gesamtsheet_row, $i, "Gesamtkosten angenommen", $format_bold);
+
 		//Daten holen
 		$qry = "SELECT tbl_lehreinheit.*,
 					tbl_person.vorname,
@@ -198,10 +198,9 @@ if($result_stg = $db->db_query($qry_stg))
 					tbl_mitarbeiter.personalnummer,
 					tbl_person.person_id,
 					tbl_mitarbeiter.mitarbeiter_uid,
-					tbl_lehreinheitmitarbeiter.faktor AS faktor,
 					tbl_lehreinheitmitarbeiter.stundensatz AS stundensatz,
 					tbl_lehreinheitmitarbeiter.semesterstunden AS semesterstunden,
-					CASE 
+					CASE
 						WHEN tbl_mitarbeiter.fixangestellt = true
 							THEN 'Ja'
 						ELSE 'Nein'
@@ -242,9 +241,9 @@ if($result_stg = $db->db_query($qry_stg))
 											AND tbl_benutzerfunktion.uid = tbl_benutzer.uid LIMIT 1
 										)
 									AND aktiv = true
-								
+
 								UNION ALL
-								
+
 								SELECT o.oe_kurzbz,
 									o.oe_parent_kurzbz,
 									o.organisationseinheittyp_kurzbz
@@ -258,11 +257,19 @@ if($result_stg = $db->db_query($qry_stg))
 						JOIN PUBLIC.tbl_organisationseinheit USING (oe_kurzbz)
 						WHERE meine_oes.organisationseinheittyp_kurzbz = 'Department'
 						) AS department,
-					CASE 
+					CASE
 						WHEN COALESCE(tbl_lehreinheitmitarbeiter.updateamum, tbl_lehreinheitmitarbeiter.insertamum) > now() - interval '31 days'
 							THEN 't'
 						ELSE 'f'
-						END AS geaendert
+						END AS geaendert,
+					(SELECT
+						vertragsstatus_kurzbz
+					FROM
+						lehre.tbl_vertrag_vertragsstatus
+					WHERE
+						vertrag_id = tbl_lehreinheitmitarbeiter.vertrag_id
+					ORDER BY datum DESC
+					LIMIT 1) as vertragsstatus
 				FROM lehre.tbl_lehreinheit,
 					lehre.tbl_lehreinheitmitarbeiter,
 					PUBLIC.tbl_mitarbeiter,
@@ -278,8 +285,6 @@ if($result_stg = $db->db_query($qry_stg))
 					AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
 					AND tbl_lehreinheitmitarbeiter.semesterstunden <> 0
 					AND tbl_lehreinheitmitarbeiter.semesterstunden IS NOT NULL
-					AND tbl_lehreinheitmitarbeiter.stundensatz <> 0
-					AND tbl_lehreinheitmitarbeiter.faktor <> 0
 					AND EXISTS (
 						SELECT lehreinheit_id
 						FROM lehre.tbl_lehreinheitgruppe
@@ -289,28 +294,62 @@ if($result_stg = $db->db_query($qry_stg))
 					vorname,
 					tbl_mitarbeiter.mitarbeiter_uid";
 
-		if($result = $db->db_query($qry))
+		if ($result = $db->db_query($qry))
 		{
-			$zeile=3;
+			$zeile = 3;
 			$gesamtkosten = 0;
-			$liste=array();
+			$liste = array();
 			$gesamtsheet_row++;
-			while($row = $db->db_fetch_object($result))
+			while ($row = $db->db_fetch_object($result))
 			{
 				//Gesamtstunden und Kosten ermitteln
-				if(array_key_exists($row->mitarbeiter_uid, $liste))
+				if (array_key_exists($row->mitarbeiter_uid, $liste))
 				{
-					$liste[$row->mitarbeiter_uid]['lvstunden'] = $liste[$row->mitarbeiter_uid]['lvstunden'] + $row->semesterstunden;
-					$liste[$row->mitarbeiter_uid]['lvkosten'] = $liste[$row->mitarbeiter_uid]['lvkosten'] + ($row->semesterstunden*$row->stundensatz*$row->faktor);
-					$liste[$row->mitarbeiter_uid]['gesamtstunden'] = $liste[$row->mitarbeiter_uid]['gesamtstunden'] + $row->semesterstunden;
-					$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $liste[$row->mitarbeiter_uid]['gesamtkosten'] + ($row->semesterstunden*$row->stundensatz*$row->faktor);
+					$liste[$row->mitarbeiter_uid]['lvstunden'] =
+						$liste[$row->mitarbeiter_uid]['lvstunden'] + $row->semesterstunden;
+					$liste[$row->mitarbeiter_uid]['lvkosten'] =
+						$liste[$row->mitarbeiter_uid]['lvkosten'] + ($row->semesterstunden * $row->stundensatz);
+					$liste[$row->mitarbeiter_uid]['gesamtstunden'] =
+						$liste[$row->mitarbeiter_uid]['gesamtstunden'] + $row->semesterstunden;
+					$liste[$row->mitarbeiter_uid]['gesamtkosten'] =
+						$liste[$row->mitarbeiter_uid]['gesamtkosten'] + ($row->semesterstunden * $row->stundensatz);
+
+					if (!isset($liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert']))
+					{
+						$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] = 0;
+						$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert'] = 0;
+					}
+
+					if ($row->vertragsstatus == 'akzeptiert')
+					{
+						$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] =
+							$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] + $row->semesterstunden;
+						$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert'] =
+							$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert']
+							+ ($row->semesterstunden * $row->stundensatz);
+					}
 				}
 				else
 				{
 					$liste[$row->mitarbeiter_uid]['lvstunden'] = $row->semesterstunden;
-					$liste[$row->mitarbeiter_uid]['lvkosten'] = $row->semesterstunden*$row->stundensatz*$row->faktor;
+					$liste[$row->mitarbeiter_uid]['lvkosten'] = $row->semesterstunden * $row->stundensatz;
 					$liste[$row->mitarbeiter_uid]['gesamtstunden'] = $row->semesterstunden;
-					$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $row->semesterstunden*$row->stundensatz*$row->faktor;
+					$liste[$row->mitarbeiter_uid]['gesamtkosten'] = $row->semesterstunden * $row->stundensatz;
+
+					if (!isset($liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert']))
+					{
+						$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] = 0;
+						$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert'] = 0;
+					}
+
+					if ($row->vertragsstatus == 'akzeptiert')
+					{
+						$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] =
+							$liste[$row->mitarbeiter_uid]['gesamtstunden_akzeptiert'] + $row->semesterstunden;
+						$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert'] =
+							$liste[$row->mitarbeiter_uid]['gesamtkosten_akzeptiert']
+							+ ($row->semesterstunden * $row->stundensatz);
+					}
 				}
 				$liste[$row->mitarbeiter_uid]['personalnummer'] = $row->personalnummer;
 				$liste[$row->mitarbeiter_uid]['titelpre'] = $row->titelpre;
@@ -321,21 +360,27 @@ if($result_stg = $db->db_query($qry_stg))
 				$liste[$row->mitarbeiter_uid]['department'] = $row->department;
 				$liste[$row->mitarbeiter_uid]['betreuergesamtstunden'] = 0;
 				$liste[$row->mitarbeiter_uid]['betreuergesamtkosten'] = 0;
-				if($row->geaendert=='t')
-					$liste[$row->mitarbeiter_uid]['geaendert']=true;
+				if ($row->geaendert == 't')
+					$liste[$row->mitarbeiter_uid]['geaendert'] = true;
 			}
 
 			//Alle holen die eine Betreuung aber keinen Lehrauftrag haben
-			$qry = "SELECT 
-						distinct personalnummer, titelpre, vorname, nachname, uid, CASE WHEN fixangestellt = true THEN 'Ja' ELSE 'Nein' END as fixangestellt,
-						(SELECT tbl_organisationseinheit.organisationseinheittyp_kurzbz||' '||tbl_organisationseinheit.bezeichnung
-						FROM public.tbl_benutzerfunktion 
-						JOIN public.tbl_organisationseinheit USING (oe_kurzbz)
-						WHERE funktion_kurzbz='oezuordnung'
-						AND (datum_von IS NULL OR datum_von <= now())
-						AND (datum_bis IS NULL OR datum_bis >= now())
-						AND tbl_benutzerfunktion.uid = tbl_benutzer.uid
-						LIMIT 1) AS oezuordnung,
+			$qry = "SELECT
+						distinct personalnummer, titelpre, vorname, nachname, uid,
+						CASE WHEN fixangestellt = true THEN 'Ja' ELSE 'Nein' END as fixangestellt,
+						(SELECT
+							tbl_organisationseinheit.organisationseinheittyp_kurzbz
+							|| ' ' || tbl_organisationseinheit.bezeichnung
+						FROM
+							public.tbl_benutzerfunktion
+							JOIN public.tbl_organisationseinheit USING (oe_kurzbz)
+						WHERE
+							funktion_kurzbz='oezuordnung'
+							AND (datum_von IS NULL OR datum_von <= now())
+							AND (datum_bis IS NULL OR datum_bis >= now())
+							AND tbl_benutzerfunktion.uid = tbl_benutzer.uid
+						LIMIT 1
+						) AS oezuordnung,
 						(
 						WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) AS (
 								SELECT oe_kurzbz,
@@ -357,9 +402,9 @@ if($result_stg = $db->db_query($qry_stg))
 											AND tbl_benutzerfunktion.uid = tbl_benutzer.uid LIMIT 1
 										)
 									AND aktiv = true
-								
+
 								UNION ALL
-								
+
 								SELECT o.oe_kurzbz,
 									o.oe_parent_kurzbz,
 									o.organisationseinheittyp_kurzbz
@@ -373,11 +418,11 @@ if($result_stg = $db->db_query($qry_stg))
 						JOIN PUBLIC.tbl_organisationseinheit USING (oe_kurzbz)
 						WHERE meine_oes.organisationseinheittyp_kurzbz = 'Department'
 						) AS department
-					FROM 
-						lehre.tbl_projektbetreuer, public.tbl_person, public.tbl_benutzer, 
-						public.tbl_mitarbeiter, lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, 
+					FROM
+						lehre.tbl_projektbetreuer, public.tbl_person, public.tbl_benutzer,
+						public.tbl_mitarbeiter, lehre.tbl_projektarbeit, lehre.tbl_lehreinheit,
 						lehre.tbl_lehrveranstaltung
-					WHERE 
+					WHERE
 						tbl_projektbetreuer.person_id=tbl_person.person_id AND
 						tbl_person.person_id=tbl_benutzer.person_id AND
 						tbl_mitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
@@ -385,28 +430,31 @@ if($result_stg = $db->db_query($qry_stg))
 						tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
 						tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 						tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-						tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND 
-						NOT EXISTS (SELECT 
-										mitarbeiter_uid 
-									FROM 
+						tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
+						NOT EXISTS (SELECT
+										mitarbeiter_uid
+									FROM
 										lehre.tbl_lehreinheitmitarbeiter, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung
-									WHERE 
+									WHERE
 										mitarbeiter_uid=tbl_benutzer.uid AND
-										tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND 
+										tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND
 										tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
 										tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
 										tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND
 										tbl_lehreinheitmitarbeiter.semesterstunden is not null AND
-										tbl_lehreinheitmitarbeiter.stundensatz<>0 AND
-										tbl_lehreinheitmitarbeiter.faktor<>0 AND
-										EXISTS (SELECT lehreinheit_id FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id) AND
-										tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).");";
-			
-			if($result = $db->db_query($qry))
+										EXISTS (
+											SELECT lehreinheit_id
+											FROM
+												lehre.tbl_lehreinheitgruppe
+											WHERE
+												lehreinheit_id=tbl_lehreinheit.lehreinheit_id) AND
+												tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).");";
+
+			if ($result = $db->db_query($qry))
 			{
-				while($row = $db->db_fetch_object($result))
+				while ($row = $db->db_fetch_object($result))
 				{
-					if(!isset($liste[$row->uid]))
+					if (!isset($liste[$row->uid]))
 					{
 						$liste[$row->uid]['personalnummer'] = $row->personalnummer;
 						$liste[$row->uid]['titelpre'] = $row->titelpre;
@@ -415,7 +463,7 @@ if($result_stg = $db->db_query($qry_stg))
 						$liste[$row->uid]['fixangestellt'] = $row->fixangestellt;
 						$liste[$row->uid]['oezuordnung'] = $row->oezuordnung;
 						$liste[$row->uid]['department'] = $row->department;
-						$liste[$row->uid]['geaendert']=false;
+						$liste[$row->uid]['geaendert'] = false;
 						$liste[$row->uid]['gesamtstunden'] = 0;
 						$liste[$row->uid]['gesamtkosten'] = 0;
 						$liste[$row->uid]['lvstunden'] = 0;
@@ -425,33 +473,69 @@ if($result_stg = $db->db_query($qry_stg))
 					}
 				}
 			}
-			
-			//Betreuungen fuer Projektarbeiten
-			foreach ($liste as $uid=>$arr)
-			{
-				$qry = "SELECT tbl_projektbetreuer.faktor, 
-								tbl_projektbetreuer.stunden, 
-								tbl_projektbetreuer.stundensatz, 
-								CASE WHEN COALESCE(tbl_projektbetreuer.updateamum, tbl_projektbetreuer.insertamum)>now()-interval '31 days' THEN 't' ELSE 'f' END as geaendert
-			        FROM lehre.tbl_projektbetreuer, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
-			               public.tbl_benutzer, lehre.tbl_projektarbeit, campus.vw_student
-			        WHERE tbl_projektbetreuer.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid=".$db->db_add_param($uid)." AND
-			              tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND student_uid=vw_student.uid
-			              AND tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
-			              tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-			              tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 
-				if($result = $db->db_query($qry))
+			//Betreuungen fuer Projektarbeiten
+			foreach ($liste as $uid => $arr)
+			{
+				$qry = "
+					SELECT
+						tbl_projektbetreuer.stunden,
+						tbl_projektbetreuer.stundensatz,
+						CASE WHEN
+							COALESCE(tbl_projektbetreuer.updateamum, tbl_projektbetreuer.insertamum) > now() - interval '31 days'
+							THEN
+								't'
+							ELSE
+								'f'
+						END as geaendert,
+						(
+							SELECT
+							vertragsstatus_kurzbz
+							FROM
+								lehre.tbl_vertrag_vertragsstatus
+							WHERE
+								vertrag_id = tbl_projektbetreuer.vertrag_id
+							ORDER BY datum DESC
+							LIMIT 1
+						) as vertragsstatus
+					FROM lehre.tbl_projektbetreuer, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
+						public.tbl_benutzer, lehre.tbl_projektarbeit, campus.vw_student
+					WHERE
+						tbl_projektbetreuer.person_id = tbl_benutzer.person_id
+						AND tbl_benutzer.uid = ".$db->db_add_param($uid)."
+						AND tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
+						AND student_uid = vw_student.uid
+						AND tbl_lehreinheit.lehreinheit_id = tbl_projektarbeit.lehreinheit_id
+						AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+						AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+						AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
+
+				if ($result = $db->db_query($qry))
 				{
-					while($row = $db->db_fetch_object($result))
+					while ($row = $db->db_fetch_object($result))
 					{
 						$liste[$uid]['gesamtstunden'] = $liste[$uid]['gesamtstunden'] + $row->stunden;
-						$liste[$uid]['gesamtkosten'] = $liste[$uid]['gesamtkosten'] + ($row->stunden*$row->stundensatz*$row->faktor);
+						$liste[$uid]['gesamtkosten'] =
+							$liste[$uid]['gesamtkosten'] + ($row->stunden * $row->stundensatz);
 						$liste[$uid]['betreuergesamtstunden'] = $liste[$uid]['betreuergesamtstunden'] + $row->stunden;
-						$liste[$uid]['betreuergesamtkosten'] = $liste[$uid]['betreuergesamtkosten'] + ($row->stunden*$row->stundensatz*$row->faktor);
-						if($row->geaendert=='t')
+						$liste[$uid]['betreuergesamtkosten'] =
+							$liste[$uid]['betreuergesamtkosten'] + ($row->stunden * $row->stundensatz);
+						if ($row->geaendert == 't')
 						{
-							$liste[$uid]['geaendert']=true;
+							$liste[$uid]['geaendert'] = true;
+						}
+						if (!isset($liste[$uid]['gesamtstunden_akzeptiert']))
+						{
+							$liste[$uid]['gesamtstunden_akzeptiert'] = 0;
+							$liste[$uid]['gesamtkosten_akzeptiert'] = 0;
+						}
+
+						if ($row->vertragsstatus == 'akzeptiert')
+						{
+							$liste[$uid]['gesamtstunden_akzeptiert'] =
+								$liste[$uid]['gesamtstunden_akzeptiert'] + $row->stunden;
+							$liste[$uid]['gesamtkosten_akzeptiert'] =
+								$liste[$uid]['gesamtkosten_akzeptiert'] + ($row->stunden * $row->stundensatz);
 						}
 					}
 				}
@@ -459,19 +543,19 @@ if($result_stg = $db->db_query($qry_stg))
 
 			$vn = array();
 			$nn = array();
-			foreach ($liste as $key => $row) 
+			foreach ($liste as $key => $row)
 			{
-		    	$vn[$key]  = $row['vorname'];
-		    	$nn[$key] = $row['nachname'];
+				$vn[$key] = $row['vorname'];
+				$nn[$key] = $row['nachname'];
 			}
-			
+
 			array_multisort($nn, SORT_ASC, $vn, SORT_ASC, $liste);
-			
+
 			//Daten ausgeben
-			foreach ($liste as $uid=>$row)
+			foreach ($liste as $uid => $row)
 			{
-				$i=0;
-				if(isset($row['geaendert']) && $row['geaendert']==true)
+				$i = 0;
+				if (isset($row['geaendert']) && $row['geaendert'] == true)
 				{
 					$format = $format_colored;
 					$formatnb = $format_number_colored;
@@ -482,231 +566,182 @@ if($result_stg = $db->db_query($qry_stg))
 					$formatnb = $format_number;
 				}
 				//Studiengang
-				$worksheet->write($zeile,$i,$studiengang->kuerzel, $format);
-				$gesamt->write($gesamtsheet_row,$i,$studiengang->kuerzel, $format);
+				$worksheet->write($zeile, $i, $studiengang->kuerzel, $format);
+				$gesamt->write($gesamtsheet_row, $i, $studiengang->kuerzel, $format);
 				//Personalnummer
-				$worksheet->write($zeile,++$i,$row['personalnummer'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['personalnummer'], $format);
+				$worksheet->write($zeile, ++$i, $row['personalnummer'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['personalnummer'], $format);
 				//Titel
-				$worksheet->write($zeile,++$i,$row['titelpre'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['titelpre'], $format);
+				$worksheet->write($zeile, ++$i, $row['titelpre'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['titelpre'], $format);
 				//Vorname
-				$worksheet->write($zeile,++$i,$row['vorname'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['vorname'], $format);
+				$worksheet->write($zeile, ++$i, $row['vorname'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['vorname'], $format);
 				//Nachname
-				$worksheet->write($zeile,++$i,$row['nachname'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['nachname'], $format);
+				$worksheet->write($zeile, ++$i, $row['nachname'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['nachname'], $format);
 				//Fixangestellt
-				$worksheet->write($zeile,++$i,$row['fixangestellt'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['fixangestellt'], $format);
+				$worksheet->write($zeile, ++$i, $row['fixangestellt'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['fixangestellt'], $format);
 				//OE-Zuordnung
-				$worksheet->write($zeile,++$i,$row['oezuordnung'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['oezuordnung'], $format);
+				$worksheet->write($zeile, ++$i, $row['oezuordnung'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['oezuordnung'], $format);
 				//Department der OE-Zuordnung
-				$worksheet->write($zeile,++$i,$row['department'], $format);
-				$gesamt->write($gesamtsheet_row,$i,$row['department'], $format);
+				$worksheet->write($zeile, ++$i, $row['department'], $format);
+				$gesamt->write($gesamtsheet_row, $i, $row['department'], $format);
 				//LVStunden
-				$lvstunden = str_replace(',', '.', $row['lvstunden']);
-				$worksheet->write($zeile,++$i,$lvstunden, $format);
-				$gesamt->write($gesamtsheet_row,$i,$lvstunden, $format);
+				$lvstunden = str_replace(', ', '.', $row['lvstunden']);
+				$worksheet->write($zeile, ++$i, $lvstunden, $format);
+				$gesamt->write($gesamtsheet_row, $i, $lvstunden, $format);
 				//LVKosten
-				$lvkosten = str_replace(',', '.', $row['lvkosten']);
-				$worksheet->writeNumber($zeile,++$i,$lvkosten, $formatnb);
-				$gesamt->writeNumber($gesamtsheet_row,$i,$lvkosten, $formatnb);
+				$lvkosten = str_replace(', ', '.', $row['lvkosten']);
+				$worksheet->writeNumber($zeile, ++$i, $lvkosten, $formatnb);
+				$gesamt->writeNumber($gesamtsheet_row, $i, $lvkosten, $formatnb);
 				//Betreuerstunden
-				$betreuergesamtstunden = str_replace(',', '.', $row['betreuergesamtstunden']);
-				$worksheet->write($zeile,++$i,$betreuergesamtstunden, $formatnb);
-				$gesamt->write($gesamtsheet_row,$i,$betreuergesamtstunden, $formatnb);
+				$betreuergesamtstunden = str_replace(', ', '.', $row['betreuergesamtstunden']);
+				$worksheet->write($zeile, ++$i, $betreuergesamtstunden, $formatnb);
+				$gesamt->write($gesamtsheet_row, $i, $betreuergesamtstunden, $formatnb);
 				//Betreuerkosten
-				$betreuergesamtkosten = str_replace(',', '.', $row['betreuergesamtkosten']);
-				$worksheet->write($zeile,++$i,$betreuergesamtkosten, $formatnb);
-				$gesamt->write($gesamtsheet_row,$i,$betreuergesamtkosten, $formatnb);
+				$betreuergesamtkosten = str_replace(', ', '.', $row['betreuergesamtkosten']);
+				$worksheet->write($zeile, ++$i, $betreuergesamtkosten, $formatnb);
+				$gesamt->write($gesamtsheet_row, $i, $betreuergesamtkosten, $formatnb);
 				//Gesamtstunden
-				$gesamtstunden = str_replace(',', '.', $row['gesamtstunden']);
-				$worksheet->write($zeile,++$i,$gesamtstunden, $formatnb);
-				$gesamt->write($gesamtsheet_row,$i,$gesamtstunden, $formatnb);
+				$gesamtstunden = str_replace(', ', '.', $row['gesamtstunden']);
+				$worksheet->write($zeile, ++$i, $gesamtstunden, $formatnb);
+				$gesamt->write($gesamtsheet_row, $i, $gesamtstunden, $formatnb);
 				//Gesamtkosten
-				$gesamtkosten_row = str_replace(',', '.', $row['gesamtkosten']);
-				$worksheet->writeNumber($zeile,++$i,$gesamtkosten_row, $formatnb);
-				$gesamt->writeNumber($gesamtsheet_row,$i,$gesamtkosten_row, $formatnb);
-				
-				
+				$gesamtkosten_row = str_replace(', ', '.', $row['gesamtkosten']);
+				$worksheet->writeNumber($zeile, ++$i, $gesamtkosten_row, $formatnb);
+				$gesamt->writeNumber($gesamtsheet_row, $i, $gesamtkosten_row, $formatnb);
+				//Gesamtstunden akzeptiert
+				$gesamtstunden_akzeptiert = str_replace(', ', '.', $row['gesamtstunden_akzeptiert']);
+				$worksheet->write($zeile, ++$i, $gesamtstunden_akzeptiert, $formatnb);
+				$gesamt->write($gesamtsheet_row, $i, $gesamtstunden_akzeptiert, $formatnb);
+				//Gesamtkosten akzeptiert
+				$gesamtkosten_akzeptiert_row = str_replace(', ', '.', $row['gesamtkosten_akzeptiert']);
+				$worksheet->writeNumber($zeile, ++$i, $gesamtkosten_akzeptiert_row, $formatnb);
+				$gesamt->writeNumber($gesamtsheet_row, $i, $gesamtkosten_akzeptiert_row, $formatnb);
+
 				//Kosten zu den Gesamtkosten hinzurechnen
 				$gesamtkosten = $gesamtkosten + $row['gesamtkosten'];
 				$zeile++;
 				$gesamtsheet_row++;
-				
-				$liste_gesamt[$uid]['personalnummer']=$row['personalnummer'];
-				$liste_gesamt[$uid]['titelpre']=$row['titelpre'];
-				$liste_gesamt[$uid]['vorname']=$row['vorname'];
-				$liste_gesamt[$uid]['nachname']=$row['nachname'];
-				if(isset($liste_gesamt[$uid]['gesamtstunden']))
-					$liste_gesamt[$uid]['gesamtstunden']+=$row['gesamtstunden'];
-				else 
-					$liste_gesamt[$uid]['gesamtstunden']=$row['gesamtstunden'];
-					
-				if(isset($liste_gesamt[$uid]['gesamtkosten']))
-					$liste_gesamt[$uid]['gesamtkosten']+=$row['gesamtkosten'];
-				else 
-					$liste_gesamt[$uid]['gesamtkosten']=$row['gesamtkosten'];
+
+				$liste_gesamt[$uid]['personalnummer'] = $row['personalnummer'];
+				$liste_gesamt[$uid]['titelpre'] = $row['titelpre'];
+				$liste_gesamt[$uid]['vorname'] = $row['vorname'];
+				$liste_gesamt[$uid]['nachname'] = $row['nachname'];
+				if (isset($liste_gesamt[$uid]['gesamtstunden']))
+					$liste_gesamt[$uid]['gesamtstunden'] += $row['gesamtstunden'];
+				else
+					$liste_gesamt[$uid]['gesamtstunden'] = $row['gesamtstunden'];
+
+				if (isset($liste_gesamt[$uid]['gesamtkosten']))
+					$liste_gesamt[$uid]['gesamtkosten'] += $row['gesamtkosten'];
+				else
+					$liste_gesamt[$uid]['gesamtkosten'] = $row['gesamtkosten'];
+
+				if (isset($liste_gesamt[$uid]['gesamtstunden_akzeptiert']))
+					$liste_gesamt[$uid]['gesamtstunden_akzeptiert'] += $row['gesamtstunden_akzeptiert'];
+				else
+					$liste_gesamt[$uid]['gesamtstunden_akzeptiert'] = $row['gesamtstunden_akzeptiert'];
+
+				if (isset($liste_gesamt[$uid]['gesamtkosten_akzeptiert']))
+					$liste_gesamt[$uid]['gesamtkosten_akzeptiert'] += $row['gesamtkosten_akzeptiert'];
+				else
+					$liste_gesamt[$uid]['gesamtkosten_akzeptiert'] = $row['gesamtkosten_akzeptiert'];
 			}
 
 			//Gesamtkosten anzeigen
-			$worksheet->writeNumber($zeile,13,$gesamtkosten, $format_number_bold);
-			$gesamt->writeNumber($gesamtsheet_row,13,$gesamtkosten, $format_number_bold);
+			$worksheet->writeNumber($zeile, 13, $gesamtkosten, $format_number_bold);
+			$gesamt->writeNumber($gesamtsheet_row, 13, $gesamtkosten, $format_number_bold);
 		}
 	}
-	
-	/*
-	// Gesamtliste ueber alle Studiengaenge
-	$worksheet =& $workbook->addWorksheet('Gesamt');
-	$i=0;
-	$gesamtkosten=0;
-	$zeile=3;
-	
-	$worksheet->write(0,0,'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' Gesamtliste', $format_bold);
-	//Ueberschriften
-	//$worksheet->write(2,$i,"Studiengang", $format_bold);
-	$worksheet->write(2,++$i,"Personalnr", $format_bold);
-	$worksheet->write(2,++$i,"Titel", $format_bold);
-	$worksheet->write(2,++$i,"Vorname", $format_bold);
-	$worksheet->write(2,++$i,"Familienname", $format_bold);
-	$worksheet->write(2,++$i,"Stunden", $format_bold);
-	$worksheet->write(2,++$i,"Kosten", $format_bold);
-	
-	$vn = array();
-	$nn = array();
-	foreach ($liste_gesamt as $key => $row) 
-	{
-    	$vn[$key]  = $row['vorname'];
-    	$nn[$key] = $row['nachname'];
-	}
-	
-	array_multisort($nn, SORT_ASC, $vn, SORT_ASC, $liste_gesamt);
 
-	//Daten ausgeben
-	foreach ($liste_gesamt as $uid=>$row)
-	{
-		$i=0;
-		if(isset($row['geaendert']) && $row['geaendert']==true)
-		{
-			$format = $format_colored;
-			$formatnb = $format_number_colored;
-		}
-		else
-		{
-			$format = $format_normal;
-			$formatnb = $format_number;
-		}
-		
-		//Personalnummer
-		$worksheet->write($zeile,++$i,$row['personalnummer'], $format);
-		//Titel
-		$worksheet->write($zeile,++$i,$row['titelpre'], $format);
-		//Vorname
-		$worksheet->write($zeile,++$i,$row['vorname'], $format);
-		//Nachname
-		$worksheet->write($zeile,++$i,$row['nachname'], $format);
-		//Stunden
-		$worksheet->write($zeile,++$i,$row['gesamtstunden'], $format);
-		//Kosten
-		$worksheet->writeNumber($zeile,++$i,$row['gesamtkosten'], $formatnb);
-
-		//Kosten zu den Gesamtkosten hinzurechnen
-		$gesamtkosten = $gesamtkosten + $row['gesamtkosten'];
-		$zeile++;
-	}
-
-	//Gesamtkosten anzeigen
-	$worksheet->writeNumber($zeile,6,$gesamtkosten, $format_number_bold);
-	*/
-	
 	//Betreuerstunden
 	$worksheet =& $workbook->addWorksheet('Betreuerstunden');
 	$worksheet->setInputEncoding('utf-8');
-	$qry = "SELECT 
+	$qry = "SELECT
 				studiensemester_kurzbz, nachname, vorname, sum(stunden) AS stunden, titelpre,
-				sum(tbl_projektbetreuer.stundensatz*stunden*tbl_projektbetreuer.faktor)::numeric(8,2) AS euro, person_id 
-			FROM 
-				public.tbl_person JOIN lehre.tbl_projektbetreuer USING (person_id) 
-				JOIN lehre.tbl_projektarbeit USING (projektarbeit_id) 
-				JOIN lehre.tbl_lehreinheit USING (lehreinheit_id) 
+				sum(tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)::numeric(8, 2) AS euro, person_id
+			FROM
+				public.tbl_person JOIN lehre.tbl_projektbetreuer USING (person_id)
+				JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+				JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 				JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-			WHERE 
-				studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-				stunden>0";
+			WHERE
+				studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+				stunden > 0";
 
-	if(count($stg_arr)>0)
-		$qry.=" AND tbl_lehrveranstaltung.studiengang_kz IN(".$db->db_implode4SQL($stg_arr).")";
+	if (count($stg_arr) > 0)
+		$qry .= " AND tbl_lehrveranstaltung.studiengang_kz IN(".$db->db_implode4SQL($stg_arr).")";
 
-	$qry.="
-			GROUP BY 
-				studiensemester_kurzbz,person_id,nachname,vorname, titelpre
-			ORDER BY 
-				nachname,vorname 
+	$qry .= "
+			GROUP BY
+				studiensemester_kurzbz, person_id, nachname, vorname, titelpre
+			ORDER BY
+				nachname, vorname
 			";
-	$i=0;
-	$gesamtkosten=0;
+	$i = 0;
+	$gesamtkosten = 0;
 
-	$worksheet->write(0,0,'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' Betreuerstunden', $format_bold);
+	$worksheet->write(0, 0, 'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' Betreuerstunden', $format_bold);
 	//Ueberschriften
-	//$worksheet->write(2,$i,"Studiengang", $format_bold);
-	$worksheet->write(2,++$i,"Titel", $format_bold);
-	$worksheet->write(2,++$i,"Familienname", $format_bold);
-	$worksheet->write(2,++$i,"Vorname", $format_bold);
-	$worksheet->write(2,++$i,"Stunden", $format_bold);
-	$worksheet->write(2,++$i,"Kosten", $format_bold);
-		
+	//$worksheet->write(2, $i, "Studiengang", $format_bold);
+	$worksheet->write(2, ++$i, "Titel", $format_bold);
+	$worksheet->write(2, ++$i, "Familienname", $format_bold);
+	$worksheet->write(2, ++$i, "Vorname", $format_bold);
+	$worksheet->write(2, ++$i, "Stunden", $format_bold);
+	$worksheet->write(2, ++$i, "Kosten", $format_bold);
+
 	$format = $format_normal;
 	$formatnb = $format_number;
-	if($result = $db->db_query($qry))
+	if ($result = $db->db_query($qry))
 	{
-		$zeile=3;
-		while($row = $db->db_fetch_object($result))
+		$zeile = 3;
+		while ($row = $db->db_fetch_object($result))
 		{
-			$i=0;
+			$i = 0;
 			//Studiensemester
-			$worksheet->write($zeile,++$i,$row->titelpre, $format);
+			$worksheet->write($zeile, ++$i, $row->titelpre, $format);
 			//Vorname
-			$worksheet->write($zeile,++$i,$row->nachname, $format);
+			$worksheet->write($zeile, ++$i, $row->nachname, $format);
 			//Nachname
-			$worksheet->write($zeile,++$i,$row->vorname, $format);
+			$worksheet->write($zeile, ++$i, $row->vorname, $format);
 			//Stunden
-			$worksheet->writeNumber($zeile,++$i,$row->stunden, $formatnb);
+			$worksheet->writeNumber($zeile, ++$i, $row->stunden, $formatnb);
 			//Kosten
-			$worksheet->writeNumber($zeile,++$i,$row->euro, $formatnb);
+			$worksheet->writeNumber($zeile, ++$i, $row->euro, $formatnb);
 			$zeile++;
-			
+
 			$gesamtkosten = $gesamtkosten + $row->euro;
 		}
-		
+
 		//Gesamtkosten anzeigen
-		$worksheet->writeNumber($zeile,5,$gesamtkosten, $format_number_bold);
+		$worksheet->writeNumber($zeile, 5, $gesamtkosten, $format_number_bold);
 	}
-	
+
 	$workbook->close();
 
 	//Mail versenden mit Excel File im Anhang
     $subject = "Lehrauftragsliste ".date('d.m.Y');
     $message = "Dies ist eine automatische eMail!\n\nAnbei die Lehrauftragslisten vom ".date('d.m.Y');
-    $message.= "\n\nJederzeit abrufbar unter ".APP_ROOT.'content/statistik/lehrauftragsliste_mail.xls.php';
-	if($oe_kurzbz!='')
-		$message.="?oe_kurzbz=".$oe_kurzbz;
+    $message .= "\n\nJederzeit abrufbar unter ".APP_ROOT.'content/statistik/lehrauftragsliste_mail.xls.php';
+	if ($oe_kurzbz != '')
+		$message .= "?oe_kurzbz=".$oe_kurzbz;
 
     $fileatttype = "application/xls";
     $fileattname = "lehrauftragsliste_".date('Y_m_d').".xls";
 
 	$empfaenger = MAIL_GST;
-	if($oe_kurzbz=='lehrgang')
+	if ($oe_kurzbz == 'lehrgang')
 		$empfaenger = MAIL_LG;
 
-    $mail = new mail($empfaenger, 'noreply@'.DOMAIN, $subject, $message);
-    $mail->addAttachmentBinary($file, $fileatttype, $fileattname);
-    
-    if($mail->send())
-		echo 'Email mit Lehrauftragslisten wurde an '.$empfaenger.' versandt!';
-     else
-        echo "Fehler beim Versenden der Lehrauftragsliste";
-}
+	$mail = new mail($empfaenger, 'noreply@'.DOMAIN, $subject, $message);
+	$mail->addAttachmentBinary($file, $fileatttype, $fileattname);
 
-?>
+	if ($mail->send())
+		echo 'Email mit Lehrauftragslisten wurde an '.$empfaenger.' versandt!';
+	else
+		echo "Fehler beim Versenden der Lehrauftragsliste";
+}
diff --git a/content/statistik/lektorenstatistik.php b/content/statistik/lektorenstatistik.php
deleted file mode 100644
index 0d5af63e9..000000000
--- a/content/statistik/lektorenstatistik.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/* Copyright (C) 2007 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>.
- */
-/*
- * Erstellt eine Tablle mit der Anzahl der Lektoren die im angegebenen
- * StudienJAHR einen Lehrauftrag im jeweiligen Institut haben, getrennt nach Fixangestellten und Freien
- * und der Anzahl der Stunden die in diesem Institut gehalten wurden
- * Bei einem klick auf das Institut wird die Detailansicht angezeigt, in der die einzelnen
- * Lektoren Namentlich aufscheinen.
- */
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../include/studiensemester.class.php');
-require_once('../../include/benutzerberechtigung.class.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/fachbereich.class.php');
-
-$ws='';
-$ss='';
-$db = new basis_db();
-if(isset($_GET['stsem']))
-	$stsem = $_GET['stsem'];
-else
-{
-	$stsem_obj = new studiensemester();
-	$stsem = $stsem_obj->getaktorNext();
-}
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-	<html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
-	<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
-	<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
-	</head>
-	<body>';
-
-if(isset($_GET['details']) && isset($_GET['fachbereich_kurzbz']))
-{
-	$ss = (isset($_GET['ss'])?$_GET['ss']:'');
-	$ws = (isset($_GET['ws'])?$_GET['ws']:'');
-	$fachbereich = new fachbereich();
-	if(!$fachbereich->load($_GET['fachbereich_kurzbz']))
-		die('Institut existiert nicht');
-	
-	echo "<h2>LektorInnenstatistik (Lehrauftrag ohne Betreuungen) $ws / $ss - ".$fachbereich->bezeichnung.'</h2>';
-	$qry = "SELECT distinct mitarbeiter_uid, anrede, nachname, vorname, titelpre, titelpost,
-			(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND fixangestellt AND geschlecht='m') a) AS fix_m,
-			(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND fixangestellt AND geschlecht='w') a) AS fix_w
-			FROM lehre.tbl_lehreinheitmitarbeiter 
-				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) 
-				JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) 
-				JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz)
-				JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
-				JOIN public.tbl_benutzer ON(uid=mitarbeiter_uid)
-				JOIN public.tbl_person USING(person_id)
-			WHERE studiensemester_kurzbz in(".$db->db_add_param($ws).",".$db->db_add_param($ss).") 
-				AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND fixangestellt
-			ORDER BY nachname, vorname";
-	
-	if($db->db_query($qry))
-	{
-		$ausgabe='';
-		$fix_m=0;
-		$fix_w=0;
-		while($row = $db->db_fetch_object())
-		{
-			$ausgabe.= '<tr>';
-			$ausgabe.= "<td>$row->anrede</td>";
-			$ausgabe.= "<td>$row->titelpre</td>";
-			$ausgabe.= "<td>$row->nachname</td>";
-			$ausgabe.= "<td>$row->vorname</td>";
-			$ausgabe.= "<td>$row->titelpost</td>";
-			$ausgabe.= "</tr>";
-			$fix_w=$row->fix_w;
-			$fix_m=$row->fix_m;
-		}
-		echo (($fix_m)+($fix_w))." Fixangestellte<br>M: ".$fix_m." <br>W: ".$fix_w."
-			<table class='liste table-stripeclass:alternate table-autostripe'>
-					<thead>
-						<tr>
-							<th>Anrede</th>
-							<th>TitelPre</th>
-							<th>Nachname</th>
-							<th>Vorname</th>
-							<th>Titelpost</th>
-						</tr>
-					</thead>
-					<tbody>
-				 ";
-		echo $ausgabe;
-	}
-	echo '</tbody></table>';
-
-	$qry = "SELECT distinct mitarbeiter_uid, anrede, nachname, vorname, titelpre, titelpost,
-			(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND NOT fixangestellt AND geschlecht='m') a) AS not_fix_m,
-			(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND NOT fixangestellt AND geschlecht='w') a) AS not_fix_w
-			FROM lehre.tbl_lehreinheitmitarbeiter 
-				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) 
-				JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-				JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) 
-				JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
-				JOIN public.tbl_benutzer ON(uid=mitarbeiter_uid)
-				JOIN public.tbl_person USING(person_id)
-			WHERE studiensemester_kurzbz in(".$db->db_add_param($ws).",".$db->db_add_param($ss).") 
-				AND fachbereich_kurzbz=".$db->db_add_param($fachbereich->fachbereich_kurzbz)." AND NOT fixangestellt
-			ORDER BY nachname, vorname";
-		
-	if($db->db_query($qry))
-	{
-		$ausgabe='';
-		$not_fix_m=0;
-		$not_fix_w=0;
-		while($row = $db->db_fetch_object())
-		{
-			$ausgabe.= '<tr>';
-			$ausgabe.= "<td>$row->anrede</td>";
-			$ausgabe.= "<td>$row->titelpre</td>";
-			$ausgabe.= "<td>$row->nachname</td>";
-			$ausgabe.= "<td>$row->vorname</td>";
-			$ausgabe.= "<td>$row->titelpost</td>";
-			$ausgabe.= "</tr>";
-			$not_fix_w=$row->not_fix_w;
-			$not_fix_m=$row->not_fix_m;
-		}
-		echo "<br /><br />".(($not_fix_m)+($not_fix_w))." Freiangestellte<br>M: ".$not_fix_m." <br>W: ".$not_fix_w."
-			<table class='liste table-stripeclass:alternate table-autostripe'>
-					<thead>
-						<tr>
-							<th>Anrede</th>
-							<th>TitelPre</th>
-							<th>Nachname</th>
-							<th>Vorname</th>
-							<th>Titelpost</th>
-						</tr>
-					</thead>
-					<tbody>
-				 ";
-		echo $ausgabe;
-	}
-	echo '</tbody></table>';
-}
-else 
-{
-	if(substr($stsem, 0, 2)=='WS')
-	{
-		$stsem_obj = new studiensemester();
-		$ss = $stsem_obj->getNextFrom($stsem);
-		$ws = $stsem;
-	}
-	else 
-	{
-		$stsem_obj = new studiensemester();
-		$ws = $stsem_obj->getPreviousFrom($stsem);
-		$ss = $stsem;
-	}
-	echo "<h2>LektorInnenstatistik (Lehrauftrag ohne Betreuungen) $ws / $ss";
-	echo '<span style="position:absolute; right:15px;">'.date('d.m.Y').'</span></h2><br>';
-	echo '</h2>';
-	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">Studiensemester: <SELECT name="stsem">';
-	$studsem = new studiensemester();
-	$studsem->getAll();
-
-	foreach ($studsem->studiensemester as $stsemester)
-	{
-		if($stsemester->studiensemester_kurzbz==$ws)
-			$selected='selected';
-		else 
-			$selected='';
-		if(substr($stsemester->studiensemester_kurzbz, 0, 2)=='WS')
-		{
-			$stsem_obj = new studiensemester();
-			$ss1 = $stsem_obj->getNextFrom($stsemester->studiensemester_kurzbz);
-			$ws1 = $stsemester->studiensemester_kurzbz;
-			echo '<option value="'.$stsemester->studiensemester_kurzbz.'" '.$selected.'>'.$ws1.'/'.$ss1.'</option>';			
-		}
-		
-	}
-	echo '</SELECT>
-		<input type="submit" value="Anzeigen" /></form><br><br>';
-
-	if($stsem!='')
-	{
-		
-		echo "<table class='liste table-stripeclass:alternate table-autostripe'>
-					<thead>
-						<tr>
-							<th></th>
-							<th colspan=4>Anzahl</th>
-							<th colspan=2>ALVS</th>
-						</tr>
-						<tr>
-							<th>Institute</th>
-							<th colspan=2>fix</th>
-							<th colspan=2>extern</th>
-							<th>$ws</th>
-							<th>$ss</th>
-						</tr>
-						<tr>
-							<th></th>
-							<th>M</th>
-							<th>W</th>
-							<th>M</th>
-							<th>W</th>
-							<th colspan=2></th>
-						</tr>
-					</thead>
-					<tbody>
-					
-				 ";
-		
-		$qry = "SELECT 
-					bezeichnung, fachbereich_kurzbz,
-					(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=a.fachbereich_kurzbz AND fixangestellt AND geschlecht='m') a) AS fix_m,
-					(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=a.fachbereich_kurzbz AND fixangestellt AND geschlecht='w') a) AS fix_w,
-					(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=a.fachbereich_kurzbz AND NOT fixangestellt AND geschlecht='m') a) AS extern_m,
-					(SELECT count(*) FROM (SELECT distinct mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz) JOIN campus.vw_mitarbeiter ON(uid=mitarbeiter_uid) WHERE studiensemester_kurzbz IN(".$db->db_add_param($ws).",".$db->db_add_param($ss).") AND fachbereich_kurzbz=a.fachbereich_kurzbz AND NOT fixangestellt AND geschlecht='w') a) AS extern_w,
-					(SELECT sum(tbl_lehreinheitmitarbeiter.semesterstunden) FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz) WHERE studiensemester_kurzbz=".$db->db_add_param($ws)." AND fachbereich_kurzbz=a.fachbereich_kurzbz AND faktor>0 AND stundensatz>0) AS ws,
-					(SELECT sum(tbl_lehreinheitmitarbeiter.semesterstunden) FROM lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id) JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz) WHERE studiensemester_kurzbz=".$db->db_add_param($ss)." AND fachbereich_kurzbz=a.fachbereich_kurzbz AND faktor>0 AND stundensatz>0) AS ss
-				FROM public.tbl_fachbereich a WHERE aktiv ORDER BY bezeichnung";
-		
-		if($db->db_query($qry))
-		{
-			//$gesamt_fix=0;
-			//$gesamt_extern=0;
-			$gesamt_ws=0;
-			$gesamt_ss=0;
-			while($row = $db->db_fetch_object())
-			{
-				if(($row->fix_m==0 && $row->fix_w==0) && ($row->extern_m==0 && $row->extern_w==0))
-				{
-					continue;
-				}
-				echo '<tr>';
-				echo "<td><a href='".$_SERVER['PHP_SELF']."?details=true&fachbereich_kurzbz=$row->fachbereich_kurzbz&ss=$ss&ws=$ws'>$row->bezeichnung</a></td>";
-				echo "<td align='center'>$row->fix_m</td>";
-				echo "<td align='center'>$row->fix_w</td>";
-				echo "<td align='center'>$row->extern_m</td>";
-				echo "<td align='center'>$row->extern_w</td>";
-				echo "<td align='center'>$row->ws</td>";
-				echo "<td align='center'>$row->ss</td>";
-				echo "</tr>";
-				//$gesamt_fix+=$row->fix;
-				//$gesamt_extern+=$row->extern;
-				$gesamt_ws+=$row->ws;
-				$gesamt_ss+=$row->ss;
-			}
-			echo '<tr>';
-			echo '<td><b>SUMME</b></td>';
-			echo "<td align='center'>&nbsp;</td>";
-			echo "<td align='center'>&nbsp;</td>";
-			echo "<td align='center'>&nbsp;</td>";
-			echo "<td align='center'>&nbsp;</td>";
-			echo "<td align='center'><b>$gesamt_ws</b></td>";
-			echo "<td align='center'><b>$gesamt_ss</b></td>";
-			echo "</tr>";
-			
-		}
-		echo '</tbody></table>';
-	}
-}
-?>
-</body>
-</html>
diff --git a/content/statistik/lvplanung.php b/content/statistik/lvplanung.php
index be06f5c12..a0d3544bc 100644
--- a/content/statistik/lvplanung.php
+++ b/content/statistik/lvplanung.php
@@ -107,12 +107,16 @@ elseif($oe_kurzbz!='')
 if($studiengang_kz!='') //Liste nach Studiengang
 {
 	$qry = "SELECT
-				tbl_lehrveranstaltung.kurzbz as kurzbz, tbl_lehrveranstaltung.bezeichnung as bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+				tbl_lehrveranstaltung.kurzbz as kurzbz, tbl_lehrveranstaltung.bezeichnung as bezeichnung,
+				tbl_lehrveranstaltung.lehrveranstaltung_id,
 				tbl_lehrveranstaltung.ects as ects, tbl_lehrveranstaltung.semesterstunden as semesterstunden,
-				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung, tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
-				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz, tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
-				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz, tbl_lehreinheitmitarbeiter.faktor as lektor_faktor,
-				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester
+				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung,
+				tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
+				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz,
+				tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
+				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz,
+				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz,
+				tbl_lehrveranstaltung.semester
 			FROM
 				lehre.tbl_lehrveranstaltung, lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter,
 				lehre.tbl_lehrveranstaltung as lehrfach, public.tbl_benutzer, public.tbl_person
@@ -126,17 +130,25 @@ if($studiengang_kz!='') //Liste nach Studiengang
 				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
 	if($semester!='')
 		$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);
-	$qry.=" ORDER BY tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehreinheit.lehreinheit_id";
+	$qry.=" ORDER BY
+		tbl_lehrveranstaltung.semester,
+		tbl_lehrveranstaltung.bezeichnung,
+		tbl_lehrveranstaltung.lehrveranstaltung_id,
+		tbl_lehreinheit.lehreinheit_id";
 }
 elseif($mitarbeiter_uid!='') // Liste nach Mitarbeiter
 {
-$qry = "SELECT
-				tbl_lehrveranstaltung.kurzbz as kurzbz, tbl_lehrveranstaltung.bezeichnung as bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+	$qry = "SELECT
+				tbl_lehrveranstaltung.kurzbz as kurzbz,
+				tbl_lehrveranstaltung.bezeichnung as bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
 				tbl_lehrveranstaltung.ects as ects, tbl_lehrveranstaltung.semesterstunden as semesterstunden,
-				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung, tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
-				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz, tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
-				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz, tbl_lehreinheitmitarbeiter.faktor as lektor_faktor,
-				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester
+				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung,
+				tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
+				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz,
+				tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
+				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz,
+				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz,
+				tbl_lehrveranstaltung.semester
 			FROM
 				lehre.tbl_lehrveranstaltung, lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter,
 				lehre.tbl_lehrveranstaltung as lehrfach, public.tbl_benutzer, public.tbl_person
@@ -148,17 +160,25 @@ $qry = "SELECT
 				tbl_person.person_id=tbl_benutzer.person_id AND
 				tbl_lehreinheitmitarbeiter.mitarbeiter_uid=".$db->db_add_param($mitarbeiter_uid)." AND
 				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
-	$qry.=" ORDER BY tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehreinheit.lehreinheit_id";
+	$qry.=" ORDER BY
+		tbl_lehrveranstaltung.semester,
+		tbl_lehrveranstaltung.bezeichnung,
+		tbl_lehrveranstaltung.lehrveranstaltung_id,
+		tbl_lehreinheit.lehreinheit_id";
 }
 elseif($oe_kurzbz!='') // Liste nach Organisationseinheit
 {
-$qry = "SELECT
-				tbl_lehrveranstaltung.kurzbz as kurzbz, tbl_lehrveranstaltung.bezeichnung as bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+	$qry = "SELECT
+				tbl_lehrveranstaltung.kurzbz as kurzbz,
+				tbl_lehrveranstaltung.bezeichnung as bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
 				tbl_lehrveranstaltung.ects as ects, tbl_lehrveranstaltung.semesterstunden as semesterstunden,
-				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung, tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
-				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz, tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
-				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz, tbl_lehreinheitmitarbeiter.faktor as lektor_faktor,
-				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester
+				lehrfach.kurzbz as lf_kurzbz, lehrfach.bezeichnung as lf_bezeichnung,
+				tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
+				tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz,
+				tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
+				tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz,
+				tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz,
+				tbl_lehrveranstaltung.semester
 			FROM
 				lehre.tbl_lehrveranstaltung, lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter,
 				lehre.tbl_lehrveranstaltung as lehrfach, public.tbl_benutzer, public.tbl_person
@@ -170,7 +190,12 @@ $qry = "SELECT
 				tbl_person.person_id=tbl_benutzer.person_id AND
 				lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz)." AND
 				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
-	$qry.=" ORDER BY tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehreinheit.lehreinheit_id";
+	$qry.=" ORDER BY
+			tbl_lehrveranstaltung.studiengang_kz,
+			tbl_lehrveranstaltung.semester,
+			tbl_lehrveranstaltung.bezeichnung,
+			tbl_lehrveranstaltung.lehrveranstaltung_id,
+			tbl_lehreinheit.lehreinheit_id";
 }
 else
 	die('Fehlerhafte Parameteruebergabe');
@@ -248,10 +273,10 @@ if($result = $db->db_query($qry))
 		echo "<td align='right'>$row->lektor_semesterstunden</td>";
 		echo "<td>$gruppen</td>";
 		echo "<td>$row->nachname $row->vorname</td>";
-		echo "<td align='right'>".number_format(($row->lektor_stundensatz*$row->lektor_faktor*$row->lektor_semesterstunden),2,',','.')." €</td>";
+		echo "<td align='right'>".number_format(($row->lektor_stundensatz*$row->lektor_semesterstunden),2,',','.')." €</td>";
 		echo '<td>&nbsp;</td>';
 		echo '</tr>';
-		$kosten_lv +=($row->lektor_stundensatz*$row->lektor_faktor*$row->lektor_semesterstunden);
+		$kosten_lv +=($row->lektor_stundensatz*$row->lektor_semesterstunden);
 		$stunden_lv +=$row->lektor_semesterstunden;
 	}
 	$gesamtkosten_lva +=$kosten_lv;
@@ -273,15 +298,15 @@ if($studiengang_kz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person
+				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
+				lehre.tbl_projektbetreuer, public.tbl_person
 			WHERE
 				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
 				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-				(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)>0
+				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 
 	if($semester!='')
@@ -299,8 +324,7 @@ elseif($mitarbeiter_uid!='')
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_projektbetreuer.person_id=".$db->db_add_param($mitarbeiter->person_id, FHC_INTEGER)." AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-				(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)>0
+				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 }
 elseif($oe_kurzbz!='')
@@ -308,7 +332,8 @@ elseif($oe_kurzbz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach
+				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
+				public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach
 			WHERE
 				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
 				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
@@ -316,8 +341,7 @@ elseif($oe_kurzbz!='')
 				tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-				lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz)." AND
-				(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)>0
+				lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz)."
 				";
 }
 else
@@ -332,8 +356,6 @@ if($result = $db->db_query($qry))
 		echo '<tr>';
 		echo '<th>&nbsp;</th>';
 		echo "<th colspan='3'>Titel</th>";
-		//echo "<th>&nbsp;</th>";
-		//echo '<th>&nbsp;</th>';
 		echo "<th align='right'>Stunden</th>";
 		echo "<th>Student</th>";
 		echo "<th>Lektor</th>";
@@ -348,17 +370,15 @@ if($result = $db->db_query($qry))
 			echo '<tr class="liste1">';
 			echo '<td>&nbsp;</td>';
 			echo "<td colspan='3'>$row->titel</td>";
-			//echo "<td>&nbsp;</td>";
-			//echo '<td>&nbsp;</td>';
 			echo "<td align='right'>".number_format($row->stunden,2)."</td>";
 			$benutzer = new benutzer();
 			$benutzer->load($row->student_uid);
 			echo "<td>$benutzer->nachname $benutzer->vorname</td>";
 			echo "<td>$row->nachname $row->vorname</td>";
-			echo "<td align='right'>".number_format(($row->stundensatz*$row->faktor*$row->stunden),2,',','.')." €</td>";
+			echo "<td align='right'>".number_format(($row->stundensatz*$row->stunden),2,',','.')." €</td>";
 			echo '<td>&nbsp;</td>';
 			echo '</tr>';
-			$gesamtkosten_betreuung +=($row->stundensatz*$row->faktor*$row->stunden);
+			$gesamtkosten_betreuung +=($row->stundensatz*$row->stunden);
 			$stunden_betreuung+=$row->stunden;
 		}
 
diff --git a/content/statistik/lvplanung.xls.php b/content/statistik/lvplanung.xls.php
index 286554392..c933677af 100644
--- a/content/statistik/lvplanung.xls.php
+++ b/content/statistik/lvplanung.xls.php
@@ -108,7 +108,6 @@ SELECT tbl_lehrveranstaltung.bezeichnung AS lf_bezeichnung,
 	tbl_lehreinheitmitarbeiter.mitarbeiter_uid,
 	tbl_lehrveranstaltung.semester AS lv_semester,
 	tbl_lehreinheit.lehreinheit_id,
-	tbl_lehreinheitmitarbeiter.faktor,
 	tbl_lehreinheitmitarbeiter.stundensatz,
 	tbl_lehreinheitmitarbeiter.semesterstunden lemss,
 	tbl_lehreinheitmitarbeiter.planstunden,
@@ -154,7 +153,6 @@ SELECT tbl_lehrveranstaltung.bezeichnung AS lf_bezeichnung,
 FROM lehre.tbl_lehrveranstaltung
 JOIN lehre.tbl_lehreinheit USING (lehrveranstaltung_id)
 JOIN lehre.tbl_lehreinheitmitarbeiter USING (lehreinheit_id)
---JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
 WHERE tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
 
 if($studiengang_kz!='')
@@ -227,8 +225,6 @@ $maxlength[$spalte]=15;
 $worksheet->write($zeile,++$spalte,"Anmerkung", $format_bold);
 $maxlength[$spalte]=9;
 
-// Neu 13.11.2009 sequens
-
 $worksheet->write($zeile,++$spalte,"LV-Leitung", $format_bold);
 $maxlength[$spalte]=9;
 
@@ -248,7 +244,6 @@ if($result = $db->db_query($qry))
 {
 	while($row = $db->db_fetch_object($result))
 	{
-
 		$spalte=0;
 		$zeile++;
 
@@ -387,7 +382,6 @@ if($result = $db->db_query($qry))
 				student_uid,
 				stunden,
 				tbl_projektbetreuer.stundensatz,
-				tbl_projektbetreuer.faktor,
 				tbl_projektbetreuer.person_id
 			FROM lehre.tbl_projektarbeit,
 				lehre.tbl_lehreinheit,
@@ -397,11 +391,8 @@ if($result = $db->db_query($qry))
 			WHERE tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
 				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 				AND tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
-				--AND tbl_lehreinheit.lehrfach_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 				AND tbl_person.person_id = tbl_projektbetreuer.person_id
-				AND tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)."
-				AND (tbl_projektbetreuer.stundensatz * tbl_projektbetreuer.stunden) > 0
-				";
+				AND tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
 
 	if($uid!=='')
 	{
@@ -415,6 +406,9 @@ if($result = $db->db_query($qry))
 	if($studiengang_kz!='')
 		$qry.=" AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 
+	if($semester!='')
+		$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);
+
 	if($result = $db->db_query($qry))
 	{
 		$spalte=0;
@@ -459,7 +453,6 @@ if($result = $db->db_query($qry))
 				$fixangestellt = 'Extern';
 			}
 
-
 			//Studiengang
 			$worksheet->write($zeile,$spalte,$stg_obj->kuerzel_arr[$row->studiengang_kz]);
 			if($maxlength[$spalte]<mb_strlen($stg_obj->kuerzel_arr[$row->studiengang_kz]))
diff --git a/content/statistik/lvplanunggesamtsj.php b/content/statistik/lvplanunggesamtsj.php
deleted file mode 100644
index 0a2defb5b..000000000
--- a/content/statistik/lvplanunggesamtsj.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?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>.
- */
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/lehrveranstaltung.class.php');
-require_once('../../include/studiengang.class.php');
-require_once('../../include/person.class.php');
-require_once('../../include/benutzer.class.php');
-require_once('../../include/studiensemester.class.php');
-require_once('../../include/Excel/excel.php');
-
-$user = get_uid();
-loadVariables($user);
-$db = new basis_db();
-
-$stg_arr = array();
-$studiengang = new studiengang();
-$studiengang->getAll();
-
-foreach ($studiengang->result as $row)
-	$stg_arr[$row->studiengang_kz] = $row->kuerzel;
-
-// ****** FUNKTIONEN ******* //
-function drawBetreuungen()
-{
-	global $gesamtkosten_lva, $zeile, $spalte, $stsem1, $stsem2, $last_fb, $worksheet;
-	global $format_bold, $format_colored, $gesamtkosten_betreuung;
-	global $gesamtkosten_fb, $format_number, $format_number1;
-
-	$db = new basis_db();
-	$qry_fb = "SELECT
-				*
-			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
-				public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach, public.tbl_fachbereich
-			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
-				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-				tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id AND
-				tbl_person.person_id=tbl_projektbetreuer.person_id AND
-				(tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem1)." OR
-				 tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem2).") AND
-				(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)>0 AND
-				lehrfach.oe_kurzbz = tbl_fachbereich.oe_kurzbz AND
-				tbl_fachbereich.fachbereich_kurzbz=".$db->db_add_param($last_fb)."
-			";
-
-	$gesamtkosten_betreuung=0;
-	if($result_fb = $db->db_query($qry_fb))
-	{
-		$spalte=11;
-		$worksheet->writeNumber($zeile, ++$spalte, $gesamtkosten_lva, $format_number);
-
-		if($db->db_num_rows($result_fb)>0)
-		{
-
-			$zeile++;
-
-			$zeile++;
-			$worksheet->write($zeile, 1, "Betreuungen", $format_bold);
-			$spalte=2;
-			$worksheet->write($zeile, $spalte, "Titel", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "Stunden", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "Summe", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "Student", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "Lektor", $format_colored);
-			$worksheet->write($zeile, ++$spalte, "Kosten", $format_colored);
-
-
-			$stunden_betreuung=0;
-			while($row_fb = $db->db_fetch_object($result_fb))
-			{
-				$zeile++;
-				$spalte=2;
-				$worksheet->write($zeile, $spalte, $row_fb->titel);
-				$spalte+=2;
-				$worksheet->write($zeile, ++$spalte, '');
-				$worksheet->write($zeile, ++$spalte, number_format($row_fb->stunden,2));
-				$worksheet->write($zeile, ++$spalte, '');
-
-				$benutzer = new benutzer();
-				$benutzer->load($row_fb->student_uid);
-				$worksheet->write($zeile, ++$spalte, "$benutzer->nachname $benutzer->vorname");
-				$worksheet->write($zeile, ++$spalte, "$row_fb->nachname $row_fb->vorname");
-				$worksheet->writeNumber($zeile, ++$spalte, ($row_fb->stundensatz*$row_fb->faktor*$row_fb->stunden), $format_number1);
-
-				$gesamtkosten_betreuung +=($row_fb->stundensatz*$row_fb->faktor*$row_fb->stunden);
-				$stunden_betreuung+=$row_fb->stunden;
-			}
-
-			$zeile++;
-			$spalte=7;
-			$worksheet->writeNumber($zeile, $spalte, $stunden_betreuung, $format_number);
-			$spalte=11;
-			$worksheet->writeNumber($zeile, $spalte, $gesamtkosten_betreuung, $format_number);
-
-			$spalte=12;
-			$worksheet->writeNumber($zeile, $spalte, $gesamtkosten_betreuung, $format_number);
-
-		}
-		$gesamtkosten_fb += ($gesamtkosten_betreuung+$gesamtkosten_lva);
-		$gesamtkosten_lva=0;
-	}
-	else
-		echo 'Error';
-}
-// ****** END FUNKTIONEN ******* //
-$stsem1 = $semester_aktuell;
-$stsem_obj = new studiensemester();
-
-if(substr($stsem1,0,1)=='S') //Eigentlich gehoert =='W', nur kurzfristige aenderung
-	$stsem2 = $stsem_obj->getNextFrom($stsem1);
-else
-	$stsem2 = $stsem_obj->getPreviousFrom($stsem1);
-
-$qry = "SELECT
-			tbl_lehrveranstaltung.kurzbz as kurzbz, tbl_lehrveranstaltung.bezeichnung as bezeichnung,
-			tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.ects as ects,
-			tbl_lehrveranstaltung.semesterstunden as semesterstunden, lehrfach.kurzbz as lf_kurzbz,
-			lehrfach.bezeichnung as lf_bezeichnung, tbl_lehreinheit.lehreinheit_id as lehreinheit_id,
-			tbl_lehreinheit.lehrform_kurzbz as lehrform_kurzbz,
-			tbl_lehreinheitmitarbeiter.semesterstunden as lektor_semesterstunden,
-			tbl_lehreinheitmitarbeiter.stundensatz as lektor_stundensatz,
-			tbl_lehreinheitmitarbeiter.faktor as lektor_faktor,
-			tbl_person.vorname, tbl_person.nachname, tbl_lehrveranstaltung.studiengang_kz,
-			tbl_lehrveranstaltung.semester,
-			tbl_fachbereich.fachbereich_kurzbz
-		FROM
-			lehre.tbl_lehrveranstaltung, lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter,
-			lehre.tbl_lehrveranstaltung as lehrfach, public.tbl_benutzer, public.tbl_person, public.tbl_fachbereich
-		WHERE
-			tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND
-			tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-			lehrfach.lehrveranstaltung_id=tbl_lehreinheit.lehrfach_id AND
-			tbl_benutzer.uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid AND
-			tbl_person.person_id=tbl_benutzer.person_id AND
-			(tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem1)." OR
-			 tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem2).") AND
-			 tbl_fachbereich.oe_kurzbz=lehrfach.oe_kurzbz
-		ORDER BY
-			tbl_fachbereich.fachbereich_kurzbz,
-			tbl_lehrveranstaltung.studiengang_kz,
-			tbl_lehrveranstaltung.semester,
-			tbl_lehrveranstaltung.bezeichnung,
-			tbl_lehrveranstaltung.lehrveranstaltung_id,
-			tbl_lehreinheit.lehreinheit_id";
-
-// Creating a workbook
-$workbook = new Spreadsheet_Excel_Writer();
-$workbook->setVersion(8);
-// sending HTTP headers
-$workbook->send("LVPlanungGesamtSJ". "_" . date("Y_m_d") . ".xls");
-
-// Creating a worksheet
-$worksheet =& $workbook->addWorksheet("LV-Planung Gesamt");
-$worksheet->setInputEncoding('utf-8');
-$format_bold =& $workbook->addFormat();
-$format_bold->setBold();
-
-$format_bold =& $workbook->addFormat();
-$format_bold->setBold();
-
-$format_colored =& $workbook->addFormat();
-$format_colored->setFgColor(22);
-$format_colored->setBorder(1);
-$format_colored->setBold();
-
-$format_colored1 =& $workbook->addFormat();
-$format_colored1->setFgColor(22);
-$format_colored1->setBorder(1);
-$format_colored1->setBold();
-
-$format_number =& $workbook->addFormat();
-$format_number->setNumFormat("#,##0.00");
-$format_number->setBold();
-
-$format_number1 =& $workbook->addFormat();
-$format_number1->setNumFormat("#,##0.00");
-
-$worksheet->write(0, 0,"LV-Planung für $stsem1/$stsem2", $format_bold);
-
-$zeile=3;
-$spalte=0;
-
-$worksheet->write($zeile, $spalte,'Institut', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Kurzbz', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Bezeichnung', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Lehrform', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'ECTS', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'StudentenStunden', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'LektorenStunden', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'GesamtStunden', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Gruppen', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Lektor', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Kosten', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Summe', $format_colored1);
-$worksheet->write($zeile, ++$spalte,'Gesamtkosten', $format_colored1);
-
-if($result = $db->db_query($qry))
-{
-	$last_lva='';
-	$stunden_lv=0;
-	$kosten_lv=0;
-	$gesamtkosten_lva=0;
-	$gesamtkosten_fb=0;
-	$last_fb='';
-	while($row = $db->db_fetch_object($result))
-	{
-		if($last_lva!=$row->lehrveranstaltung_id)
-		{
-			if($last_lva!='')
-			{
-				$zeile++;
-				$spalte=7;
-				$worksheet->write($zeile, $spalte,sprintf('%.2f',$stunden_lv), $format_bold);
-				$spalte=11;
-				$worksheet->writeNumber($zeile, $spalte, $kosten_lv, $format_number);
-
-				$gesamtkosten_lva +=$kosten_lv;
-				$stunden_lv=0;
-				$kosten_lv=0;
-			}
-
-			if($last_fb!=$row->fachbereich_kurzbz && $last_fb!='')
-			{
-				drawBetreuungen();
-			}
-
-			if($last_fb=='' || $last_fb!=$row->fachbereich_kurzbz)
-			{
-				$zeile++;
-				$worksheet->write($zeile, 0, $row->fachbereich_kurzbz, $format_bold);
-				$zeile++;
-				$last_fb = $row->fachbereich_kurzbz;
-			}
-
-			$last_lva=$row->lehrveranstaltung_id;
-			$zeile++;
-			$spalte=0;
-			$worksheet->write($zeile, $spalte, $row->fachbereich_kurzbz, $format_colored);
-			$worksheet->write($zeile, ++$spalte, $stg_arr[$row->studiengang_kz].'-'.$row->semester.' '.$row->kurzbz, $format_colored);
-			$worksheet->write($zeile, ++$spalte,$row->bezeichnung, $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte, $row->ects, $format_colored);
-			$worksheet->write($zeile, ++$spalte,$row->semesterstunden, $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-			$worksheet->write($zeile, ++$spalte,"", $format_colored);
-		}
-
-		$gruppen='';
-		$qry_grp = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id);
-		if($result_grp = $db->db_query($qry_grp))
-		{
-			while($row_grp = $db->db_fetch_object($result_grp))
-			{
-				if($gruppen=='')
-					$gruppen = ($row_grp->gruppe_kurzbz!=''?$row_grp->gruppe_kurzbz:trim($stg_arr[$row_grp->studiengang_kz].'-'.$row_grp->semester.$row_grp->verband.$row_grp->gruppe));
-				else
-					$gruppen .= ','.($row_grp->gruppe_kurzbz!=''?$row_grp->gruppe_kurzbz:trim($stg_arr[$row_grp->studiengang_kz].'-'.$row_grp->semester.$row_grp->verband.$row_grp->gruppe));
-			}
-		}
-		$zeile++;
-		$spalte=1;
-		$worksheet->write($zeile, ++$spalte, "$row->lf_bezeichnung ($row->lf_kurzbz)");
-		$worksheet->write($zeile, ++$spalte, $row->lehrform_kurzbz);
-		$spalte++;
-		$worksheet->write($zeile, ++$spalte, "");
-		$worksheet->write($zeile, ++$spalte, $row->lektor_semesterstunden);
-		$worksheet->write($zeile, ++$spalte, "");
-		$worksheet->write($zeile, ++$spalte, $gruppen);
-		$worksheet->write($zeile, ++$spalte, "$row->nachname $row->vorname");
-		$worksheet->writeNumber($zeile, ++$spalte, ($row->lektor_stundensatz*$row->lektor_faktor*$row->lektor_semesterstunden), $format_number1);
-
-		$kosten_lv +=($row->lektor_stundensatz*$row->lektor_faktor*$row->lektor_semesterstunden);
-		$stunden_lv +=$row->lektor_semesterstunden;
-	}
-	$zeile++;
-	$spalte=7;
-	$worksheet->write($zeile, $spalte,sprintf('%.2f',$stunden_lv), $format_bold);
-	$spalte=11;
-	$worksheet->writeNumber($zeile, $spalte, $kosten_lv, $format_number);
-
-	$gesamtkosten_lva +=$kosten_lv;
-	$stunden_lv=0;
-	$kosten_lv=0;
-
-
-	drawBetreuungen();
-
-}
-
-$zeile++;
-$spalte=8;
-$worksheet->write($zeile, $spalte, 'Gesamt:', $format_bold);
-$spalte=12;
-$worksheet->writeNumber($zeile, $spalte, $gesamtkosten_fb, $format_number);
-
-$worksheet->setColumn(0, 0, 30); //FB
-$worksheet->setColumn(0, 1, 15); //Kurzbz
-$worksheet->setColumn(0, 2, 40); //bezeichnung
-$worksheet->setColumn(0, 3, 5); //Lehrform
-$worksheet->setColumn(0, 4, 5); //ECTS
-$worksheet->setColumn(0, 5, 10); //Studentenstuden
-$worksheet->setColumn(0, 6, 10); //LektorStunden
-$worksheet->setColumn(0, 7, 10); //Gesamtstunden
-$worksheet->setColumn(0, 8, 10); //Gruppen
-$worksheet->setColumn(0, 9, 10); //Lektor
-$worksheet->setColumn(0, 10, 10); //Kosten
-$worksheet->setColumn(0, 11, 20); //Gesamtkosten
-
-$workbook->close();
-?>
diff --git a/content/statistik/projektarbeitexport.xls.php b/content/statistik/projektarbeitexport.xls.php
index 01376c591..213cb4b94 100644
--- a/content/statistik/projektarbeitexport.xls.php
+++ b/content/statistik/projektarbeitexport.xls.php
@@ -20,9 +20,7 @@
  *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
  */
 /**
- * Exportiert die Studentendaten in ein Excel File.
- * Die zu exportierenden Spalten werden per GET uebergeben.
- * Die Adressen werden immer dazugehaengt
+ * Exportiert die Projektarbeiten inklusive deren Betreuern
  */
 require_once('../../config/vilesci.config.inc.php');
 require_once('../../include/functions.inc.php');
@@ -33,140 +31,150 @@ $db = new basis_db();
 $user = get_uid();
 $datum_obj = new datum();
 loadVariables($user);
-	
-	//Parameter holen
-	$studiengang_kz = isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:'';
-	$semester = isset($_GET['semester'])?$_GET['semester']:'';
-	$verband = isset($_GET['verband'])?$_GET['verband']:'';
-	$gruppe = isset($_GET['gruppe'])?$_GET['gruppe']:'';
-	$gruppe_kurzbz = isset($_GET['gruppe_kurzbz'])?$_GET['gruppe_kurzbz']:'';
-	$studiensemester_kurzbz = isset($_GET['studiensemester_kurzbz'])?$_GET['studiensemester_kurzbz']:'';
-		
-	$maxlength= array();
-	$zeile=1;
 
-	// Creating a workbook
-	$workbook = new Spreadsheet_Excel_Writer();
-	$workbook->setVersion(8);
-	
-	// sending HTTP headers
-	$workbook->send("Projektarbeit". "_" . date("d_m_Y") . ".xls");
+//Parameter holen
+$studiengang_kz = isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:'';
+$semester = isset($_GET['semester'])?$_GET['semester']:'';
+$verband = isset($_GET['verband'])?$_GET['verband']:'';
+$gruppe = isset($_GET['gruppe'])?$_GET['gruppe']:'';
+$gruppe_kurzbz = isset($_GET['gruppe_kurzbz'])?$_GET['gruppe_kurzbz']:'';
+$studiensemester_kurzbz = isset($_GET['studiensemester_kurzbz'])?$_GET['studiensemester_kurzbz']:'';
 
-	// Creating a worksheet
-	$worksheet =& $workbook->addWorksheet("Studenten");
-	$worksheet->setInputEncoding('utf-8');
-	
-	$format_bold =& $workbook->addFormat();
-	$format_bold->setBold();
-	
-	$format_title =& $workbook->addFormat();
-	$format_title->setBold();
-	// let's merge
-	$format_title->setAlign('merge');
+$maxlength = array();
+$zeile = 1;
 
-	//Zeilenueberschriften ausgeben
-	
-	$headline=array('Typ der Projektarbeit','Titel der Projektarbeit','Student',
-	                'Note','Punkte','Beginn','Ende','Freigegeben','Gesperrt bis','Gesamtstunden','Themenbereich',
-	                'Anmerkung','Projektarbeit ID');
-	
-	$i=0;
-	foreach ($headline as $title)
+// Creating a workbook
+$workbook = new Spreadsheet_Excel_Writer();
+$workbook->setVersion(8);
+
+// sending HTTP headers
+$workbook->send("Projektarbeit". "_" . date("d_m_Y") . ".xls");
+
+// Creating a worksheet
+$worksheet =& $workbook->addWorksheet("Studenten");
+$worksheet->setInputEncoding('utf-8');
+
+$format_bold =& $workbook->addFormat();
+$format_bold->setBold();
+
+$format_title =& $workbook->addFormat();
+$format_title->setBold();
+// let's merge
+$format_title->setAlign('merge');
+
+//Zeilenueberschriften ausgeben
+$headline = array('Typ der Projektarbeit','Titel der Projektarbeit','Student',
+                'Note','Punkte','Beginn','Ende','Freigegeben','Gesperrt bis','Gesamtstunden','Themenbereich',
+                'Anmerkung','Projektarbeit ID');
+
+$i = 0;
+foreach ($headline as $title)
+{
+	$worksheet->write(0,$i,$title, $format_bold);
+		$maxlength[$i] = mb_strlen($title);
+	$i++;
+}
+
+// Daten holen
+$qry = "SELECT
+			tbl_projekttyp.bezeichnung, titel,
+			trim(COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'')
+			|| ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'')),
+			(SELECT anmerkung FROM lehre.tbl_note WHERE note=tbl_projektarbeit.note) as anmerkung, punkte, beginn,
+			ende, CASE WHEN freigegeben THEN 'Ja' ELSE 'Nein' END, gesperrtbis, gesamtstunden, themenbereich,
+			tbl_projektarbeit.anmerkung, projektarbeit_id
+		FROM
+			lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
+			public.tbl_benutzer, public.tbl_person, lehre.tbl_projekttyp
+		WHERE
+			tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
+			tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id AND
+			tbl_projektarbeit.student_uid = tbl_benutzer.uid AND
+			tbl_benutzer.person_id = tbl_person.person_id AND
+			tbl_projektarbeit.projekttyp_kurzbz = tbl_projekttyp.projekttyp_kurzbz AND
+			tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)." AND
+			tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz)." AND
+			tbl_projektarbeit.projekttyp_kurzbz IN ('Bachelor','Diplom','Projekt')";
+
+if ($semester != '')
+	$qry .= " AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester);
+
+//echo $qry;
+$zeile=1;
+if ($result = $db->db_query($qry))
+{
+	while ($row = $db->db_fetch_array($result))
 	{
-		$worksheet->write(0,$i,$title, $format_bold);
-			$maxlength[$i]=mb_strlen($title);
-		$i++;
-	}
-			
-	// Daten holen
-	$qry = "SELECT 
-				tbl_projekttyp.bezeichnung, titel, trim(COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'')), 
-				(SELECT anmerkung FROM lehre.tbl_note WHERE note=tbl_projektarbeit.note) as anmerkung, punkte, beginn,
-				ende, CASE WHEN freigegeben THEN 'Ja' ELSE 'Nein' END, gesperrtbis, gesamtstunden, themenbereich, tbl_projektarbeit.anmerkung, projektarbeit_id
-			FROM 
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, 
-				public.tbl_benutzer, public.tbl_person, lehre.tbl_projekttyp
-			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND
-				tbl_projektarbeit.student_uid=tbl_benutzer.uid AND
-				tbl_benutzer.person_id=tbl_person.person_id AND
-				tbl_projektarbeit.projekttyp_kurzbz=tbl_projekttyp.projekttyp_kurzbz AND
-				tbl_lehreinheit.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND
-				tbl_lehrveranstaltung.studiengang_kz='".addslashes($studiengang_kz)."' AND
-				tbl_projektarbeit.projekttyp_kurzbz IN ('Bachelor','Diplom','Projekt')";
-	
-	if($semester!='')
-		$qry.= " AND tbl_lehrveranstaltung.semester='".addslashes($semester)."'";
-	
-	//echo $qry;
-	$zeile=1;
-	if($result = $db->db_query($qry))
-	{
-		while($row = $db->db_fetch_array($result))
+		$zeile++;
+		$i = 0;
+
+		//Projektarbeit
+		foreach ($row as $idx => $content)
 		{
-			$zeile++;
-			$i=0;
-			
-			//Projektarbeit
-			foreach ($row as $idx=>$content)
+			if (is_numeric($idx))
 			{
-				if(is_numeric($idx))
+				$worksheet->write($zeile, $i, $content);
+				if (mb_strlen($content) > $maxlength[$i])
+					$maxlength[$i] = mb_strlen($content);
+				$i++;
+			}
+		}
+		$zeile++;
+
+		//Betreuer
+		$qry_betreuer = "
+			SELECT
+				betreuerart_kurzbz, COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'')
+				|| ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,''),
+				tbl_note.anmerkung, name, punkte, stunden, stundensatz
+			FROM
+				(lehre.tbl_projektbetreuer JOIN tbl_person USING(person_id))
+				LEFT JOIN lehre.tbl_note USING(note)
+			WHERE
+				projektarbeit_id = ".$db->db_add_param($row['projektarbeit_id']);
+
+		if ($result_betreuer = $db->db_query($qry_betreuer))
+		{
+			if ($db->db_num_rows($result_betreuer) > 0)
+			{
+				$headline = array('Betreuerart','Betreuer','Note','Name','Punkte','Stunden','Stundensatz');
+
+				$i = 1;
+
+				foreach ($headline as $title)
 				{
-					$worksheet->write($zeile, $i, $content);
-					if(mb_strlen($content)>$maxlength[$i])
-						$maxlength[$i]=mb_strlen($content);
+					$worksheet->write($zeile,$i,$title, $format_bold);
+					if (mb_strlen($title) > $maxlength[$i])
+						$maxlength[$i] = mb_strlen($title);
 					$i++;
 				}
-			}
-			$zeile++;
-						
-			//Betreuer
-									
-			$qry_betreuer = "SELECT betreuerart_kurzbz, COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,''), tbl_note.anmerkung, faktor, name, punkte, stunden, stundensatz FROM (lehre.tbl_projektbetreuer JOIN tbl_person USING(person_id)) LEFT JOIN lehre.tbl_note USING(note) WHERE projektarbeit_id='".$row['projektarbeit_id']."'";
-			
-			if($result_betreuer = $db->db_query($qry_betreuer))
-			{
-				if($db->db_num_rows($result_betreuer)>0)
+
+				$zeile++;
+				while ($row_betreuer = $db->db_fetch_array($result_betreuer))
 				{
-					$headline=array('Betreuerart','Betreuer','Note','Faktor','Name','Punkte','Stunden','Stundensatz');
-		
-					$i=1;
-					
-					foreach ($headline as $title)
+					$i = 1;
+
+					foreach ($row_betreuer as $idx => $content)
 					{
-						$worksheet->write($zeile,$i,$title, $format_bold);
-						if(mb_strlen($title)>$maxlength[$i])
-							$maxlength[$i]=mb_strlen($title);
-						$i++;
-					}
-					
-					$zeile++;
-					while($row_betreuer = $db->db_fetch_array($result_betreuer))
-					{
-						$i=1;
-				
-						foreach ($row_betreuer as $idx=>$content)
+						if (is_numeric($idx))
 						{
-							if(is_numeric($idx))
-							{
-								$worksheet->write($zeile, $i, $content);
-								if(mb_strlen($content)>$maxlength[$i])
-									$maxlength[$i]=mb_strlen($content);
-								$i++;
-							}
+							$worksheet->write($zeile, $i, $content);
+							if (mb_strlen($content) > $maxlength[$i])
+								$maxlength[$i] = mb_strlen($content);
+							$i++;
 						}
-						$zeile++;
 					}
+					$zeile++;
 				}
 			}
-			
 		}
+
 	}
-	//Die Breite der Spalten setzen
-	foreach($maxlength as $i=>$breite)
-		$worksheet->setColumn($i, $i, $breite+2);
-    
-	$workbook->close();
+}
+//Die Breite der Spalten setzen
+foreach ($maxlength as $i => $breite)
+	$worksheet->setColumn($i, $i, $breite + 2);
+
+$workbook->close();
 
 ?>
diff --git a/content/student/aufnahmetermine.js.php b/content/student/aufnahmetermine.js.php
index 17674eadf..fd92fce92 100644
--- a/content/student/aufnahmetermine.js.php
+++ b/content/student/aufnahmetermine.js.php
@@ -1,496 +1,501 @@
-<?php
-/* Copyright (C) 2015 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>
- */
-require_once('../../config/vilesci.config.inc.php');
-?>
-// ********** FUNKTIONEN ********** //
-var AufnahmeterminePrestudentID='';
-var AufnahmeTermineStudienplanID='';
-var AufnahmeTermineStudiengang='';
-
-// ****
-// * Laedt die Trees
-// ****
-function loadAufnahmeTermine(prestudent_id)
-{
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	AufnahmeTerminePrestudentID = prestudent_id;
-	AufnahmeTermineLoadTree();
-
-	document.getElementById('aufnahmetermine-textbox-gesamtpunkte').disabled=false;
-	document.getElementById('aufnahmetermine-button-savegesamtpunkte').disabled=false;
-	document.getElementById('aufnahmetermine-button-calculatetotal').disabled=false;
-
-	// Gruppen DropDown laden
-	var aufnahmegruppemenulist = document.getElementById('aufnahmetermine-menulist-aufnahmegruppe');
-	if(aufnahmegruppemenulist)
-	{
-		var url="<?php echo APP_ROOT ?>rdf/gruppen.rdf.php?aufnahmegruppe=true&optional=true";
-
-		//Alte DS entfernen
-		var oldDatasources = aufnahmegruppemenulist.database.GetDataSources();
-		while(oldDatasources.hasMoreElements())
-		{
-			aufnahmegruppemenulist.database.RemoveDataSource(oldDatasources.getNext());
-		}
-		//Refresh damit die entfernten DS auch wirklich entfernt werden
-		aufnahmegruppemenulist.builder.rebuild();
-
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-		var myDatasource = rdfService.GetDataSourceBlocking(url);
-		aufnahmegruppemenulist.database.AddDataSource(myDatasource);
-		aufnahmegruppemenulist.builder.rebuild();
-	}
-	// Gesamtpunkte laden und anzeigen
-
-	var url = '<?php echo APP_ROOT ?>rdf/student.rdf.php?prestudent_id='+prestudent_id+'&'+gettimestamp();
-
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-		getService(Components.interfaces.nsIRDFService);
-
-	var dsource = rdfService.GetDataSourceBlocking(url);
-
-	var subject = rdfService.GetResource("http://www.technikum-wien.at/student/" + prestudent_id);
-
-	var predicateNS = "http://www.technikum-wien.at/student/rdf";
-
-	punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
-	var person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
-	AufnahmeTermineStudiengang = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
-	reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
-	var aufnahmegruppe_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmegruppe_kurzbz" ));
-	document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value=punkte;
-	if(reihungstestangetreten=='true')
-		document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked=true;
-	else
-		document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked=false;
-	document.getElementById('aufnahmetermine-menulist-aufnahmegruppe').value = aufnahmegruppe_kurzbz;
-	AufnahmeTermineStudienplanID = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
-
-	// ReihungstestDropDown laden
-	var reihungstestmenulist = document.getElementById('aufnahmetermine-menulist-reihungstest');
-	var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true&prestudent_id="+AufnahmeTerminePrestudentID;
-
-	//Alte DS entfernen
-	var oldDatasources = reihungstestmenulist.database.GetDataSources();
-	while(oldDatasources.hasMoreElements())
-	{
-		reihungstestmenulist.database.RemoveDataSource(oldDatasources.getNext());
-	}
-	//Refresh damit die entfernten DS auch wirklich entfernt werden
-	reihungstestmenulist.builder.rebuild();
-
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-	var myDatasource = rdfService.GetDataSourceBlocking(url);
-	reihungstestmenulist.database.AddDataSource(myDatasource);
-	reihungstestmenulist.builder.rebuild();
-
-	// Studienplan DropDown laden
-	var studienplanmenulist = document.getElementById('aufnahmetermine-menulist-studienplan');
-	var url="<?php echo APP_ROOT ?>rdf/studienplan.rdf.php?person_id="+person_id;
-
-	//Alte DS entfernen
-	var oldDatasources = studienplanmenulist.database.GetDataSources();
-	while(oldDatasources.hasMoreElements())
-	{
-		studienplanmenulist.database.RemoveDataSource(oldDatasources.getNext());
-	}
-	//Refresh damit die entfernten DS auch wirklich entfernt werden
-	studienplanmenulist.builder.rebuild();
-
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-	var myDatasource = rdfService.GetDataSourceBlocking(url);
-	studienplanmenulist.database.AddDataSource(myDatasource);
-	studienplanmenulist.builder.rebuild();
-}
-
-/**
- * Laedt den Tree mit den Terminen
- */
-function AufnahmeTermineLoadTree()
-{
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	//Termine laden
-	url = "<?php echo APP_ROOT; ?>rdf/aufnahmetermine.rdf.php?prestudent_id="+AufnahmeTerminePrestudentID+"&ts="+gettimestamp();
-
-	var treeAufnahmeTermine=document.getElementById('aufnahmetermine-tree');
-
-	//Alte DS entfernen
-	var oldDatasources = treeAufnahmeTermine.database.GetDataSources();
-	while(oldDatasources.hasMoreElements())
-	{
-		treeAufnahmeTermine.database.RemoveDataSource(oldDatasources.getNext());
-	}
-	treeAufnahmeTermine.builder.rebuild();
-
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-	var AufnahmeTerminTreeDatasource = rdfService.GetDataSource(url);
-	AufnahmeTerminTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-	treeAufnahmeTermine.database.AddDataSource(AufnahmeTerminTreeDatasource);
-}
-
-/**
- * Speichert die Gesamtpunkte
- */
-function AufnahmeTermineSaveGesamtpunkte()
-{
-	var punkte = document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value;
-	var aufnahmegruppe_kurzbz = document.getElementById('aufnahmetermine-menulist-aufnahmegruppe').value;
-	var reihungstestangetreten = document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked;
-	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-	var req = new phpRequest(url,'','');
-
-	req.add('type', 'AufnahmeTermineSaveGesamtpunkte');
-
-	req.add('prestudent_id', AufnahmeTerminePrestudentID);
-	req.add('punkte', punkte);
-	req.add('reihungstestangetreten',reihungstestangetreten);
-	req.add('aufnahmegruppe_kurzbz',aufnahmegruppe_kurzbz);
-
-	var response = req.executePOST();
-	var val = new ParseReturnValue(response);
-
-	if (!val.dbdml_return)
-	{
-		if(val.dbdml_errormsg=='')
-			alert(response)
-		else
-			alert(val.dbdml_errormsg)
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-}
-
-function AufnahmeTermineCalculateTotal()
-{
-	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-	var req = new phpRequest(url,'','');
-
-	req.add('type', 'AufnahmeTermineBerechneGesamtpunkte');
-	req.add('prestudent_id', AufnahmeTerminePrestudentID);
-
-	var response = req.executePOST();
-	var val = new ParseReturnValue(response);
-
-	if (!val.dbdml_return)
-	{
-		if(val.dbdml_errormsg=='')
-			alert(response)
-		else
-			alert(val.dbdml_errormsg)
-		return false;
-	}
-	else
-	{
-		document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value=val.dbdml_data;
-		return true;
-	}
-}
-
-/**
- * Laedt die Details bei Auswahl eines Eintrages aus dem Tree
- */
-function AufnahmeTermineAuswahl()
-{
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var tree = document.getElementById('aufnahmetermine-tree');
-
-	if (tree.currentIndex==-1) return;
-
-	AufnahmeTermineDisableFields(false);
-	AufnahmeTermineReihungstestDropDownRefresh(true);
-
-	//Ausgewaehlten Eintrag holen
-	var rt_person_id = getTreeCellText(tree, 'aufnahmetermine-tree-rt_person_id', tree.currentIndex);
-
-	//Daten holen
-	var url = '<?php echo APP_ROOT ?>rdf/aufnahmetermine.rdf.php?rt_person_id='+rt_person_id+'&'+gettimestamp();
-
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-			getService(Components.interfaces.nsIRDFService);
-
-	var dsource = rdfService.GetDataSourceBlocking(url);
-
-	var subject = rdfService.GetResource("http://www.technikum-wien.at/aufnahmetermine/"+rt_person_id);
-
-	var predicateNS = "http://www.technikum-wien.at/aufnahmetermine/rdf";
-
-	//Daten holen
-
-	var person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
-	var rt_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#rt_id" ));
-	var anmeldedatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmeldedatum" ));
-	var teilgenommen = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#teilgenommen" ));
-	var punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
-	var studienplan_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
-    var endpunkte_inkl_gebiete = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#endpunkte_inkl_gebiete" ));
-    var endpunkte_exkl_gebiete = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#endpunkte_exkl_gebiete" ));
-    var typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#typ" ));
-
-	document.getElementById('aufnahmetermine-textbox-rt_person_id').value=rt_person_id;
-	document.getElementById('aufnahmetermine-textbox-person_id').value=person_id;
-	document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
-	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value=anmeldedatum;
-	MenulistSelectItemOnValue('aufnahmetermine-menulist-reihungstest', rt_id);
-
-	if(teilgenommen=='Ja')
-		document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=true;
-	else
-		document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=false;
-	document.getElementById('aufnahmetermine-textbox-punkte').value=punkte;
-	document.getElementById('aufnahmetermine-menulist-studienplan').value=studienplan_id;
-    document.getElementById('aufnahmetermine-textbox-endpunkte-inkl-gebiete').value = endpunkte_inkl_gebiete;
-    document.getElementById('aufnahmetermine-textbox-endpunkte-exkl-gebiete').value = endpunkte_exkl_gebiete;
-
-    // Sichtbarkeit der RT-Vergleichsergebnispunkte (ohne Quereinsteiger)
-    var basisgebiet_punkte_anzeigen = <?php echo (defined('FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN') && FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN) ? 'true' : 'false' ?>;
-
-    //  * Generell Anzeige nur wenn über config-Datei gesetzt ist
-    if (basisgebiet_punkte_anzeigen)
-    {
-        //  * für Bachelor-Studiengänge anzeigen
-        if (typ == 'b')
-        {
-            document.getElementById('aufnahmetermine-groupbox-vergleich-endpunkte').hidden = false;
-        }
-        //  * für Master-Studiengänge verstecken
-        else if (typ == 'm')
-        {
-            document.getElementById('aufnahmetermine-groupbox-vergleich-endpunkte').hidden = true;
-        }
-    }
-}
-
-function AufnahmeTermineNeu()
-{
-	AufnahmeTermineDisableFields(false);
-	AufnahmeTermineResetFields();
-	AufnahmeTermineReihungstestDropDownRefresh(true);
-}
-
-/**
- * Loescht einen Aufnahmetermin
- */
-function AufnahmeTermineDelete()
-{
-	var rt_person_id = document.getElementById('aufnahmetermine-textbox-rt_person_id').value;
-
-	if(!confirm("Wollen Sie diesen Eintrag wirklich löschen?"))
-		return;
-
-	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-	var req = new phpRequest(url,'','');
-
-	req.add('type', 'AufnahmeTermineDelete');
-	req.add('rt_person_id', rt_person_id);
-
-	var response = req.executePOST();
-	var val = new ParseReturnValue(response);
-
-	if (!val.dbdml_return)
-	{
-		if(val.dbdml_errormsg=='')
-			alert(response)
-		else
-			alert(val.dbdml_errormsg)
-		return false;
-	}
-	else
-	{
-		AufnahmeTermineLoadTree();
-		return true;
-	}
-}
-
-function AufnahemTermineReihungstestPunkteTransmit()
-{
-	var reihungstest_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
-	var person_id = document.getElementById('aufnahmetermine-textbox-person_id').value;
-
-	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-	var req = new phpRequest(url,'','');
-
-	req.add('type', 'getReihungstestPunkte');
-
-	req.add('person_id', person_id);
-	req.add('reihungstest_id', reihungstest_id);
-	var response = req.executePOST();
-
-	var val =  new ParseReturnValue(response)
-
-	if (!val.dbdml_return)
-	{
-		if(val.dbdml_errormsg=='')
-			alert(response)
-		else
-			alert(val.dbdml_errormsg)
-	}
-	else
-	{
-		document.getElementById('aufnahmetermine-textbox-punkte').value = val.dbdml_data;
-	}
-}
-
-function setEndpunkteAsPunkte(id)
-{
-	var punkte = document.getElementById(id).value;
-	document.getElementById('aufnahmetermine-textbox-punkte').value = punkte;
-}
-
-/**
- * Speichert einen AufnahmeTermin
- */
-function AufnahmeTermineSpeichern()
-{
-	var rt_person_id = document.getElementById('aufnahmetermine-textbox-rt_person_id').value;
-	var rt_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
-	var person_id = document.getElementById('aufnahmetermine-textbox-person_id').value;
-	var neu = document.getElementById('aufnahmetermine-checkbox-neu').checked;
-	var anmeldedatum = document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').iso;
-	var rt_id_new = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
-	var teilgenommen = document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked;
-	var punkte = document.getElementById('aufnahmetermine-textbox-punkte').value;
-	var studienplan_id = document.getElementById('aufnahmetermine-menulist-studienplan').value;
-
-	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-	var req = new phpRequest(url,'','');
-
-	req.add('type', 'AufnahmeTermineSave');
-
-	req.add('rt_id', rt_id);
-	req.add('rt_person_id', rt_person_id);
-	req.add('person_id', person_id);
-	req.add('prestudent_id', AufnahmeTerminePrestudentID);
-	req.add('neu', neu);
-	req.add('anmeldedatum', anmeldedatum);
-	req.add('teilgenommen', teilgenommen);
-	req.add('punkte', punkte);
-	req.add('studienplan_id', studienplan_id);
-
-	var response = req.executePOST();
-	var val = new ParseReturnValue(response);
-
-	if (!val.dbdml_return)
-	{
-		if(val.dbdml_errormsg=='')
-			alert(response)
-		else
-			alert(val.dbdml_errormsg)
-
-		document.getElementById('aufnahmetermine-textbox-rt_person_id').value=val.dbdml_data;
-		document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
-		AufnahmeTermineLoadTree();
-
-		return false;
-	}
-	else
-	{
-		document.getElementById('aufnahmetermine-textbox-rt_person_id').value=val.dbdml_data;
-		document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
-		AufnahmeTermineLoadTree();
-		return true;
-	}
-}
-
-/**
- * Aktiviert oder Deaktiviert die Eingabefelder
- * @param val boolean true | false
- */
-function AufnahmeTermineDisableFields(val)
-{
-	document.getElementById('aufnahmetermine-button-speichern').disabled=val;
-	document.getElementById('aufnahmetermine-textbox-punkte').disabled=val;
-	document.getElementById('aufnahmetermine-checkbox-teilgenommen').disabled=val;
-	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').disabled=val;
-	document.getElementById('aufnahmetermine-menulist-reihungstest').disabled=val;
-	document.getElementById('aufnahmetermine-button-anmeldungreihungstest-heute').disabled=val;
-	document.getElementById('aufnahmetermine-menulist-studienplan').disabled=val;
-}
-
-/**
- * Leert die Eingabefelder
- */
-function AufnahmeTermineResetFields()
-{
-	document.getElementById('aufnahmetermine-textbox-punkte').value='';
-	document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=false;
-	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value='';
-	document.getElementById('aufnahmetermine-menulist-reihungstest').value='';
-	document.getElementById('aufnahmetermine-textbox-person_id').value='';
-	document.getElementById('aufnahmetermine-checkbox-neu').checked=true;
-	document.getElementById('aufnahmetermine-textbox-rt_person_id').value='';
-	document.getElementById('aufnahmetermine-menulist-studienplan').value=AufnahmeTermineStudienplanID;
-}
-
-
-/**
- * Setzt das aktuelle Datum als Anmeldedatum
- */
-function AufnahmeTermineAnmeldungreihungstestHeute()
-{
-	var now = new Date();
-	var jahr = now.getFullYear();
-
-	monat = now.getMonth()+1;
-	if(monat<10) monat='0'+monat;
-	tag = now.getDate();
-	if(tag<10) tag='0'+tag;
-
-	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value=tag+'.'+monat+'.'+jahr;
-}
-
-/**
- * Refresht das DropDown mit den Reihungstestterminen
- */
-function AufnahmeTermineReihungstestDropDownRefresh(prestudent)
-{
-
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var menulist = document.getElementById('aufnahmetermine-menulist-reihungstest');
-	if(typeof(prestudent)=='undefined')
-		var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?include_id=&studiengang_kz="+AufnahmeTermineStudiengang+"&"+gettimestamp();
-	else
-		var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true&prestudent_id="+AufnahmeTerminePrestudentID+"&"+gettimestamp();
-
-	//Alte DS entfernen
-	var oldDatasources = menulist.database.GetDataSources();
-	while(oldDatasources.hasMoreElements())
-	{
-		menulist.database.RemoveDataSource(oldDatasources.getNext());
-	}
-	//Refresh damit die entfernten DS auch wirklich entfernt werden
-	menulist.builder.rebuild();
-	btn = document.getElementById('aufnahmetermine-button-reihungstest-refresh');
-	btn.setAttribute('image','../../skin/images/spinner.gif');
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-	var myDatasource = rdfService.GetDataSourceBlocking(url);
-	menulist.database.AddDataSource(myDatasource);
-	menulist.builder.rebuild();
-	btn.setAttribute('image','../../skin/images/refresh.png');
-}
-
-function AufnahmeTermineReihungstestEdit()
-{
-	var rt_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
-	var url="<?php echo APP_ROOT ?>vilesci/stammdaten/reihungstestverwaltung.php?reihungstest_id="+rt_id;
-	window.open(url);
+<?php
+/* Copyright (C) 2015 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>
+ */
+require_once('../../config/vilesci.config.inc.php');
+?>
+// ********** FUNKTIONEN ********** //
+var AufnahmeterminePrestudentID='';
+var AufnahmeTermineStudienplanID='';
+var AufnahmeTermineStudiengang='';
+
+// ****
+// * Laedt die Trees
+// ****
+function loadAufnahmeTermine(prestudent_id)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	AufnahmeTerminePrestudentID = prestudent_id;
+	AufnahmeTermineLoadTree();
+
+	document.getElementById('aufnahmetermine-textbox-gesamtpunkte').disabled=false;
+	document.getElementById('aufnahmetermine-button-savegesamtpunkte').disabled=false;
+	document.getElementById('aufnahmetermine-button-calculatetotal').disabled=false;
+
+	// Gruppen DropDown laden
+	var aufnahmegruppemenulist = document.getElementById('aufnahmetermine-menulist-aufnahmegruppe');
+	if(aufnahmegruppemenulist)
+	{
+		var url="<?php echo APP_ROOT ?>rdf/gruppen.rdf.php?aufnahmegruppe=true&optional=true";
+
+		//Alte DS entfernen
+		var oldDatasources = aufnahmegruppemenulist.database.GetDataSources();
+		while(oldDatasources.hasMoreElements())
+		{
+			aufnahmegruppemenulist.database.RemoveDataSource(oldDatasources.getNext());
+		}
+		//Refresh damit die entfernten DS auch wirklich entfernt werden
+		aufnahmegruppemenulist.builder.rebuild();
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		var myDatasource = rdfService.GetDataSourceBlocking(url);
+		aufnahmegruppemenulist.database.AddDataSource(myDatasource);
+		aufnahmegruppemenulist.builder.rebuild();
+	}
+	// Gesamtpunkte laden und anzeigen
+
+	var url = '<?php echo APP_ROOT ?>rdf/student.rdf.php?prestudent_id='+prestudent_id+'&'+gettimestamp();
+
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+		getService(Components.interfaces.nsIRDFService);
+
+	var dsource = rdfService.GetDataSourceBlocking(url);
+
+	var subject = rdfService.GetResource("http://www.technikum-wien.at/student/" + prestudent_id);
+
+	var predicateNS = "http://www.technikum-wien.at/student/rdf";
+
+	punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
+	var person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+	AufnahmeTermineStudiengang = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
+	reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
+	var aufnahmegruppe_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmegruppe_kurzbz" ));
+	document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value=punkte;
+	if(reihungstestangetreten=='true')
+		document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked=true;
+	else
+		document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked=false;
+	document.getElementById('aufnahmetermine-menulist-aufnahmegruppe').value = aufnahmegruppe_kurzbz;
+	AufnahmeTermineStudienplanID = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
+
+	// ReihungstestDropDown laden
+	var reihungstestmenulist = document.getElementById('aufnahmetermine-menulist-reihungstest');
+	var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true&prestudent_id="+AufnahmeTerminePrestudentID;
+
+	//Alte DS entfernen
+	var oldDatasources = reihungstestmenulist.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		reihungstestmenulist.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	reihungstestmenulist.builder.rebuild();
+
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var myDatasource = rdfService.GetDataSourceBlocking(url);
+	reihungstestmenulist.database.AddDataSource(myDatasource);
+	reihungstestmenulist.builder.rebuild();
+
+	// Studienplan DropDown laden
+	var studienplanmenulist = document.getElementById('aufnahmetermine-menulist-studienplan');
+	var url="<?php echo APP_ROOT ?>rdf/studienplan.rdf.php?person_id="+person_id;
+
+	//Alte DS entfernen
+	var oldDatasources = studienplanmenulist.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		studienplanmenulist.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	studienplanmenulist.builder.rebuild();
+
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var myDatasource = rdfService.GetDataSourceBlocking(url);
+	studienplanmenulist.database.AddDataSource(myDatasource);
+	studienplanmenulist.builder.rebuild();
+}
+
+/**
+ * Laedt den Tree mit den Terminen
+ */
+function AufnahmeTermineLoadTree()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	//Termine laden
+	url = "<?php echo APP_ROOT; ?>rdf/aufnahmetermine.rdf.php?prestudent_id="+AufnahmeTerminePrestudentID+"&ts="+gettimestamp();
+
+	var treeAufnahmeTermine=document.getElementById('aufnahmetermine-tree');
+
+	//Alte DS entfernen
+	var oldDatasources = treeAufnahmeTermine.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		treeAufnahmeTermine.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	treeAufnahmeTermine.builder.rebuild();
+
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var AufnahmeTerminTreeDatasource = rdfService.GetDataSource(url);
+	AufnahmeTerminTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+	treeAufnahmeTermine.database.AddDataSource(AufnahmeTerminTreeDatasource);
+}
+
+/**
+ * Speichert die Gesamtpunkte
+ */
+function AufnahmeTermineSaveGesamtpunkte()
+{
+	var punkte = document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value;
+	var aufnahmegruppe_kurzbz = document.getElementById('aufnahmetermine-menulist-aufnahmegruppe').value;
+	var reihungstestangetreten = document.getElementById('aufnahmetermine-checkbox-reihungstestangetreten').checked;
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'AufnahmeTermineSaveGesamtpunkte');
+
+	req.add('prestudent_id', AufnahmeTerminePrestudentID);
+	req.add('punkte', punkte);
+	req.add('reihungstestangetreten',reihungstestangetreten);
+	req.add('aufnahmegruppe_kurzbz',aufnahmegruppe_kurzbz);
+
+	var response = req.executePOST();
+	var val = new ParseReturnValue(response);
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+function AufnahmeTermineCalculateTotal()
+{
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'AufnahmeTermineBerechneGesamtpunkte');
+	req.add('prestudent_id', AufnahmeTerminePrestudentID);
+
+	var response = req.executePOST();
+	var val = new ParseReturnValue(response);
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		document.getElementById('aufnahmetermine-textbox-gesamtpunkte').value=val.dbdml_data;
+		return true;
+	}
+}
+
+/**
+ * Laedt die Details bei Auswahl eines Eintrages aus dem Tree
+ */
+function AufnahmeTermineAuswahl()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('aufnahmetermine-tree');
+
+	if (tree.currentIndex==-1) return;
+
+	AufnahmeTermineDisableFields(false);
+	AufnahmeTermineReihungstestDropDownRefresh(true);
+
+	//Ausgewaehlten Eintrag holen
+	var rt_person_id = getTreeCellText(tree, 'aufnahmetermine-tree-rt_person_id', tree.currentIndex);
+
+	//Daten holen
+	var url = '<?php echo APP_ROOT ?>rdf/aufnahmetermine.rdf.php?rt_person_id='+rt_person_id+'&'+gettimestamp();
+
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+			getService(Components.interfaces.nsIRDFService);
+
+	var dsource = rdfService.GetDataSourceBlocking(url);
+
+	var subject = rdfService.GetResource("http://www.technikum-wien.at/aufnahmetermine/"+rt_person_id);
+
+	var predicateNS = "http://www.technikum-wien.at/aufnahmetermine/rdf";
+
+	//Daten holen
+
+	var person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+	var rt_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#rt_id" ));
+	var anmeldedatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmeldedatum" ));
+	var teilgenommen = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#teilgenommen" ));
+	var punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
+	var studienplan_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
+	var studienplan_studiengang_kz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_studiengang_kz" ));
+    var endpunkte_inkl_gebiete = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#endpunkte_inkl_gebiete" ));
+    var endpunkte_exkl_gebiete = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#endpunkte_exkl_gebiete" ));
+    var typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#typ" ));
+
+	document.getElementById('aufnahmetermine-textbox-rt_person_id').value=rt_person_id;
+	document.getElementById('aufnahmetermine-textbox-person_id').value=person_id;
+	document.getElementById('aufnahmetermine-textbox-studienplan_studiengang_kz').value=studienplan_studiengang_kz;
+	document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
+	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value=anmeldedatum;
+	MenulistSelectItemOnValue('aufnahmetermine-menulist-reihungstest', rt_id);
+
+	if(teilgenommen=='Ja')
+		document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=true;
+	else
+		document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=false;
+	document.getElementById('aufnahmetermine-textbox-punkte').value=punkte;
+	document.getElementById('aufnahmetermine-menulist-studienplan').value=studienplan_id;
+    document.getElementById('aufnahmetermine-textbox-endpunkte-inkl-gebiete').value = endpunkte_inkl_gebiete;
+    document.getElementById('aufnahmetermine-textbox-endpunkte-exkl-gebiete').value = endpunkte_exkl_gebiete;
+
+    // Sichtbarkeit der RT-Vergleichsergebnispunkte (ohne Quereinsteiger)
+    var basisgebiet_punkte_anzeigen = <?php echo (defined('FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN') && FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN) ? 'true' : 'false' ?>;
+
+    //  * Generell Anzeige nur wenn über config-Datei gesetzt ist
+    if (basisgebiet_punkte_anzeigen)
+    {
+        //  * für Bachelor-Studiengänge anzeigen
+        if (typ == 'b')
+        {
+            document.getElementById('aufnahmetermine-groupbox-vergleich-endpunkte').hidden = false;
+        }
+        //  * für Master-Studiengänge verstecken
+        else if (typ == 'm')
+        {
+            document.getElementById('aufnahmetermine-groupbox-vergleich-endpunkte').hidden = true;
+        }
+    }
+}
+
+function AufnahmeTermineNeu()
+{
+	AufnahmeTermineDisableFields(false);
+	AufnahmeTermineResetFields();
+	AufnahmeTermineReihungstestDropDownRefresh(true);
+}
+
+/**
+ * Loescht einen Aufnahmetermin
+ */
+function AufnahmeTermineDelete()
+{
+	var rt_person_id = document.getElementById('aufnahmetermine-textbox-rt_person_id').value;
+
+	if(!confirm("Wollen Sie diesen Eintrag wirklich löschen?"))
+		return;
+
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'AufnahmeTermineDelete');
+	req.add('rt_person_id', rt_person_id);
+
+	var response = req.executePOST();
+	var val = new ParseReturnValue(response);
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		AufnahmeTermineLoadTree();
+		return true;
+	}
+}
+
+function AufnahemTermineReihungstestPunkteTransmit()
+{
+	var reihungstest_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
+	var person_id = document.getElementById('aufnahmetermine-textbox-person_id').value;
+	var studienplan_studiengang_kz = document.getElementById('aufnahmetermine-textbox-studienplan_studiengang_kz').value;
+
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'getReihungstestPunkte');
+
+	req.add('person_id', person_id);
+	req.add('studienplan_studiengang_kz', studienplan_studiengang_kz);
+	req.add('reihungstest_id', reihungstest_id);
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{
+		document.getElementById('aufnahmetermine-textbox-punkte').value = val.dbdml_data;
+	}
+}
+
+function setEndpunkteAsPunkte(id)
+{
+	var punkte = document.getElementById(id).value;
+	document.getElementById('aufnahmetermine-textbox-punkte').value = punkte;
+}
+
+/**
+ * Speichert einen AufnahmeTermin
+ */
+function AufnahmeTermineSpeichern()
+{
+	var rt_person_id = document.getElementById('aufnahmetermine-textbox-rt_person_id').value;
+	var rt_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
+	var person_id = document.getElementById('aufnahmetermine-textbox-person_id').value;
+	var neu = document.getElementById('aufnahmetermine-checkbox-neu').checked;
+	var anmeldedatum = document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').iso;
+	var rt_id_new = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
+	var teilgenommen = document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked;
+	var punkte = document.getElementById('aufnahmetermine-textbox-punkte').value;
+	var studienplan_id = document.getElementById('aufnahmetermine-menulist-studienplan').value;
+
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'AufnahmeTermineSave');
+
+	req.add('rt_id', rt_id);
+	req.add('rt_person_id', rt_person_id);
+	req.add('person_id', person_id);
+	req.add('prestudent_id', AufnahmeTerminePrestudentID);
+	req.add('neu', neu);
+	req.add('anmeldedatum', anmeldedatum);
+	req.add('teilgenommen', teilgenommen);
+	req.add('punkte', punkte);
+	req.add('studienplan_id', studienplan_id);
+
+	var response = req.executePOST();
+	var val = new ParseReturnValue(response);
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+
+		document.getElementById('aufnahmetermine-textbox-rt_person_id').value=val.dbdml_data;
+		document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
+		AufnahmeTermineLoadTree();
+
+		return false;
+	}
+	else
+	{
+		document.getElementById('aufnahmetermine-textbox-rt_person_id').value=val.dbdml_data;
+		document.getElementById('aufnahmetermine-checkbox-neu').checked=false;
+		AufnahmeTermineLoadTree();
+		return true;
+	}
+}
+
+/**
+ * Aktiviert oder Deaktiviert die Eingabefelder
+ * @param val boolean true | false
+ */
+function AufnahmeTermineDisableFields(val)
+{
+	document.getElementById('aufnahmetermine-button-speichern').disabled=val;
+	document.getElementById('aufnahmetermine-textbox-punkte').disabled=val;
+	document.getElementById('aufnahmetermine-checkbox-teilgenommen').disabled=val;
+	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').disabled=val;
+	document.getElementById('aufnahmetermine-menulist-reihungstest').disabled=val;
+	document.getElementById('aufnahmetermine-button-anmeldungreihungstest-heute').disabled=val;
+	document.getElementById('aufnahmetermine-menulist-studienplan').disabled=val;
+}
+
+/**
+ * Leert die Eingabefelder
+ */
+function AufnahmeTermineResetFields()
+{
+	document.getElementById('aufnahmetermine-textbox-punkte').value='';
+	document.getElementById('aufnahmetermine-checkbox-teilgenommen').checked=false;
+	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value='';
+	document.getElementById('aufnahmetermine-menulist-reihungstest').value='';
+	document.getElementById('aufnahmetermine-textbox-person_id').value='';
+	document.getElementById('aufnahmetermine-textbox-studienplan_studiengang_kz').value='';
+	document.getElementById('aufnahmetermine-checkbox-neu').checked=true;
+	document.getElementById('aufnahmetermine-textbox-rt_person_id').value='';
+	document.getElementById('aufnahmetermine-menulist-studienplan').value=AufnahmeTermineStudienplanID;
+}
+
+
+/**
+ * Setzt das aktuelle Datum als Anmeldedatum
+ */
+function AufnahmeTermineAnmeldungreihungstestHeute()
+{
+	var now = new Date();
+	var jahr = now.getFullYear();
+
+	monat = now.getMonth()+1;
+	if(monat<10) monat='0'+monat;
+	tag = now.getDate();
+	if(tag<10) tag='0'+tag;
+
+	document.getElementById('aufnahmetermine-textbox-anmeldungreihungstest').value=tag+'.'+monat+'.'+jahr;
+}
+
+/**
+ * Refresht das DropDown mit den Reihungstestterminen
+ */
+function AufnahmeTermineReihungstestDropDownRefresh(prestudent)
+{
+
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var menulist = document.getElementById('aufnahmetermine-menulist-reihungstest');
+	if(typeof(prestudent)=='undefined')
+		var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?include_id=&studiengang_kz="+AufnahmeTermineStudiengang+"&"+gettimestamp();
+	else
+		var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true&prestudent_id="+AufnahmeTerminePrestudentID+"&"+gettimestamp();
+
+	//Alte DS entfernen
+	var oldDatasources = menulist.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		menulist.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	menulist.builder.rebuild();
+	btn = document.getElementById('aufnahmetermine-button-reihungstest-refresh');
+	btn.setAttribute('image','../../skin/images/spinner.gif');
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var myDatasource = rdfService.GetDataSourceBlocking(url);
+	menulist.database.AddDataSource(myDatasource);
+	menulist.builder.rebuild();
+	btn.setAttribute('image','../../skin/images/refresh.png');
+}
+
+function AufnahmeTermineReihungstestEdit()
+{
+	var rt_id = document.getElementById('aufnahmetermine-menulist-reihungstest').value;
+	var url="<?php echo APP_ROOT ?>vilesci/stammdaten/reihungstestverwaltung.php?reihungstest_id="+rt_id;
+	window.open(url);
 }
\ No newline at end of file
diff --git a/content/student/aufnahmetermine.xul.php b/content/student/aufnahmetermine.xul.php
index d8e88294f..e2a813546 100644
--- a/content/student/aufnahmetermine.xul.php
+++ b/content/student/aufnahmetermine.xul.php
@@ -1,334 +1,348 @@
-<?php
-/* Copyright (C) 2015 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>
- */
-header("Cache-Control: no-cache");
-header("Cache-Control: post-check=0, pre-check=0",false);
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Pragma: no-cache");
-header("Content-type: application/vnd.mozilla.xul+xml");
-
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../config/global.config.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/variable.class.php');
-require_once('../../include/prestudent.class.php');
-require_once('../../include/studiengang.class.php');
-
-$user=get_uid();
-$variable = new variable();
-if(!$variable->loadVariables($user))
-{
-	die('Fehler beim Laden der Variablen:'.$variable->errormsg);
-}
-
-echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-
-echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
-echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css"?>';
-echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type="text/css"?>';
-
-$prestudent_id = filter_input(INPUT_GET,'prestudent_id');
-
-echo '
-<!DOCTYPE overlay [';
-require('../../locale/'.$variable->variable->locale.'/fas.dtd');
-echo ']>
-';
-?>
-
-<window id="aufnahmetermine-window" title="aufnahmetermine"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="loadAufnahmeTermine(<?php echo "'".$prestudent_id."'"; ?>);"
->
-
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/aufnahmetermine.js.php" />
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/phpRequest.js.php" />
-
-<vbox flex="1">
-<popupset>
-	<menupopup id="aufnahmetermine-tree-popup">
-		<menuitem label="Entfernen" oncommand="aufnahmetermineDelete();" id="aufnahmetermine-tree-popup-delete" hidden="false"/>
-	</menupopup>
-</popupset>
-<groupbox>
-<caption label="Studiengang" />
-<hbox style="padding-top: 10px">
-	<?php
-	if(!defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') || FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN==true)
-		$aufnahmegruppe_visibility='';
-	else
-		$aufnahmegruppe_visibility='hidden="true"';
-
-	echo '<hbox '.$aufnahmegruppe_visibility.'>';
-	?>
-	<label value="Gruppe" control="aufnahmetermine-menulist-aufnahmegruppe"/>
-	<menulist id="aufnahmetermine-menulist-aufnahmegruppe" disabled="false"
-			datasources="rdf:null"
-			ref="http://www.technikum-wien.at/gruppen/liste">
-		<template>
-			<menupopup>
-				<menuitem value="rdf:http://www.technikum-wien.at/gruppen/rdf#gruppe_kurzbz"
-					label="rdf:http://www.technikum-wien.at/gruppen/rdf#bezeichnung"
-					uri="rdf:*"/>
-			</menupopup>
-		</template>
-	</menulist>
-	</hbox>
-	<label value="&aufnahmetermine-reihungstest.absolviert;" control="aufnahmetermine-checkbox-reihungstestangetreten"/>
-	<checkbox id="aufnahmetermine-checkbox-reihungstestangetreten" checked="true"/>
-	<label value="Gesamtpunkte" control="aufnahmetermine-textbox-gesamtpunkte"/>
-	<textbox id="aufnahmetermine-textbox-gesamtpunkte" disabled="true" maxlength="8" size="8"/>
-	<button id="aufnahmetermine-button-savegesamtpunkte" disabled="true" label="Speichern" oncommand="AufnahmeTermineSaveGesamtpunkte();"/>
-	<button id="aufnahmetermine-button-calculatetotal" disabled="true" label="Gesamtpunkte berechnen" oncommand="AufnahmeTermineCalculateTotal();"/>
-</hbox>
-</groupbox>
-<groupbox>
-<caption label="Allgemein" />
-<hbox flex="1">
-<grid id="aufnahmetermine-grid-detail" style="overflow:auto;margin:4px;" flex="1">
-			<columns  >
-				<column flex="1"/>
-				<column flex="1"/>
-			</columns>
-			<rows>
-				<row>
-					<tree id="aufnahmetermine-tree" seltype="single" hidecolumnpicker="false" flex="1"
-						datasources="rdf:null" ref="http://www.technikum-wien.at/aufnahmetermine"
-						style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
-						onselect="AufnahmeTermineAuswahl()"
-						context="aufnahmetermine-tree-popup"
-						flags="dont-build-content"
-					>
-
-						<treecols>
-							<treecol id="aufnahmetermine-tree-datum" label="Datum" flex="3" hidden="false" primary="true"
-								class="sortDirectionIndicator"
-								sortActive="true"
-								sortDirection="ascending"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-stufe" label="Stufe" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sortActive="true"
-   								sortDirection="ascending"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#stufe"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-studiensemester" label="Studiensemester" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studiensemester"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-anmerkung" label="Anmerkung" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmerkung"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-anmeldedatum" label="Anmeldedatum" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-ort" label="Ort" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-punkte" label="Punkte" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#punkte" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-teilgenommen" label="Teilgen." flex="1" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#teilgenommen" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-ort_kurzbz" label="Ort" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-rt_id" label="ReihungstestID" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-person_id" label="PersonID" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#person_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-rt_person_id" label="RTPersonID" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_person_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_bezeichnung" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-studienplan_id" label="StudienplanID" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-studienplan_studiengang" label="Stg" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_studiengang" />
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-datum_iso" label="DatumISO" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="aufnahmetermine-tree-anmeldedatum_iso" label="AnmeldedatumISO" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
-							<splitter class="tree-splitter"/>
-						</treecols>
-
-						<template>
-							<treechildren flex="1" >
-									<treeitem uri="rdf:*">
-									<treerow  properties="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#properties">
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#stufe"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studiensemester"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmerkung"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#punkte"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#teilgenommen"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_id"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#person_id"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_person_id"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_bezeichnung"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_id"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_studiengang"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
-										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
-									</treerow>
-								</treeitem>
-							</treechildren>
-						</template>
-					</tree>
-					<vbox>
-						<hbox>
-							<button id="aufnahmetermine-button-neu" label="Neu" oncommand="AufnahmeTermineNeu();"/>
-							<button id="aufnahmetermine-button-loeschen" label="Loeschen" oncommand="AufnahmeTermineDelete();"/>
-						</hbox>
-						<vbox hidden="true">
-							<label value="person_id" control="aufnahmetermine-textbox-person_id"/>
-							<textbox id="aufnahmetermine-textbox-person_id" disabled="true"/>
-							<label value="Neu" control="aufnahmetermine-checkbox-neu"/>
-							<checkbox id="aufnahmetermine-checkbox-neu" disabled="true" checked="false"/>
-							<label value="rt_person_id" control="aufnahmetermine-textbox-rt_person_id"/>
-							<textbox id="aufnahmetermine-textbox-rt_person_id" disabled="true"/>
-						</vbox>
-						<groupbox id="aufnahmetermine-groupbox" flex="1">
-						<caption label="Details"/>
-							<grid id="aufnahmetermine-grid-detail" style="overflow:auto;margin:4px;" flex="1">
-								<columns  >
-									<column flex="1"/>
-									<column flex="5"/>
-								</columns>
-								<rows>
-									<row>
-										<label value="Reihungstest / Interview" control="aufnahmetermine-menulist-reihungstest"/>
-										<hbox>
-										<menulist id="aufnahmetermine-menulist-reihungstest" disabled="true"
-												datasources="rdf:null" flex="1" style="width:200px"
-												ref="http://www.technikum-wien.at/reihungstest/alle">
-											<template>
-												<menupopup>
-													<menuitem value="rdf:http://www.technikum-wien.at/reihungstest/rdf#reihungstest_id"
-												 		label="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
-														tooltiptext="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
-														uri="rdf:*"/>
-												</menupopup>
-											</template>
-										</menulist>
-										<toolbarbutton id="aufnahmetermine-button-reihungstest-refresh" image="../../skin/images/refresh.png" tooltiptext="Alle zukünftigen Reihungstests des Studiengangs laden" onclick="AufnahmeTermineReihungstestDropDownRefresh()"/>
-										<toolbarbutton id="aufnahmetermine-button-reihungstest-open" image="../../skin/images/edit.png" tooltiptext="Zur Reihungstestverwaltung" onclick="AufnahmeTermineReihungstestEdit()"/>
-										<spacer flex="1"/>
-										</hbox>
-									</row>
-									<row>
-										<label value="&tab-prestudent-aufnahme.anmeldung;" control="aufnahmetermine-textbox-anmeldungreihungstest"/>
-										<hbox>
-											<box class="Datum" id="aufnahmetermine-textbox-anmeldungreihungstest" disabled="true"/>
-											<button id="aufnahmetermine-button-anmeldungreihungstest-heute" label="Heute" oncommand="AufnahmeTermineAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
-										</hbox>
-									</row>
-									<row>
-										<label value="&tab-prestudent-aufnahme.absolviert;" control="aufnahmetermine-checkbox-teilgenommen"/>
-										<checkbox id="aufnahmetermine-checkbox-teilgenommen" checked="true" disabled="true"/>
-									</row>
-									<row>
-										<label value="Reihungstest Studienplan" control="aufnahmetermine-menulist-studienplan"/>
-										<hbox>
-										<menulist id="aufnahmetermine-menulist-studienplan" disabled="true"
-												datasources="rdf:null" flex="1"
-												ref="http://www.technikum-wien.at/studienplan">
-											<template>
-												<menupopup>
-													<menuitem value="rdf:http://www.technikum-wien.at/studienplan/rdf#studienplan_id"
-														label="rdf:http://www.technikum-wien.at/studienplan/rdf#bezeichnung"
-														uri="rdf:*"/>
-												</menupopup>
-											</template>
-										</menulist>
-										<spacer flex="1"/>
-										</hbox>
-									</row>
-									<row>
-										<label value="Punkte" control="aufnahmetermine-textbox-punkte" />
-										<hbox>
-											<textbox id="aufnahmetermine-textbox-punkte" disabled="true" maxlength="8" size="6"/>
-											<toolbarbutton id="aufnahmetermine-button-reihungstest-punktesync" image="../../skin/images/transmit.png" tooltiptext="Reihungstest Ergebnis holen" onclick="AufnahemTermineReihungstestPunkteTransmit()"/>
-											<spacer flex="1" />
-										</hbox>
-                                    </row>
-                                    <groupbox id="aufnahmetermine-groupbox-vergleich-endpunkte" hidden="true">
-                                        <caption label="Vergleichswerte Reihungstestpunkte (Basisgebiete)"></caption>
-                                        <vbox style="padding: 10px;">
-                                            <spacer resize='none' height='10' flex="1"/>
-                                            <row>
-                                                <label value="Reihungstestpunkte (inkl. Physik)" control="aufnahmetermine-textbox-endpunkte-inkl-gebiete" style="margin-right: 7px;"/>
-                                                <hbox>
-                                                    <textbox id="aufnahmetermine-textbox-endpunkte-inkl-gebiete" readonly="true" maxlength="8" size="6" flex="1"/>
-													<toolbarbutton image="../../skin/images/up.png" tooltiptext="Als Punkte setzen" onclick="setEndpunkteAsPunkte('aufnahmetermine-textbox-endpunkte-inkl-gebiete')"/>
-                                                </hbox>
-                                            </row>
-                                            <row>
-                                                <label value="Reihungstestpunkte (exkl. Physik)" control="aufnahmetermine-textbox-endpunkte-exkl-gebiete" />
-                                                <hbox>
-                                                   <textbox id="aufnahmetermine-textbox-endpunkte-exkl-gebiete" readonly="true" maxlength="8" size="6" flex="1"/>
-													<toolbarbutton image="../../skin/images/up.png" tooltiptext="Als Punkte setzen" onclick="setEndpunkteAsPunkte('aufnahmetermine-textbox-endpunkte-exkl-gebiete')"/>
-                                                </hbox>
-                                            </row>
-                                        </vbox>
-                                    </groupbox>
-								</rows>
-							</grid>
-							<hbox>
-								<button id="aufnahmetermine-button-speichern" oncommand="AufnahmeTermineSpeichern()" label="Speichern" disabled="true"/>
-								<spacer flex="1" />
-							</hbox>
-						</groupbox>
-					</vbox>
-				</row>
-		</rows>
-</grid>
-
-</hbox>
-</groupbox>
-<spacer flex="1" />
-</vbox>
-</window>
+<?php
+/* Copyright (C) 2015 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>
+ */
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../config/global.config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/variable.class.php');
+require_once('../../include/prestudent.class.php');
+require_once('../../include/studiengang.class.php');
+
+$user=get_uid();
+$variable = new variable();
+if(!$variable->loadVariables($user))
+{
+	die('Fehler beim Laden der Variablen:'.$variable->errormsg);
+}
+
+echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
+echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css"?>';
+echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type="text/css"?>';
+
+$prestudent_id = filter_input(INPUT_GET,'prestudent_id');
+
+if(!defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') || FAS_REIHUNGSTEST_PUNKTEUEBERNAHME == true)
+	$rt_uebernahme = true;
+else
+	$rt_uebernahme = false;
+echo '
+<!DOCTYPE overlay [';
+require('../../locale/'.$variable->variable->locale.'/fas.dtd');
+echo ']>
+';
+?>
+
+<window id="aufnahmetermine-window" title="aufnahmetermine"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	onload="loadAufnahmeTermine(<?php echo "'".$prestudent_id."'"; ?>);"
+>
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/aufnahmetermine.js.php" />
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/phpRequest.js.php" />
+
+<vbox flex="1">
+<popupset>
+	<menupopup id="aufnahmetermine-tree-popup">
+		<menuitem label="Entfernen" oncommand="aufnahmetermineDelete();" id="aufnahmetermine-tree-popup-delete" hidden="false"/>
+	</menupopup>
+</popupset>
+<groupbox>
+<caption label="Studiengang" />
+<hbox style="padding-top: 10px">
+	<?php
+	if(!defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') || FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN==true)
+		$aufnahmegruppe_visibility='';
+	else
+		$aufnahmegruppe_visibility='hidden="true"';
+
+	echo '<hbox '.$aufnahmegruppe_visibility.'>';
+	?>
+	<label value="Gruppe" control="aufnahmetermine-menulist-aufnahmegruppe"/>
+	<menulist id="aufnahmetermine-menulist-aufnahmegruppe" disabled="false"
+			datasources="rdf:null"
+			ref="http://www.technikum-wien.at/gruppen/liste">
+		<template>
+			<menupopup>
+				<menuitem value="rdf:http://www.technikum-wien.at/gruppen/rdf#gruppe_kurzbz"
+					label="rdf:http://www.technikum-wien.at/gruppen/rdf#bezeichnung"
+					uri="rdf:*"/>
+			</menupopup>
+		</template>
+	</menulist>
+	</hbox>
+	<label value="&aufnahmetermine-reihungstest.absolviert;" control="aufnahmetermine-checkbox-reihungstestangetreten"/>
+	<checkbox id="aufnahmetermine-checkbox-reihungstestangetreten" checked="true"/>
+	<label value="Gesamtpunkte" control="aufnahmetermine-textbox-gesamtpunkte"/>
+	<textbox id="aufnahmetermine-textbox-gesamtpunkte" disabled="true" maxlength="8" size="8"/>
+	<button id="aufnahmetermine-button-savegesamtpunkte" disabled="true" label="Speichern" oncommand="AufnahmeTermineSaveGesamtpunkte();"/>
+	<button id="aufnahmetermine-button-calculatetotal" disabled="true" label="Gesamtpunkte berechnen" oncommand="AufnahmeTermineCalculateTotal();"/>
+</hbox>
+</groupbox>
+<groupbox>
+<caption label="Allgemein" />
+<hbox flex="1">
+<grid id="aufnahmetermine-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+			<columns  >
+				<column flex="1"/>
+				<column flex="1"/>
+			</columns>
+			<rows>
+				<row>
+					<tree id="aufnahmetermine-tree" seltype="single" hidecolumnpicker="false" flex="1"
+						datasources="rdf:null" ref="http://www.technikum-wien.at/aufnahmetermine"
+						style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
+						onselect="AufnahmeTermineAuswahl()"
+						context="aufnahmetermine-tree-popup"
+						flags="dont-build-content"
+					>
+
+						<treecols>
+							<treecol id="aufnahmetermine-tree-datum" label="Datum" flex="3" hidden="false" primary="true"
+								class="sortDirectionIndicator"
+								sortActive="true"
+								sortDirection="ascending"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-stufe" label="Stufe" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sortActive="true"
+   								sortDirection="ascending"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#stufe"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-studiensemester" label="Studiensemester" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studiensemester"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-anmerkung" label="Anmerkung" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmerkung"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-anmeldedatum" label="Anmeldedatum" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-ort" label="Ort" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-punkte" label="Punkte" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#punkte" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-teilgenommen" label="Teilgen." flex="1" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#teilgenommen" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-ort_kurzbz" label="Ort" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-rt_id" label="ReihungstestID" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-person_id" label="PersonID" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#person_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-rt_person_id" label="RTPersonID" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_person_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_bezeichnung" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-studienplan_id" label="StudienplanID" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-studienplan_studiengang" label="Stg" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_studiengang" />
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-datum_iso" label="DatumISO" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="aufnahmetermine-tree-anmeldedatum_iso" label="AnmeldedatumISO" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
+							<splitter class="tree-splitter"/>
+						</treecols>
+
+						<template>
+							<treechildren flex="1" >
+									<treeitem uri="rdf:*">
+									<treerow  properties="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#properties">
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#stufe"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studiensemester"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmerkung"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#punkte"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#teilgenommen"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#ort_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_id"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#person_id"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#rt_person_id"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_bezeichnung"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_id"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#studienplan_studiengang"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#datum_iso"/>
+										<treecell label="rdf:http://www.technikum-wien.at/aufnahmetermine/rdf#anmeldedatum_iso"/>
+									</treerow>
+								</treeitem>
+							</treechildren>
+						</template>
+					</tree>
+					<vbox>
+						<hbox>
+							<button id="aufnahmetermine-button-neu" label="Neu" oncommand="AufnahmeTermineNeu();"/>
+							<button id="aufnahmetermine-button-loeschen" label="Loeschen" oncommand="AufnahmeTermineDelete();"/>
+						</hbox>
+						<vbox hidden="true">
+							<label value="person_id" control="aufnahmetermine-textbox-person_id"/>
+							<textbox id="aufnahmetermine-textbox-person_id" disabled="true"/>
+                            <label value="studienplan_studiengang_kz" control="aufnahmetermine-textbox-studienplan_studiengang_kz"/>
+                            <textbox id="aufnahmetermine-textbox-studienplan_studiengang_kz" disabled="true"/>
+							<label value="Neu" control="aufnahmetermine-checkbox-neu"/>
+							<checkbox id="aufnahmetermine-checkbox-neu" disabled="true" checked="false"/>
+							<label value="rt_person_id" control="aufnahmetermine-textbox-rt_person_id"/>
+							<textbox id="aufnahmetermine-textbox-rt_person_id" disabled="true"/>
+						</vbox>
+						<groupbox id="aufnahmetermine-groupbox" flex="1">
+						<caption label="Details"/>
+							<grid id="aufnahmetermine-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+								<columns  >
+									<column flex="1"/>
+									<column flex="5"/>
+								</columns>
+								<rows>
+									<row>
+										<label value="Reihungstest / Interview" control="aufnahmetermine-menulist-reihungstest"/>
+										<hbox>
+										<menulist id="aufnahmetermine-menulist-reihungstest" disabled="true"
+												datasources="rdf:null" flex="1" style="width:200px"
+												ref="http://www.technikum-wien.at/reihungstest/alle">
+											<template>
+												<menupopup>
+													<menuitem value="rdf:http://www.technikum-wien.at/reihungstest/rdf#reihungstest_id"
+												 		label="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
+														tooltiptext="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
+														uri="rdf:*"/>
+												</menupopup>
+											</template>
+										</menulist>
+										<toolbarbutton id="aufnahmetermine-button-reihungstest-refresh" image="../../skin/images/refresh.png" tooltiptext="Alle zukünftigen Reihungstests des Studiengangs laden" onclick="AufnahmeTermineReihungstestDropDownRefresh()"/>
+										<toolbarbutton id="aufnahmetermine-button-reihungstest-open" image="../../skin/images/edit.png" tooltiptext="Zur Reihungstestverwaltung" onclick="AufnahmeTermineReihungstestEdit()"/>
+										<spacer flex="1"/>
+										</hbox>
+									</row>
+									<row>
+										<label value="&tab-prestudent-aufnahme.anmeldung;" control="aufnahmetermine-textbox-anmeldungreihungstest"/>
+										<hbox>
+											<box class="Datum" id="aufnahmetermine-textbox-anmeldungreihungstest" disabled="true"/>
+											<button id="aufnahmetermine-button-anmeldungreihungstest-heute" label="Heute" oncommand="AufnahmeTermineAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
+										</hbox>
+									</row>
+									<row>
+										<label value="&tab-prestudent-aufnahme.absolviert;" control="aufnahmetermine-checkbox-teilgenommen"/>
+										<checkbox id="aufnahmetermine-checkbox-teilgenommen" checked="true" disabled="true"/>
+									</row>
+									<row>
+										<label value="Reihungstest Studienplan" control="aufnahmetermine-menulist-studienplan"/>
+										<hbox>
+										<menulist id="aufnahmetermine-menulist-studienplan" disabled="true"
+												datasources="rdf:null" flex="1"
+												ref="http://www.technikum-wien.at/studienplan">
+											<template>
+												<menupopup>
+													<menuitem value="rdf:http://www.technikum-wien.at/studienplan/rdf#studienplan_id"
+														label="rdf:http://www.technikum-wien.at/studienplan/rdf#bezeichnung"
+														uri="rdf:*"/>
+												</menupopup>
+											</template>
+										</menulist>
+										<spacer flex="1"/>
+										</hbox>
+									</row>
+									<row>
+										<label value="Punkte" control="aufnahmetermine-textbox-punkte" />
+										<hbox>
+											<textbox id="aufnahmetermine-textbox-punkte" disabled="true" maxlength="8" size="6"/>
+											<toolbarbutton
+												id="aufnahmetermine-button-reihungstest-punktesync"
+												<?php
+												if(!$rt_uebernahme)
+													echo 'hidden="true"';
+												?>
+												image="../../skin/images/transmit.png"
+												tooltiptext="Reihungstest Ergebnis holen"
+												onclick="AufnahemTermineReihungstestPunkteTransmit()"/>
+											<spacer flex="1" />
+										</hbox>
+                                    </row>
+                                    <groupbox id="aufnahmetermine-groupbox-vergleich-endpunkte" hidden="true">
+                                        <caption label="Vergleichswerte Reihungstestpunkte (Basisgebiete)"></caption>
+                                        <vbox style="padding: 10px;">
+                                            <spacer resize='none' height='10' flex="1"/>
+                                            <row>
+                                                <label value="Reihungstestpunkte (inkl. Physik)" control="aufnahmetermine-textbox-endpunkte-inkl-gebiete" style="margin-right: 7px;"/>
+                                                <hbox>
+                                                    <textbox id="aufnahmetermine-textbox-endpunkte-inkl-gebiete" readonly="true" maxlength="8" size="6" flex="1"/>
+													<toolbarbutton image="../../skin/images/up.png" tooltiptext="Als Punkte setzen" onclick="setEndpunkteAsPunkte('aufnahmetermine-textbox-endpunkte-inkl-gebiete')"/>
+                                                </hbox>
+                                            </row>
+                                            <row>
+                                                <label value="Reihungstestpunkte (exkl. Physik)" control="aufnahmetermine-textbox-endpunkte-exkl-gebiete" />
+                                                <hbox>
+                                                   <textbox id="aufnahmetermine-textbox-endpunkte-exkl-gebiete" readonly="true" maxlength="8" size="6" flex="1"/>
+													<toolbarbutton image="../../skin/images/up.png" tooltiptext="Als Punkte setzen" onclick="setEndpunkteAsPunkte('aufnahmetermine-textbox-endpunkte-exkl-gebiete')"/>
+                                                </hbox>
+                                            </row>
+                                        </vbox>
+                                    </groupbox>
+								</rows>
+							</grid>
+							<hbox>
+								<button id="aufnahmetermine-button-speichern" oncommand="AufnahmeTermineSpeichern()" label="Speichern" disabled="true"/>
+								<spacer flex="1" />
+							</hbox>
+						</groupbox>
+					</vbox>
+				</row>
+		</rows>
+</grid>
+
+</hbox>
+</groupbox>
+<spacer flex="1" />
+</vbox>
+</window>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 3de4dbb46..8ec746015 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -1,4696 +1,4696 @@
-<?php
-/* Copyright (C) 2006 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: Christian Paminger <christian.paminger@technikum-wien.at>,
- *			Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
- *			Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
- */
-
-// ****************************************
-// * Insert/Update/Delete
-// * der Studenten
-// *
-// * Script sorgt fuer den Datenbanzugriff
-// * fuer das XUL - Studenten-Modul
-// *
-// ****************************************
-
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../config/global.config.inc.php');
-require_once('../../include/'.EXT_FKT_PATH.'/generateuid.inc.php');
-require_once('../../include/'.EXT_FKT_PATH.'/generatematrikelnr.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/benutzerberechtigung.class.php');
-require_once('../../include/benutzergruppe.class.php');
-require_once('../../include/log.class.php');
-require_once('../../include/person.class.php');
-require_once('../../include/benutzer.class.php');
-require_once('../../include/student.class.php');
-require_once('../../include/prestudent.class.php');
-require_once('../../include/studiengang.class.php');
-require_once('../../include/akte.class.php');
-require_once('../../include/konto.class.php');
-require_once('../../include/dokument.class.php');
-require_once('../../include/studiensemester.class.php');
-require_once('../../include/betriebsmittel.class.php');
-require_once('../../include/betriebsmittelperson.class.php');
-require_once('../../include/bisio.class.php');
-require_once('../../include/zeugnisnote.class.php');
-require_once('../../include/lvgesamtnote.class.php');
-require_once('../../include/pruefung.class.php');
-require_once('../../include/abschlusspruefung.class.php');
-require_once('../../include/projektarbeit.class.php');
-require_once('../../include/projektbetreuer.class.php');
-require_once('../../include/lehrverband.class.php');
-require_once('../../include/gruppe.class.php');
-require_once('../../include/datum.class.php');
-require_once('../../include/pruefling.class.php');
-require_once('../../include/mail.class.php');
-require_once('../../include/kontakt.class.php');
-require_once('../../include/dms.class.php');
-require_once('../../include/notenschluessel.class.php');
-require_once('../../include/anrechnung.class.php');
-require_once('../../include/lehrveranstaltung.class.php');
-require_once('../../include/anwesenheit.class.php');
-require_once('../../include/benutzerfunktion.class.php');
-require_once('../../include/note.class.php');
-require_once('../../include/standort.class.php');
-require_once('../../include/adresse.class.php');
-require_once('../../include/reihungstest.class.php');
-require_once('../../include/studienplan.class.php');
-require_once('../../include/mobilitaet.class.php');
-require_once('../../include/studienordnung.class.php');
-
-$user = get_uid();
-$db = new basis_db();
-
-$return = false;
-$errormsg = 'unknown';
-$warning = '';
-$data = '';
-$error = false;
-
-loadVariables($user);
-//Berechtigungen laden
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($user);
-if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('assistenz') && !$rechte->isBerechtigt('mitarbeiter'))
-{
-	$return = false;
-	$errormsg = 'Keine Berechtigung';
-	$data = '';
-	$error = true;
-}
-
-// *** FUNKTIONEN ***
-
-// ****
-// * Generiert die Matrikelnummer
-// * FORMAT: 0710254001
-// * 07 = Jahr
-// * 1/2/0  = WS/SS/Incomming
-// * 0254 = Studiengangskennzahl vierstellig
-// * 001 = Laufende Nummer
-// ****
-function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz)
-{
-	$db = new basis_db();
-
-	$jahr = substr($studiensemester_kurzbz, 4);
-	$art = substr($studiensemester_kurzbz, 0, 2);
-
-	if($studiengang_kz<0)
-	{
-		$studiengang_kz=abs($studiengang_kz);
-		//Lehrgang
-		switch($art)
-		{
-			case 'WS': $art = '3'; break;
-			case 'SS': $art = '4'; break;
-			default: $art = '0'; break;
-		}
-	}
-	else
-	{
-		//Studiengang
-		switch($art)
-		{
-			case 'WS': $art = '1'; break;
-			case 'SS': $art = '2'; break;
-			default: $art = '0'; break;
-		}
-	}
-	if($art=='2' || $art=='4')
-		$jahr = $jahr-1;
-	$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
-
-	$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE '$matrikelnummer%' ORDER BY matrikelnr DESC LIMIT 1";
-
-	if($result = $db->db_query($qry))
-	{
-		if($row = $db->db_fetch_object($result))
-		{
-			$max = substr($row->matrikelnr, (strlen(trim($row->matrikelnr))-3));
-		}
-		else
-			$max = 0;
-
-		$max += 1;
-		return $matrikelnummer.sprintf("%03d",$max);
-	}
-	else
-	{
-		return false;
-	}
-}
-
-/**
- * Wenn die Anwesenheit und einen bestimmten Prozentsatz faellt, wird ein Pruefungstermin abgezogen
- * @param $studiensemester_kurzbz
- * @param $student_uid
- * @param $lehrveranstaltung_id
- * @param $note
- * @return null, error wird direkt in globale Variable geschrieben
- */
-function NotePruefungAnlegen($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $note)
-{
-	global $return, $error, $errormsg;
-
-	$db = new basis_db();
-	$anwesenheit = new anwesenheit();
-	$anwesenheit->loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id);
-
-	// Lehreinheit ermitteln
-	$error = false;
-	$qry = "
-		SELECT
-			lehreinheit_id
-		FROM
-			campus.vw_student_lehrveranstaltung
-		WHERE
-			uid=".$db->db_add_param($student_uid)."
-		 	AND lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id)."
-			AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
-		ORDER BY lehreinheit_id ASC
-		LIMIT 1";
-
-	if($result = $db->db_query($qry))
-	{
-		if($row = $db->db_fetch_object($result))
-		{
-			$lehreinheit_id = $row->lehreinheit_id;
-		}
-		else
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Fehler beim Ermitteln der Lehreinheit ID';
-		}
-	}
-	else
-	{
-		$return = false;
-		$error = true;
-		$errormsg = 'Fehler beim Ermitteln der Lehreinheit ID';
-	}
-
-	if(!$error)
-	{
-		$pruefung = new pruefung;
-		$pruefung->new = true;
-		$pruefung->student_uid = $student_uid;
-		$pruefung->lehreinheit_id = $lehreinheit_id;
-		$pruefung->datum = date("Y-m-d");
-
-		$stsem_obj = new studiensemester();
-		$stsem_obj->load($studiensemester_kurzbz);
-
-		// In Benutzerfunktion nachsehen ob eine Anwesenheitsbefreiung eingetragen ist
-		$benutzerfunktion = new benutzerfunktion();
-		$benutzerfunktion->getBenutzerFunktionByUid($student_uid, 'awbefreit', $stsem_obj->start, $stsem_obj->ende);
-
-		$anwesenheitsbefreit=false;
-		if(count($benutzerfunktion->result)>0)
-			$anwesenheitsbefreit=true;
-
-		// Wenn nicht Anwesenheitsbefreit und Anwesenheit unter einem bestimmten Prozentsatz faellt dann wird ein
-		// Pruefungsantritt abgezogen
-		if(isset($anwesenheit->result[0]) && $anwesenheit->result[0]->prozent < FAS_ANWESENHEIT_ROT && !$anwesenheitsbefreit)
-		{
-			// 1. Termin mit "nicht beurteilt" erstellen
-			$pruefung->pruefungstyp_kurzbz = "Termin1";
-			$pruefung->note = 7;
-			if($pruefung->save())
-			{
-				// 2. Termin mit Note erstellen
-				$pruefung->pruefungstyp_kurzbz = "Termin2";
-				$pruefung->note = $note;
-				if($pruefung->save())
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $pruefung->errormsg;
-					$return = false;
-				}
-			}
-			else
-			{
-				$errormsg = $pruefung->errormsg;
-				$return = false;
-			}
-		}
-		else
-		{
-			// 1. Termin mit Note erstellen
-			$pruefung->pruefungstyp_kurzbz = "Termin1";
-			$pruefung->note = $note;
-
-			if($pruefung->save())
-			{
-				$return = true;
-			}
-			else
-			{
-				$errormsg = $pruefung->errormsg;
-				$return = false;
-			}
-		}
-	}
-}
-
-if(!$error)
-{
-
-	if(isset($_POST['type']) && $_POST['type']=='savestudent')
-	{
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-
-		//Studentendaten speichern
-		if(!$error)
-		{
-			$student = new student();
-
-			if(!$student->load($_POST['uid']))
-			{
-				$return = false;
-				$errormsg = 'Fehler beim Laden:'.$student->errormsg;
-				$error = true;
-			}
-
-			if(!$error)
-			{
-				$student->uid = $_POST['uid'];
-				$student->anrede = $_POST['anrede'];
-				$student->titelpre = $_POST['titelpre'];
-				$student->titelpost = $_POST['titelpost'];
-				$student->vorname = $_POST['vorname'];
-				$student->vornamen = $_POST['vornamen'];
-				$student->nachname = $_POST['nachname'];
-				$student->gebdatum = $_POST['geburtsdatum'];
-				$student->gebort = $_POST['geburtsort'];
-				$student->gebzeit = $_POST['geburtszeit'];
-				$student->anmerkungen = $_POST['anmerkung'];
-				$student->homepage = $_POST['homepage'];
-				$student->matr_nr = $_POST['matr_nr'];
-				$student->svnr = $_POST['svnr'];
-				$student->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
-				$student->familienstand = $_POST['familienstand'];
-				$student->geschlecht = $_POST['geschlecht'];
-				$student->bnaktiv = ($_POST['aktiv']=='true'?true:false);
-				$student->anzahlkinder = $_POST['anzahlderkinder'];
-				$student->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
-				$student->geburtsnation = $_POST['geburtsnation'];
-				$student->sprache = $_POST['sprache'];
-				$student->matrikelnr = $_POST['matrikelnummer'];
-				$student->updateamum = date('Y-m-d H:i:s');
-				$student->updatevon = $user;
-
-				if($_POST['alias']!='')
-				{
-					if(checkalias($_POST['alias']))
-					{
-						$student->alias = $_POST['alias'];
-					}
-					else
-					{
-						$error = true;
-						$return = false;
-						$errormsg = 'Alias ist ungueltig';
-					}
-				}
-				else
-					$student->alias = '';
-
-				if(!$error)
-				{
-					$stsem = new studiensemester();
-					$stsem_kurzbz = $stsem->getaktorNext();
-					//Wenn das ausgewaehlte Semester das aktuelle ist, dann wird auch in der
-					//Tabelle Student der Stg/Semester/Verband/Gruppe geaendert.
-					//Sonst nur in der Tabelle Studentlehrverband
-					if($semester_aktuell == $stsem_kurzbz)
-					{
-						$student->studiengang_kz = $_POST['studiengang_kz'];
-						$student->semester = $_POST['semester'];
-						$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
-						$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
-					}
-
-					$student->new=false;
-
-					$lehrverband = new lehrverband();
-					if(!$lehrverband->exists($_POST['studiengang_kz'],$_POST['semester'],$_POST['verband'], $_POST['gruppe']))
-					{
-						$errormsg = 'Die angegebene Lehrverbandsgruppe existiert nicht!';
-						$return = false;
-						$error = true;
-					}
-
-					if(!$error)
-					{
-						if($student->save())
-						{
-							$student_lvb = new student();
-
-							// Studentlehrverband Eintrag nur Speichern, wenn der Student in diesem Studiensemester
-							// einen Status besitzt da es sonst beim Bearbeiten von alten Studenten immer in das
-							// entsprechende Studiensemester gewechselt werden muss.
-							$prestudentobj = new prestudent();
-							$prestudentobj->getPrestudentRolle($student->prestudent_id, null, $semester_aktuell);
-
-							if(count($prestudentobj->result)>0)
-							{
-								if($student_lvb->studentlehrverband_exists($_POST['uid'], $semester_aktuell))
-									$student_lvb->new = false;
-								else
-									$student_lvb->new = true;
-
-								$student_lvb->uid = $_POST['uid'];
-								$student_lvb->studiensemester_kurzbz = $semester_aktuell;
-								$student_lvb->studiengang_kz = $_POST['studiengang_kz'];
-								$student_lvb->semester = $_POST['semester'];
-								$student_lvb->verband = ($_POST['verband']==''?' ':$_POST['verband']);
-								$student_lvb->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
-								$student_lvb->updateamum = date('Y-m-d H:i:s');
-								$student_lvb->updatevon = $user;
-
-								if($student_lvb->save_studentlehrverband())
-								{
-									$return = true;
-									$error=false;
-									$data = $student->prestudent_id;
-								}
-								else
-								{
-									$error = true;
-									$errormsg = $student_lvb->errormsg;
-									$return = false;
-								}
-							}
-							else
-							{
-								$error = false;
-								$return = true;
-								$data = $student->prestudent_id;
-							}
-						}
-						else
-						{
-							$return = false;
-							$errormsg  = $student->errormsg;
-							$error = true;
-						}
-					}
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveperson')
-	{
-
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-		//Personendaten Speichern
-
-		if(!$error)
-		{
-			$person = new person();
-
-			if(!$person->load($_POST['person_id']))
-			{
-				$return = false;
-				$errormsg = 'Fehler beim Laden:'.$person->errormsg;
-				$error = true;
-			}
-
-			if(!$error)
-			{
-				$person->person_id = $_POST['person_id'];
-				$person->anrede = $_POST['anrede'];
-				$person->titelpre = $_POST['titelpre'];
-				$person->titelpost = $_POST['titelpost'];
-				$person->vorname = $_POST['vorname'];
-				$person->vornamen = $_POST['vornamen'];
-				$person->nachname = $_POST['nachname'];
-				$person->gebdatum = $_POST['geburtsdatum'];
-				$person->gebort = $_POST['geburtsort'];
-				$person->gebzeit = $_POST['geburtszeit'];
-				$person->anmerkungen = $_POST['anmerkung'];
-				$person->homepage = $_POST['homepage'];
-				$person->svnr = $_POST['svnr'];
-				$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
-				$person->familienstand = $_POST['familienstand'];
-				$person->geschlecht = $_POST['geschlecht'];
-				//$person->aktiv = ($_POST['aktiv']=='true'?true:false);
-				$person->anzahlkinder = $_POST['anzahlderkinder'];
-				$person->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
-				$person->geburtsnation = $_POST['geburtsnation'];
-				$person->sprache = $_POST['sprache'];
-				$person->matr_nr = $_POST['matr_nr'];
-				$person->updateamum = date('Y-m-d H:i:s');
-				$person->updatevon = $user;
-
-				$person->new=false;
-
-				if(!$error)
-				{
-					if($person->save())
-					{
-						$return = true;
-						$error=false;
-						$data = $person->person_id;
-					}
-					else
-					{
-						$return = false;
-						$errormsg  = $person->errormsg;
-						$error = true;
-					}
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveprestudent')
-	{
-		//PreStudentdaten Speichern
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-
-		if(!$error)
-		{
-			$prestudent = new prestudent();
-
-			if(!$prestudent->load($_POST['prestudent_id']))
-			{
-				$return = false;
-				$errormsg = 'Fehler beim Laden:'.$prestudent->errormsg;
-				$error = true;
-			}
-
-			if(!$error)
-			{
-				$prestudent->prestudent_id = $_POST['prestudent_id'];
-				$prestudent->aufmerksamdurch_kurzbz = $_POST['aufmerksamdurch_kurzbz'];
-				$prestudent->person_id = $_POST['person_id'];
-				$prestudent->studiengang_kz = $_POST['studiengang_kz'];
-				$prestudent->berufstaetigkeit_code = $_POST['berufstaetigkeit_code'];
-				$prestudent->ausbildungcode = $_POST['ausbildungcode'];
-				// Die Bachelor-ZGV darf nur mit einem eigenen Recht geändert werden
-				if($rechte->isBerechtigt('student/editBakkZgv',$_POST['studiengang_kz'],'suid'))
-				{
-					$prestudent->zgv_code = $_POST['zgv_code'];
-				}
-				elseif ($prestudent->zgv_code != $_POST['zgv_code'])
-				{
-					$errormsg = 'Keine Berechtigung zum Ändern der ZGV';
-					$error = true;
-				}
-				$prestudent->zgvort = $_POST['zgvort'];
-				$prestudent->zgvdatum = $_POST['zgvdatum'];
-				$prestudent->zgvnation = $_POST['zgvnation'];
-				$prestudent->zgvmas_code = $_POST['zgvmas_code'];
-				$prestudent->zgvmaort = $_POST['zgvmaort'];
-				$prestudent->zgvmadatum = $_POST['zgvmadatum'];
-				$prestudent->zgvmanation = $_POST['zgvmanation'];
-				$prestudent->aufnahmeschluessel = $_POST['aufnahmeschluessel'];
-				$prestudent->facheinschlberuf = ($_POST['facheinschlberuf']=='true'?true:false);
-				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
-				$prestudent->dual = ($_POST['dual']=='true'?true:false);
-				$prestudent->anmerkung = $_POST['anmerkung'];
-				$prestudent->mentor = $_POST['mentor'];
-				$prestudent->gsstudientyp_kurzbz = $_POST['gsstudientyp_kurzbz'];
-				$prestudent->priorisierung = $_POST['priorisierung'];
-				//$prestudent->insertamum = date('Y-m-d H:i:s');
-				//$prestudent->insertvon = $user;
-				$prestudent->updateamum = date('Y-m-d H:i:s');
-				$prestudent->updatevon = $user;
-				$prestudent->new=false;
-
-				if(!$error)
-				{
-					if($prestudent->save())
-					{
-						$return = true;
-						$error=false;
-						$data = $prestudent->prestudent_id;
-					}
-					else
-					{
-						$return = false;
-						$errormsg  = $prestudent->errormsg;
-						$error = true;
-					}
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='addrolle')
-	{
-		//Prestudentrolle hinzufuegen
-
-		if(!$error)
-		{
-			$prestudent_ids = explode(';', $_POST['prestudent_id']);
-			$errormsg='';
-			$anzahl_fehler=0;
-			foreach($prestudent_ids as $prestudent_id)
-			{
-				$error = false;
-				if($prestudent_id!='')
-				{
-					$prestd = new prestudent();
-					if(!$prestd->load($prestudent_id))
-					{
-						$error = true;
-						$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Laden des Prestudenten";
-						$anzahl_fehler++;
-					}
-					else
-					{
-						if(!$rechte->isBerechtigt('assistenz',$prestd->studiengang_kz,'suid') &&
-						   !$rechte->isBerechtigt('admin',$prestd->studiengang_kz, 'suid'))
-						{
-							$error = true;
-							$errormsg .= "\n$prestd->vorname $prestd->nachname: Sie haben keine Schreibrechte fuer diesen Studiengang";
-							$anzahl_fehler++;
-						}
-					}
-
-					// Check ob Reihungstest berücksichtigt werden soll
-					// kann in Config abgestellt werden
-					if(REIHUNGSTEST_CHECK)
-					{
-						$reihungstestangetreten = $prestd->reihungstestangetreten;
-
-						if($_POST['status_kurzbz']=='Bewerber' && !$reihungstestangetreten)
-						{
-							$error = true;
-							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben";
-							$anzahl_fehler++;
-						}
-					}
-
-					if(!defined("ZGV_CHECK") || ZGV_CHECK)
-					{
-						if($_POST['status_kurzbz']=='Bewerber' && $prestd->zgv_code=='')
-						{
-							$error = true;
-							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.";
-							$anzahl_fehler++;
-						}
-					}
-
-					$stg_obj = new studiengang();
-					$stg_obj->load($prestd->studiengang_kz);
-					if(!defined("ZGV_CHECK") || ZGV_CHECK)
-					{
-						if($_POST['status_kurzbz']=='Bewerber' && $prestd->zgvmas_code=='' && $stg_obj->typ=='m')
-						{
-							$error = true;
-							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.";
-							$anzahl_fehler++;
-						}
-					}
-
-					if(!$error)
-					{
-
-						if($prestd->getLastStatus($prestudent_id))
-						{
-							if($_POST['status_kurzbz']=='Absolvent' || $_POST['status_kurzbz']=='Diplomand')
-								$studiensemester = $semester_aktuell;
-							else
-								$studiensemester = $prestd->studiensemester_kurzbz;
-							$hlp = new prestudent();
-
-							if($_POST['status_kurzbz']=='Student')
-								$sem=$_POST['semester'];
-							else
-								$sem=$prestd->ausbildungssemester;
-
-							$hlp->getPrestudentRolle($prestudent_id, $_POST['status_kurzbz'], $studiensemester, "datum, insertamum", $sem);
-							if(count($hlp->result)>0)
-							{
-								$errormsg .= "\n$prestd->vorname $prestd->nachname: Diese Rolle ist bereits vorhanden";
-								$anzahl_fehler++;
-								$return = false;
-							}
-							else
-							{
-								//Wenn der Status auf Aufgenommener oder Wartender geaendert wird,
-								//muss ein Bewerberstatus vorhanden sein
-								if($_POST['status_kurzbz']=='Aufgenommener' || $_POST['status_kurzbz']=='Wartender')
-								{
-									$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($prestudent_id, FHC_INTEGER)." AND status_kurzbz='Bewerber'";
-									if($result_bw = $db->db_query($qry))
-									{
-										if($db->db_num_rows($result_bw)==0)
-										{
-											$return = false;
-											$error = true;
-											$errormsg .= "\n$prestd->vorname $prestd->nachname: Person muss zuerst zum Bewerber gemacht werden!";
-											$anzahl_fehler++;
-										}
-									}
-								}
-
-								if(!$error)
-								{
-									$prestd_neu = new prestudent();
-									$prestd_neu->prestudent_id = $prestudent_id;
-									$prestd_neu->status_kurzbz = $_POST['status_kurzbz'];
-									$prestd_neu->studiensemester_kurzbz = $studiensemester;
-									$prestd_neu->datum = date('Y-m-d');
-									$prestd_neu->ausbildungssemester = $sem;
-									$prestd_neu->orgform_kurzbz = $prestd->orgform_kurzbz;
-									$prestd_neu->studienplan_id = $prestd->studienplan_id;
-									$prestd_neu->insertamum = date('Y-m-d H:i:s');
-									$prestd_neu->insertvon = $user;
-									$prestd_neu->bestaetigtam = date('Y-m-d');
-									$prestd_neu->bestaetigtvon = $user;
-									if(isset($_POST['statusgrund_id']))
-										$prestd_neu->statusgrund_id = $_POST['statusgrund_id'];
-									$prestd_neu->new = true;
-
-									if($prestd_neu->save_rolle())
-									{
-										// wenn kein fehler und status bewerber und "email senden an bewerber" eingestellt ist
-										if($_POST['status_kurzbz']=='Bewerber' && SEND_BEWERBER_INFOMAIL)
-										{
-											// hole Email Adresse
-											$kontakt = new kontakt();
-											$kontakt->load_persKontakttyp($prestd->person_id, 'email');
-
-											// Wenn zumindest eine Email Adresse gefunden wurde
-											if(count($kontakt->result)>0)
-											{
-												$email = "Sehr geehrter Frau/Herr ".$prestd->vorname." ".$prestd->nachname.",<br><br> ";
-
-												$email.= INFOMAIL_BEWERBER;
-												foreach($kontakt->result as $k)
-												{
-													$mail = new mail($k->kontakt, 'no-reply', 'Infomail', 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Link vollständig darzustellen.');
-
-													$mail->setHTMLContent($email);
-													if(!$mail->send())
-													{
-														$errormsg= 'Fehler beim Senden des Mails!';
-														$anzahl_fehler++;
-													}
-												}
-											}
-										}
-
-										//Unterbrecher und Abbrecher werden ins 0. Semester verschoben
-										if($_POST['status_kurzbz']=='Unterbrecher' || $_POST['status_kurzbz']=='Abbrecher')
-										{
-											$student = new student();
-											$uid = $student->getUid($prestudent_id);
-											$student->load($uid);
-											$student->studiensemester_kurzbz=$studiensemester;
-											$student->semester = '0';
-											if($_POST['status_kurzbz']=='Abbrecher')
-											{
-												$student->verband='A';
-												$student->gruppe='';
-											}
-											if($_POST['status_kurzbz']=='Unterbrecher')
-											{
-												$student->verband='B';
-												$student->gruppe='';
-											}
-
-											// noch nicht eingetragene Noten ergänzen
-											$noten = new zeugnisnote();
-											$noten->getZeugnisnoten(null, $uid, $semester_aktuell);
-											foreach($noten->result as $obj)
-											{
-												if($obj->note == '')
-												{
-													$obj->note = 9;
-													$obj->save(true);
-												}
-											}
-
-											//Nachschauen ob dieser Lehrverband schon existiert, falls nicht dann anlegen
-											$lehrverband = new lehrverband();
-											if(!$lehrverband->exists($student->studiengang_kz, $student->semester, $student->verband, ''))
-											{
-												//Pruefen ob der uebergeordnete Lehrverband existiert, falls nicht dann anlegen
-												if(!$lehrverband->exists($student->studiengang_kz, $student->semester, '', ''))
-												{
-													$lehrverband->studiengang_kz = $student->studiengang_kz;
-													$lehrverband->semester = $student->semester;
-													$lehrverband->verband = '';
-													$lehrverband->gruppe = '';
-													$lehrverband->aktiv = true;
-													$lehrverband->bezeichnung = 'Ab-Unterbrecher';
-
-													$lehrverband->save(true);
-												}
-
-												$lehrverband->studiengang_kz = $student->studiengang_kz;
-												$lehrverband->semester = $student->semester;
-												$lehrverband->verband = $student->verband;
-												$lehrverband->gruppe = '';
-												$lehrverband->aktiv = true;
-												if($student->verband=='A')
-													$lehrverband->bezeichnung = 'Abbrecher';
-												else
-													$lehrverband->bezeichnung = 'Unterbrecher';
-
-												$lehrverband->save(true);
-											}
-											$student->updatevon = $user;
-											$student->updateamum = date('Y-m-d H:i:s');
-											//Student Speichern
-											$student->save(false, false);
-											//Studentlehrverband Eintrag Speichern
-											$student->save_studentlehrverband(false);
-										}
-
-										//Wenn Unterbrecher zu Studenten werden, dann wird das Semester mituebergeben
-										//Verband und Gruppe wird entfernt.
-										if($_POST['status_kurzbz']=='Student')
-										{
-											$student = new student();
-											$uid = $student->getUid($prestudent_id);
-											$student->load($uid);
-											$student->studiensemester_kurzbz=$semester_aktuell;
-											$student->semester = $_POST['semester'];
-											$student->verband = '';
-											$student->gruppe = '';
-											$student->save(false, false);
-											$student->save_studentlehrverband(false);
-											//Aktiv Status setzen
-											$benutzer = new benutzer();
-											if($benutzer->load($uid))
-											{
-												$benutzer->updateamum = date('Y-m-d H:i:s');
-												$benutzer->updatevon = $user;
-												$benutzer->bnaktiv=true;
-												$benutzer->save(false, false);
-											}
-										}
-
-										//bei Abbrechern und Absolventen wird der Aktiv Status auf false gesetzt
-										if($_POST['status_kurzbz']=='Abbrecher' || $_POST['status_kurzbz']=='Absolvent')
-										{
-											$student = new student();
-											$uid = $student->getUid($prestudent_id);
-
-											$benutzer = new benutzer();
-											if($benutzer->load($uid))
-											{
-												$benutzer->updateamum = date('Y-m-d H:i:s');
-												$benutzer->updatevon = $user;
-												$benutzer->bnaktiv=false;
-												$benutzer->save(false, false);
-											}
-										}
-										$return = true;
-									}
-									else
-									{
-										$return = false;
-										$errormsg = "\n$prestd->vorname $prestd->nachname: ".$prestd_neu->errormsg;
-										$anzahl_fehler++;
-									}
-								}
-							}
-						}
-						else
-						{
-							$return = false;
-							$errormsg .= "\n$prestd->vorname $prestd->nachname: Es ist keine Rolle fuer diesen Prestudent vorhanden";
-							$anzahl_fehler++;
-						}
-					}
-				}
-			}
-
-			if($anzahl_fehler>0)
-			{
-				$return = false;
-				$errormsg = "Es sind $anzahl_fehler Fehler aufgetreten: ".$errormsg;
-			}
-			else
-			{
-				$return = true;
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleterolle')
-	{
-		//Loescht eine Prestudentrolle
-		$deletePrestudent = false;
-
-		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
-		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
-		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
-		{
-			if($_POST['status_kurzbz']=='Student' && !$rechte->isBerechtigt('admin', null, 'suid'))
-			{
-				$return = false;
-				$errormsg = 'Studentenrolle kann nur durch den Administrator geloescht werden';
-			}
-			else
-			{
-				$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
-				if($result = $db->db_query($qry))
-				{
-					if($row = $db->db_fetch_object($result))
-					{
-						// Die letzte Rolle darf nur durch einen Administrator geloescht werden. Danach wird auch der PreStudent-Eintrag geloescht
-						if($row->anzahl<=1)
-						{
-							$deletePrestudent = true;
-							if (!$rechte->isBerechtigt('admin', null, 'suid'))
-							{
-								$return = false;
-								$errormsg = 'Die letzte Rolle kann nur durch den Administrator geloescht werden';
-								$error = true;
-							}
-						}
-					}
-					else
-					{
-						$return = false;
-						$errormsg = 'Fehler beim Ermitteln der Rollen';
-						$error = true;
-					}
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln der Rollen';
-				}
-
-				if(!$error)
-				{
-					$rolle = new prestudent();
-					if($rolle->load_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
-					{
-						if($rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') || $rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-						{
-							if($rolle->delete_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
-							{
-								$log_id = $rolle->log_id;
-								$return = true;
-								// Wenn in diesem Semester kein Status mehr vorhanden ist,
-								// dann wird auch der Studentlehrverband eintrag entfernt
-								if($rolle->getLastStatus($_POST['prestudent_id'],$_POST['studiensemester_kurzbz'])===false)
-								{
-									if($return)
-									{
-										$student = new student();
-										$temp_uid = $student->getUid($rolle->prestudent_id);
-										if(!$student->delete_studentLehrverband($temp_uid, $_POST['studiengang_kz'], $rolle->studiensemester_kurzbz, $rolle->ausbildungssemester))
-										{
-											$return = false;
-											$errormsg = "Fehler beim Löschen der Lehrverbandszuordnung.";
-										}
-									}
-								}
-								// Wenn kein Prestudent-Eintrag mehr vorhanden ist, wird der ganze Prestudent-Datensatz geloescht
-								if ($deletePrestudent == true)
-								{
-									$prestudent = new prestudent();
-									if(!$prestudent->deletePrestudent($_POST['prestudent_id']))
-									{
-										$return = false;
-										$errormsg = "Fehler beim Löschen des Prestudenten.";
-										$log = new log();
-										$log->undo($log_id);
-									}
-								}
-							}
-							else
-							{
-								$return = false;
-								$errormsg = $rolle->errormsg;
-							}
-						}
-						else
-						{
-							$return = false;
-							$errormsg = 'Sie haben keine Berechtigung zum Loeschen dieser Rolle';
-						}
-					}
-					else
-					{
-						$return = false;
-						$errormsg = $rolle->errormsg;
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='returnDeletePrestudent')
-	{
-		//Prueft, wie viele Prestudentrolle-Eintraege noch vorhanden sind und gibt diese Anzahl als Wert zurueck
-
-		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
-		{
-			$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$return = true;
-					$data = $row->anzahl;
-				}
-				else
-				{
-					$return = false;
-					$errormsg = 'Fehler beim Zaehlen der Rollen';
-					$error = true;
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Zaehlen der Rollen';
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='bestaetigerolle')
-	{
-		//Bestaetigt eine Prestudentrolle
-
-		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
-		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
-		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
-		{
-			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-			{
-				$return = false;
-				$errormsg = 'keine Berechtigung';
-			}
-			else
-			{
-				$rolle = new prestudent();
-				if($rolle->load_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
-				{
-					if($rolle->bestaetige_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester'],$user))
-					{
-						// Message verschicken
-						$prestudent = new prestudent();
-						$prestudent->load($_POST['prestudent_id']);
-
-						$url =APP_ROOT.'index.ci.php/api/v1/system/Message/MessageVorlage';
-						$ch = curl_init();
-						curl_setopt($ch, CURLOPT_URL,$url);
-						curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-
-						$header=array();
-						$auth = base64_encode(FHC_REST_USER.':'.FHC_REST_PASSWORD);
-						$header[]="Authorization: Basic $auth";
-						$header[]='FHC-API-KEY:'.FHC_REST_API_KEY;
-
-						curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-						curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-						$studiengang = new studiengang();
-						$studiengang->load($prestudent->studiengang_kz);
-						$studiengang->getAllTypes();
-
-						$orgform='';
-						if($rolle->studienplan_id!='')
-						{
-							$studienplan = new studienplan();
-							$studienplan->loadStudienplan($rolle->studienplan_id);
-							$orgform = $studienplan->orgform_kurzbz;
-						}
-						else
-							$orgform = $rolle->orgform_kurzbz;
-						$curl_post_data = array(
-						"sender_id" => 1, // TODO
-						"receiver_id" => $prestudent->person_id,
-						"oe_kurzbz" => $studiengang->oe_kurzbz,
-						"vorlage_kurzbz" => 'MailStatConfirm'.$_POST['status_kurzbz'],
-						"data" => array(
-							'anrede'=>$prestudent->anrede,
-							'vorname'=>$prestudent->vorname,
-							'nachname'=>$prestudent->nachname,
-							'typ'=>$studiengang->studiengang_typ_arr[$studiengang->typ],
-							'studiengang'=>$studiengang->bezeichnung,
-							'orgform'=>$orgform,
-							'stgMail'=>$studiengang->email
-						 )
-						);
-
-						curl_setopt($ch, CURLOPT_POST, true);
-						curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($curl_post_data));
-
-						$result = curl_exec($ch);
-						$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-						curl_close($ch);
-
-						$jsonresult = json_decode($result);
-						if(isset($jsonresult->error) && $jsonresult->error==1)
-						{
-							$return = false;
-							$errormsg = $jsonresult->retval;
-						}
-						else
-						{
-							$return = true;
-						}
-					}
-					else
-					{
-						$return = false;
-						$errormsg = $rolle->errormsg;
-					}
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $rolle->errormsg;
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saverolle')
-	{
-		//Prestudentrolle speichern
-		if(!$error)
-		{
-			if(isset($_POST['prestudent_id']))
-			{
-				$rolle = new prestudent();
-				if(!$rolle->load($_POST['prestudent_id']))
-				{
-					$error = true;
-					$errormsg = 'Prestudent wurde nicht gefunden';
-				}
-				else
-				{
-					//Berechtigung pruefen
-					if(!$rechte->isBerechtigt('assistenz',$rolle->studiengang_kz,'suid') &&
-					   !$rechte->isBerechtigt('admin',$rolle->studiengang_kz, 'suid'))
-					{
-						$error = true;
-						$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-					}
-				}
-
-				$rolle = new prestudent();
-				$rolle->prestudent_id = $_POST['prestudent_id'];
-
-				if(!$error)
-				{
-					if(($_POST['studiensemester_old']=='') || (!$rolle->load_rolle($_POST['prestudent_id'], $_POST['status_kurzbz'], $_POST['studiensemester_old'], $_POST['ausbildungssemester_old'])))
-					{
-						$rolle->new = true;
-						$rolle->insertamum = date('Y-m-d H:i:s');
-						$rolle->insertvon = $user;
-						$rolle->status_kurzbz = $_POST['status_kurzbz'];
-						$rolle->bestaetigtam = date('Y-m-d');
-						$rolle->bestaetigtvon = $user;
-
-						if($_POST['status_kurzbz']=='Student')
-						{
-							//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
-							$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
-							if($result = $db->db_query($qry))
-							{
-								if($row = $db->db_fetch_object($result))
-								{
-									if($row->anzahl==0)
-									{
-										$error = true;
-										$errormsg = 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student".';
-										$return = false;
-									}
-								}
-							}
-						}
-					}
-					else
-					{
-						$rolle->ausbildungssemester_old = $_POST['ausbildungssemester_old'];
-						$rolle->studiensemester_old = $_POST['studiensemester_old'];
-						$rolle->updateamum = date('Y-m-d H:i:s');
-						$rolle->updatevon = $user;
-						$rolle->new = false;
-					}
-
-					if(!$error)
-					{
-						// Bei Studenten wird der Studentlehrverband Eintrag angelegt/korrigiert
-						$student = new student();
-						if($temp_uid = $student->getUid($rolle->prestudent_id))
-						{
-							if(in_array($rolle->status_kurzbz,array('Student','Diplomand','Absovlent','Incoming','Abbrecher','Unterbrecher')))
-							{
-								if($student->load($temp_uid))
-								{
-									$stdsem_new = filter_input(INPUT_POST, "studiensemester_kurzbz");
-									$semester = filter_input(INPUT_POST, "ausbildungssemester");
-
-									if($student->load_studentlehrverband($temp_uid, $stdsem_new))
-										$student->new=false;
-									else
-										$student->new=true;
-
-									$lehrverband = new lehrverband();
-									if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
-									{
-										$student->studiensemester_kurzbz = $stdsem_new;
-										$return = false;
-										$errormsg = $student->errormsg;
-									}
-									else
-									{
-										$student->studiensemester_kurzbz = $stdsem_new;
-										$student->semester = $semester;
-										$student->updatevon = $user;
-									}
-
-									$student->save_studentlehrverband();
-								}
-							}
-						}
-
-						$rolle->ausbildungssemester = $_POST['ausbildungssemester'];
-						$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
-						$rolle->datum = $_POST['datum'];
-						$rolle->bestaetigtam = $_POST['bestaetigtam'];
-						if($_POST['bestaetigtam']=='')
-							$rolle->bestaetigtvon = null;
-
-						$rolle->bewerbung_abgeschicktamum = $_POST['bewerbung_abgeschicktamum'];
-						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
-						$rolle->studienplan_id = $_POST['studienplan_id'];
-						$rolle->anmerkung_status = $_POST['anmerkung'];
-						$rolle->rt_stufe = $_POST['rt_stufe'];
-						$rolle->statusgrund_id = $_POST['statusgrund_id'];
-
-						if($rolle->save_rolle())
-							$return = true;
-						else
-						{
-							$return = false;
-							$errormsg = $rolle->errormsg;
-						}
-					}
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg = 'Prestudent_id muss angegeben werden';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='rolleVorruecken')
-	{
-		$errormsg='';
-		//Prestudentrolle speichern
-		if(!$error)
-		{
-			if(isset($_POST['prestudent_id']))
-			{
-				$rolle = new prestudent();
-				if(!$rolle->load($_POST['prestudent_id']))
-				{
-					$error = true;
-					$errormsg = 'Prestudent wurde nicht gefunden';
-				}
-				else
-				{
-					//Berechtigung pruefen
-					if(!$rechte->isBerechtigt('assistenz',$rolle->studiengang_kz,'suid') &&
-					   !$rechte->isBerechtigt('admin',$rolle->studiengang_kz, 'suid'))
-					{
-						$error = true;
-						$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-					}
-				}
-
-				$rolle = new prestudent();
-				$rolle->prestudent_id = $_POST['prestudent_id'];
-
-				if(!$error)
-				{
-					$studiensem = new studiensemester();
-					$stdsem = $studiensem->getNextFrom($_POST["studiensemester_kurzbz"]);
-//					$stdsem = ($stdesm==false ? $_POST["studiensemester_kurzbz"]:$stdsem);
-					$semester = $_POST["ausbildungssemester"];
-					$semester++;
-					if((!$rolle->load_rolle($_POST['prestudent_id'], $_POST['status_kurzbz'], $stdsem, $semester)))
-					{
-						$rolle->new = true;
-						$rolle->insertamum = date('Y-m-d H:i:s');
-						$rolle->insertvon = $user;
-						$rolle->status_kurzbz = $_POST['status_kurzbz'];
-						$rolle->bestaetigtam = date('Y-m-d');
-						$rolle->bestaetigtvon = $user;
-
-						if($_POST['status_kurzbz']=='Student')
-						{
-							//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
-							$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
-							if($result = $db->db_query($qry))
-							{
-								if($row = $db->db_fetch_object($result))
-								{
-									if($row->anzahl==0)
-									{
-										$error = true;
-										$errormsg = 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student".';
-										$return = false;
-									}
-								}
-							}
-						}
-					}
-					else
-					{
-						//Rolle existiert bereits
-						$error = true;
-						$errormsg = "Rolle existiert bereits.";
-						$return = false;
-					}
-
-					$student = new student();
-					$temp_uid = $student->getUid($rolle->prestudent_id);
-
-					if(!$error)
-					{
-						$student->load_studentlehrverband($temp_uid, $_POST["studiensemester_kurzbz"]);
-						$lehrverband = new lehrverband();
-						if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
-						{
-							$student->studiensemester_kurzbz = $stdsem;
-							$return = false;
-							$errormsg = $student->errormsg;
-						}
-						else
-						{
-							$student->studiensemester_kurzbz = $stdsem;
-							$student->semester = $semester;
-						}
-
-						$student->save_studentlehrverband(true);
-						$rolle->ausbildungssemester = $semester;
-						$rolle->studiensemester_kurzbz = $stdsem;
-						$rolle->datum = date("Y-m-d");
-						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
-						$rolle->studienplan_id = $_POST['studienplan_id'];
-
-						if($rolle->save_rolle())
-						{
-							$return = true;
-						}
-						else
-						{
-							$return = false;
-							$errormsg = $rolle->errormsg;
-						}
-					}
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg = 'Prestudent_id muss angegeben werden';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='BewerberZuStudent')
-	{
-		// macht aus einem Bewerber einen Studenten
-		// Voraussetzungen:
-		// - ZGV muss ausgefuellt sein (bei Master beide)
-		// - Kaution muss bezahlt sein
-		// - Rolle Bewerber muss existieren
-		// Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
-		// und UID generiert und der Studentendatensatz angelegt.
-		$errormsg='';
-		if(!$error)
-		{
-			if(isset($_POST['prestudent_id']))
-			{
-				$prestudent_ids = explode(';', $_POST['prestudent_id']);
-				$anzahl_fehler=0;
-				foreach ($prestudent_ids as $prestudent_id)
-				{
-					$error = false;
-					if($prestudent_id!='')
-					{
-
-						$prestd = new prestudent();
-						if($prestd->load($prestudent_id))
-						{
-							//Berechtigung pruefen
-							if(!$rechte->isBerechtigt('assistenz',$prestd->studiengang_kz,'suid') &&
-							   !$rechte->isBerechtigt('admin',$prestd->studiengang_kz, 'suid'))
-							{
-								$error = true;
-								$errormsg .= "\n$prestd->vorname $prestd->nachname: Sie haben keine Schreibrechte fuer diesen Studiengang";
-								$anzahl_fehler++;
-							}
-
-							if(!$error)
-							{
-								if((!defined("ZGV_CHECK") && $prestd->zgv_code!='') || (defined("ZGV_CHECK") && ZGV_CHECK == false) || (defined("ZGV_CHECK") && ZGV_CHECK == true && $prestd->zgv_code!=''))
-								{
-									$stg = new studiengang();
-									$stg->load($prestd->studiengang_kz);
-
-									if((defined("ZGV_CHECK") && ZGV_CHECK == true && $stg->typ=='m' && $prestd->zgvmas_code=='') || (!defined("ZGV_CHECK") && $stg->typ=='m' && $prestd->zgvmas_code==''))
-									{
-										$return = false;
-										$errormsg .= "\n$prestd->vorname $prestd->nachname: ZGV Master muss eingegeben werden";
-										$anzahl_fehler++;
-									}
-									else
-									{
-										//Pruefen ob die Rolle Bewerber existiert
-										$hlp = new prestudent();
-										$hlp->getPrestudentRolle($prestudent_id, 'Bewerber',null,'datum DESC, insertamum DESC');
-
-										if(count($hlp->result)>0)
-										{
-											$aufgenommener = new prestudent();
-											$aufgenommener ->getPrestudentRolle($prestudent_id, 'Aufgenommener', null,'datum DESC, insertamum DESC');
-
-											if(count($aufgenommener->result)>0)
-											{
-												if($hlp->result[0]->studiensemester_kurzbz==$aufgenommener->result[0]->studiensemester_kurzbz
-												   && $hlp->result[0]->ausbildungssemester==$aufgenommener->result[0]->ausbildungssemester)
-												{
-													//pruefen ob schon eine Studentenrolle Existiert
-													$hlp1 = new prestudent();
-													$hlp1->getPrestudentRolle($prestudent_id, 'Student', $aufgenommener->result[0]->studiensemester_kurzbz);
-													if(count($hlp1->result)>0)
-													{
-														$return = false;
-														$errormsg .= "\n$prestd->vorname $prestd->nachname: Diese Person ist bereits Student";
-														$anzahl_fehler++;
-													}
-													else
-													{
-														$db->db_query('BEGIN;');
-
-														//Matrikelnummer und UID generieren
-														$matrikelnr = generateMatrikelnummer($prestd->studiengang_kz, $aufgenommener->result[0]->studiensemester_kurzbz);
-														$jahr = substr($matrikelnr,0, 2);
-														$stg = $prestd->studiengang_kz;
-														$stg_obj = new studiengang();
-														$stg_obj->load(ltrim($stg,'0'));
-														$uid = generateUID($stg_obj->kurzbz,$jahr,$stg_obj->typ,$matrikelnr);
-														$matrikelnummer = generateMatrikelnr($stg_obj->oe_kurzbz);
-
-														if($matrikelnummer != null)
-														{
-															$qry = "UPDATE public.tbl_person SET matr_nr=".$db->db_add_param($matrikelnummer)." WHERE person_id=".$db->db_add_param($prestd->person_id, FHC_INTEGER).' AND matr_nr is null';
-															$db->db_query($qry);
-														}
-
-														if(defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN)
-														{
-															$matrikelnr = $uid;
-														}
-
-														if(defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER)
-														{
-															$qry = "UPDATE public.tbl_person SET matr_nr=".$db->db_add_param($uid)." WHERE person_id=".$db->db_add_param($prestd->person_id, FHC_INTEGER).' AND matr_nr is null';
-															$db->db_query($qry);
-														}
-														//Benutzerdatensatz anlegen
-														$benutzer = new benutzer();
-														$benutzer->uid = $uid;
-														$benutzer->person_id = $prestd->person_id;
-														$benutzer->aktiv = true;
-														$benutzer->aktivierungscode = generateActivationKey();
-
-														$nachname_clean = mb_strtolower(convertProblemChars($prestd->nachname));
-														$vorname_clean = mb_strtolower(convertProblemChars($prestd->vorname));
-														$nachname_clean = str_replace(' ','_', $nachname_clean);
-														$vorname_clean = str_replace(' ','_', $vorname_clean);
-
-														if(!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT===true)
-														{
-															$qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER(".$db->db_add_param($vorname_clean.".".$nachname_clean).")";
-															$result_alias = $db->db_query($qry_alias);
-															if($db->db_num_rows($result_alias)==0)
-																$benutzer->alias = $vorname_clean.'.'.$nachname_clean;
-															else
-																$benutzer->alias = '';
-														}
-														else
-															$benutzer->alias='';
-
-														$benutzer->insertamum = date('Y-m-d H:i:s');
-														$benutzer->insertvon = $user;
-
-														if($benutzer->save(true, false))
-														{
-															//Studentendatensatz anlegen
-															$student = new student();
-															$student->uid = $uid;
-															$student->matrikelnr = $matrikelnr;
-															$student->prestudent_id = $prestd->prestudent_id;
-															$student->studiengang_kz = $prestd->studiengang_kz;
-															$student->semester = $aufgenommener->result[0]->ausbildungssemester;
-															$student->verband = ' ';
-															$student->gruppe = ' ';
-															$student->insertamum = date('Y-m-d H:i:s');
-															$student->insertvon = $user;
-
-															//Pruefen ob der Lehrverband exisitert, falls nicht dann anlegen
-															$lehrverband = new lehrverband();
-															if(!$lehrverband->load($student->studiengang_kz, $student->semester, $student->verband, $student->gruppe))
-															{
-																$lehrverband->studiengang_kz = $student->studiengang_kz;
-																$lehrverband->semester = $student->semester;
-																$lehrverband->verband = $student->verband;
-																$lehrverband->gruppe = $student->gruppe;
-																$lehrverband->aktiv = true;
-																if(!$lehrverband->save(true))
-																{
-																	$error = true;
-																	$errormsg = 'Fehler beim Speichern des Lehrverbandes';
-																	$return = false;
-																}
-															}
-
-															if(!$error)
-															{
-																if($student->save(true, false))
-																{
-																	//Prestudentrolle hinzugfuegen
-																	$rolle = new prestudent();
-																	$rolle->prestudent_id = $prestd->prestudent_id;
-																	$rolle->status_kurzbz = 'Student';
-																	$rolle->studiensemester_kurzbz = $aufgenommener->result[0]->studiensemester_kurzbz;
-																	$rolle->ausbildungssemester = $aufgenommener->result[0]->ausbildungssemester;
-																	$rolle->orgform_kurzbz = $aufgenommener->result[0]->orgform_kurzbz;
-																	$rolle->studienplan_id = $aufgenommener->result[0]->studienplan_id;
-																	$rolle->datum = date('Y-m-d');
-																	$rolle->insertamum = date('Y-m-d H:i:s');
-																	$rolle->insertvon = $user;
-																	$rolle->bestaetigtam = date('Y-m-d');
-																	$rolle->bestaetigtvon = $user;
-																	if(isset($_POST['statusgrund_id']))
-																		$rolle->statusgrund_id = $_POST['statusgrund_id'];
-																	$rolle->new = true;
-
-																	if($rolle->save_rolle())
-																	{
-																		//StudentLehrverband anlegen
-																		$studentlehrverband = new student();
-																		$studentlehrverband->uid = $uid;
-																		$studentlehrverband->studiensemester_kurzbz = $aufgenommener->result[0]->studiensemester_kurzbz;
-																		$studentlehrverband->studiengang_kz = $prestd->studiengang_kz;
-																		$studentlehrverband->semester = $aufgenommener->result[0]->ausbildungssemester;
-																		$studentlehrverband->verband = ' ';
-																		$studentlehrverband->gruppe = ' ';
-																		$studentlehrverband->insertamum = date('Y-m-d H:i:s');
-																		$studentlehrverband->insertvon = $user;
-
-																		if($studentlehrverband->save_studentlehrverband(true))
-																		{
-																			$return = true;
-																			$db->db_query('COMMIT;');
-																		}
-																		else
-																		{
-																			$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Studentlehrverbandes: ".$studentlehrverband->errormsg;
-																			$return = false;
-																			$anzahl_fehler++;
-																			$db->db_query('ROLLBACK;');
-																		}
-																	}
-																	else
-																	{
-																		$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Rolle: ".$rolle->errormsg;
-																		$return = false;
-																		$anzahl_fehler++;
-																		$db->db_query('ROLLBACK;');
-																	}
-																}
-																else
-																{
-																	$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Studenten: ".$student->errormsg;
-																	$return = false;
-																	$anzahl_fehler++;
-																	$db->db_query('ROLLBACK;');
-																}
-															}
-														}
-														else
-														{
-															$errormsg .= "\n$prestd->vorname $prestd->nachname $matrikelnr: Fehler beim Speichern des Benutzers: ".$benutzer->errormsg;
-															$return = false;
-															$anzahl_fehler++;
-															$db->db_query('ROLLBACK;');
-														}
-													}
-												}
-												else
-												{
-													$return = false;
-													$errormsg .= "\n$prestd->vorname $prestd->nachname: Das Studiensemester oder Ausbildungsemester des Berwerberstatus und des Aufgenommenenstatus passen nicht überein";
-													$anzahl_fehler++;
-												}
-											}
-											else
-											{
-												$return = false;
-												$errormsg .= "\n$prestd->vorname $prestd->nachname: Die Person muss zuerst Aufgenommener sein bevor Sie zum Studenten gemacht werden kann";
-												$anzahl_fehler++;
-											}
-										}
-										else
-										{
-											$return = false;
-											$errormsg .= "\n$prestd->vorname $prestd->nachname: Die Person muss zuerst Bewerber sein bevor Sie zum Studenten gemacht werden kann";
-											$anzahl_fehler++;
-										}
-									}
-								}
-								else
-								{
-									$return = false;
-									$errormsg .= "\n$prestd->vorname $prestd->nachname: ZGV muss eingegeben werden";
-									$anzahl_fehler++;
-								}
-							}
-						}
-						else
-						{
-							$return = false;
-							$errormsg .= "\nPrestudent wurde nicht gefunden zu $prestudent_id";
-						}
-					}
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg = 'Prestudent_id muss angegeben werden';
-			}
-
-			if($anzahl_fehler>0)
-			{
-				$return = false;
-				$errormsg = "Es sind $anzahl_fehler Fehler aufgetreten: ".$errormsg;
-			}
-			else
-			{
-				$return = true;
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='gruppenzuteilung')
-	{
-		if(isset($_POST['uid']) && isset($_POST['gruppe_kurzbz']))
-		{
-			$gruppe = new gruppe();
-			if(!$gruppe->load($_POST['gruppe_kurzbz']))
-			{
-				$error = true;
-				$errormsg='Gruppe wurde nicht gefunden';
-			}
-			else
-			{
-				//Berechtigung pruefen
-				if(!$rechte->isBerechtigt('assistenz',$gruppe->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$gruppe->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$errormsg = 'Sie haben keine Schreibrechte fuer diese Gruppe';
-				}
-			}
-			$benutzergruppe = new benutzergruppe();
-
-			$uids = explode(';',$_POST['uid']);
-			$errormsg = '';
-			foreach ($uids as $uid)
-			{
-				if($uid!='')
-				{
-					if($_POST['gruppe_kurzbz']!='')
-					{
-						//Zuteilung zu einer Spezialgruppe
-
-						if(!$benutzergruppe->load($uid, $_POST['gruppe_kurzbz']))
-						{
-							$benutzergruppe->uid = $uid;
-							$benutzergruppe->gruppe_kurzbz = $_POST['gruppe_kurzbz'];
-							$benutzergruppe->studiensemester_kurzbz = $semester_aktuell;
-							$benutzergruppe->insertamum = date('Y-m-d H:i:s');
-							$benutzergruppe->insertvon = $user;
-							$benutzergruppe->new = true;
-
-							if(!$benutzergruppe->save())
-							{
-								$errormsg .= "$uid konnte nicht hinzugefuegt werden\n";
-							}
-						}
-						else
-							$errormsg .= "Der Student $uid ist bereits im $benutzergruppe->studiensemester_kurzbz dieser Gruppe zugeteilt. Entfernen Sie vorher diese Zuteilung.\n";
-					}
-					else
-					{
-						//Zuteilung zu einer Lehrverbandsgruppe
-						$error = false;
-						$stsem = new studiensemester();
-						$stsem_kurzbz = $stsem->getaktorNext();
-
-						//Schauen ob die Lehrverbandsgruppe existiert
-						$lehrverband = new lehrverband();
-						if(!$lehrverband->exists($_POST['stg_kz'],$_POST['semester'],$_POST['verband'], $_POST['gruppe']))
-						{
-							$errormsg .= 'Die angegebene Lehrverbandsgruppe existiert nicht!';
-							$return = false;
-							$error = true;
-						}
-
-						//Wenn das ausgewaehlte Semester das aktuelle ist, dann wird auch in der
-						//Tabelle Student der Stg/Semester/Verband/Gruppe geaendert.
-						//Sonst nur in der Tabelle Studentlehrverband
-						if($semester_aktuell == $stsem_kurzbz)
-						{
-							//Eintrag in der Tabelle Student aendern
-							$student = new student();
-
-							if(!$student->load($uid))
-							{
-								$errormsg .= 'Fehler beim Laden des Studenten';
-								$error = true;
-								$return = false;
-							}
-
-							if($student->studiengang_kz!=$_POST['stg_kz'])
-							{
-								$errormsg.='Ein Student kann nicht in eine Lehrverbandsgruppe eines anderen Studienganges verschoben werden';
-								$return = false;
-								$error = true;
-							}
-
-							if(!$error)
-							{
-								$student->studiengang_kz = $_POST['stg_kz'];
-								$student->semester = $_POST['semester'];
-								$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
-								$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
-								$student->new=false;
-
-								if(!$student->save())
-								{
-									$errormsg .= 'Fehler beim Speichern des Studenteneintrages';
-									$return = false;
-									$error = true;
-								}
-							}
-						}
-
-						if(!$error)
-						{
-							//Eintrag in der Tabelle Student aendern
-							$student = new student();
-
-							if(!$student->load($uid))
-							{
-								$errormsg .= 'Fehler beim Laden des Studenten';
-								$error = true;
-								$return = false;
-							}
-
-							if($student->studiengang_kz!=$_POST['stg_kz'])
-							{
-								$errormsg.='Ein Student kann nicht in eine Lehrverbandsgruppe eines anderen Studienganges verschoben werden';
-								$return = false;
-								$error = true;
-							}
-
-							if(!$error)
-							{
-								//Eintrag in der Tabelle Studentlehrverband aendern
-								$student_lvb = new student();
-
-								if($student_lvb->studentlehrverband_exists($uid, $semester_aktuell))
-									$student_lvb->new = false;
-								else
-									$student_lvb->new = true;
-
-								$student_lvb->uid = $uid;
-								$student_lvb->studiensemester_kurzbz = $semester_aktuell;
-								$student_lvb->studiengang_kz = $_POST['stg_kz'];
-								$student_lvb->semester = $_POST['semester'];
-								$student_lvb->verband = ($_POST['verband']==''?' ':$_POST['verband']);
-								$student_lvb->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
-								$student_lvb->updateamum = date('Y-m-d H:i:s');
-								$student_lvb->updatevon = $user;
-
-								if($student_lvb->save_studentlehrverband())
-								{
-									$return = true;
-									$error=false;
-								}
-								else
-								{
-									$error = true;
-									$errormsg .= $student_lvb->errormsg;
-									$return = false;
-								}
-							}
-						}
-					}
-				}
-			}
-			if($errormsg=='')
-				$return = true;
-			else
-				$return = false;
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteGruppenzuteilung')
-	{
-		if(isset($_POST['uid']) && isset($_POST['gruppe_kurzbz']))
-		{
-			$gruppe = new gruppe();
-			if($gruppe->load($_POST['gruppe_kurzbz']))
-			{
-				$uids = explode(';',$_POST['uid']);
-				$errormsg = '';
-				foreach ($uids as $uid)
-				{
-					if($uid!='')
-					{
-						$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($uid);
-						if($result = $db->db_query($qry))
-						{
-							if($row = $db->db_fetch_object($result))
-							{
-								//Berechtigung pruefen
-								if(!$rechte->isBerechtigt('assistenz',$gruppe->studiengang_kz,'suid') &&
-								   !$rechte->isBerechtigt('admin',$gruppe->studiengang_kz, 'suid') &&
-								   !$rechte->isBerechtigt('admin',$row->studiengang_kz, 'suid') &&
-								   !$rechte->isBerechtigt('assistenz',$row->studiengang_kz, 'suid'))
-								{
-									$error = true;
-									$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-								}
-
-								if(!$error)
-								{
-									$benutzergruppe = new benutzergruppe();
-
-									if(!$benutzergruppe->delete($uid, $_POST['gruppe_kurzbz']))
-									{
-										$errormsg .= "$uid konnte nicht aus der Gruppe geloescht werden\n";
-									}
-								}
-							}
-							else
-								$errormsg .= "Studiengang von $uid konnte nicht ermittelt werden\n";
-						}
-						else
-							$errormsg .= "Studiengang von $uid konnte nicht ermittelt werden\n";
-					}
-				}
-				if($errormsg=='')
-					$return = true;
-				else
-					$return = false;
-			}
-			else
-			{
-				$return = false;
-				$errormsg = "Gruppe wurde nicht gefunden";
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteAkte')
-	{
-		if(isset($_POST['akte_id']) && is_numeric($_POST['akte_id']))
-		{
-			//Berechtigung pruefen
-			if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-			   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-			{
-				$error = true;
-				$return = false;
-				$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-			}
-			if(!$error)
-			{
-				$akte = new akte();
-
-				if($akte->delete($_POST['akte_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $akte->errormsg;
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe'.$_POST['akte_id'];
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savebuchung') // ***** KONTO *****
-	{
-		//Speichert eine Buchung
-		if(isset($_POST['buchungsnr']) && is_numeric($_POST['buchungsnr']))
-		{
-			$buchung = new konto();
-
-			if($buchung->load($_POST['buchungsnr']))
-			{
-				if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-				}
-				else
-				{
-					$buchung->betrag = $_POST['betrag'];
-					$buchung->buchungsdatum = $_POST['buchungsdatum'];
-					$buchung->buchungstext = $_POST['buchungstext'];
-					$buchung->mahnspanne = $_POST['mahnspanne'];
-					$buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz'];
-					$buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
-					$buchung->studiengang_kz = $_POST['studiengang_kz'];
-					$buchung->credit_points = $_POST['credit_points'];
-					$buchung->new = false;
-					$buchung->updateamum = date('Y-m-d H:i:s');
-					$buchung->updatevon = $user;
-					$buchung->anmerkung = $_POST['anmerkung'];
-
-					if($buchung->save())
-					{
-						$return = true;
-					}
-					else
-					{
-						$return = false;
-						$errormsg = 'Fehler beim Speichern:'.$buchung->errormsg;
-					}
-				}
-			}
-			else
-			{
-				$errormsg = 'Buchung wurde nicht gefunden:'.$_POST['buchungsnr'];
-				$return = false;
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe'.$_POST['buchungsnr'];
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savegegenbuchung')
-	{
-		//Speichert eine Buchung
-		if(isset($_POST['buchungsnr']))
-		{
-			$bnr_arr = explode(';',$_POST['buchungsnr']);
-			$gegenbuchungsdatum = filter_input(INPUT_POST, "gegenbuchungsdatum");
-			if(strlen($gegenbuchungsdatum) != 0)
-			{
-				$gegenbuchungsdatum = date("Y-m-d", strtotime($gegenbuchungsdatum));
-			}
-			else
-			{
-				$gegenbuchungsdatum = date('Y-m-d');
-			}
-
-			$errormsg='';
-			foreach ($bnr_arr as $buchungsnr)
-			{
-				if(is_numeric($buchungsnr))
-				{
-					$buchung = new konto();
-
-					if($buchung->load($buchungsnr))
-					{
-						//Berechtigung pruefen
-						if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
-						   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
-						{
-							$error = true;
-							$return = false;
-							$errormsg = "\nSie haben keine Schreibrechte fuer diese Buchung";
-						}
-						else
-						{
-							if($buchung->buchungsnr_verweis=='')
-							{
-								$kto = new konto();
-								//$buchung->betrag*(-1);
-								$buchung->betrag = $kto->getDifferenz($buchungsnr);
-								$buchung->buchungsdatum = $gegenbuchungsdatum;
-								$buchung->mahnspanne = '0';
-								$buchung->buchungsnr_verweis = $buchung->buchungsnr;
-								$buchung->new = true;
-								$buchung->insertamum = date('Y-m-d H:i:s');
-								$buchung->insertvon = $user;
-								$buchung->anmerkung = '';
-
-								if($buchung->save())
-								{
-									//$data = $buchung->buchungsnr;
-									$return = true;
-								}
-								else
-								{
-									$return = false;
-									$errormsg .= "\n".'Fehler beim Speichern:'.$buchung->errormsg;
-								}
-							}
-							else
-							{
-								$return = false;
-								$errormsg .= "\n".'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden';
-							}
-						}
-					}
-					else
-					{
-						$errormsg .= "\n".'Buchung wurde nicht gefunden';
-						$return = false;
-					}
-				}
-				if($errormsg!='')
-				{
-					$return = false;
-				}
-				else
-				{
-					$return = true;
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletebuchung')
-	{
-		//Loescht eine Buchung
-		if(isset($_POST['buchungsnr']) && is_numeric($_POST['buchungsnr']))
-		{
-			$buchung = new konto();
-
-			if($buchung->load($_POST['buchungsnr']))
-			{
-				if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-				}
-				else
-				{
-					if($buchung->delete($_POST['buchungsnr']))
-					{
-						$return = true;
-					}
-					else
-					{
-						$errormsg = $buchung->errormsg;
-						$return = false;
-					}
-				}
-			}
-			else
-			{
-				$errormsg = 'Buchung wurde nicht gefunden';
-				$return = false;
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='neuebuchung')
-	{
-		//Speichert eine neue Buchung
-		//Gleichzeitiges speichern mehrerer Personen ist moeglich
-		//Personen werden durch ';' getrennt
-		$person_ids = explode(';',$_POST['person_ids']);
-		$errormsg = '';
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-		else
-		{
-			foreach ($person_ids as $person_id)
-			{
-				if($person_id!='')
-				{
-					$buchung = new konto();
-					$buchung->person_id = $person_id;
-					$buchung->studiengang_kz = $_POST['studiengang_kz'];
-					$buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
-					$buchung->buchungsnr_verweis='';
-					$buchung->betrag = $_POST['betrag'];
-					$buchung->buchungsdatum = $_POST['buchungsdatum'];
-					$buchung->buchungstext = $_POST['buchungstext'];
-					$buchung->mahnspanne = $_POST['mahnspanne'];
-					$buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz'];
-					$buchung->credit_points = $_POST["credit_points"];
-					$buchung->insertamum = date('Y-m-d H:i:s');
-					$buchung->insertvon = $user;
-					$buchung->anmerkung = $_POST['anmerkung'];
-					$buchung->new = true;
-
-					if($buchung->save())
-					{
-						$data = $buchung->buchungsnr;
-					}
-					else
-					{
-						$errormsg .= "Fehler beim Speichern: $buchung->errormsg\n";
-					}
-				}
-			}
-		}
-		if($errormsg=='')
-			$return = true;
-		else
-			$return = false;
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentadd')
-	{
-		//Speichert die Zuordnung von Dokumenten zu einem Prestudent
-		//Gleichzeitiges zuteilen mehrerer Dokumente auf einmal ist moeglich
-		//Dokumente werden durch ';' getrennt uebergeben
-
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-		else
-		{
-			$dokumente = explode(';',$_POST['dokumente']);
-			$errormsg = '';
-			foreach ($dokumente as $dokument_kurzbz)
-			{
-				if($dokument_kurzbz!='')
-				{
-					$dok = new dokument();
-					$dok->dokument_kurzbz = $dokument_kurzbz;
-					$dok->prestudent_id = $_POST['prestudent_id'];
-					$dok->mitarbeiter_uid = $user;
-					$dok->datum = date('Y-m-d');
-					$dok->insertamum = date('Y-m-d H:i:s');
-					$dok->insertvon = $user;
-					$dok->new = true;
-
-					if(!$dok->save())
-					{
-						$errormsg .= "Fehler bei $dokument_kurzbz: $dok->errormsg\n";
-					}
-				}
-			}
-			if($errormsg=='')
-				$return = true;
-			else
-				$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentDetailSave')
-	{
-		//Speichert die Zuordnung von Dokumenten zu einem Prestudent
-		//Gleichzeitiges zuteilen mehrerer Dokumente auf einmal ist moeglich
-		//Dokumente werden durch ';' getrennt uebergeben
-
-		if(!$rechte->isBerechtigt('assistenz',null,'suid') &&
-		   !$rechte->isBerechtigt('admin',null, 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-		else
-		{
-			$akte_id = $_POST['akte_id'];
-			$errormsg = '';
-			$akte = new akte();
-			if($akte->load($akte_id))
-			{
-				$akte->new=false;
-				$akte->anmerkung_intern = $_POST['anmerkung_intern'];
-				$akte->titel_intern = $_POST['titel_intern'];
-				$akte->dokument_kurzbz = $_POST['dokument_kurzbz'];
-				$akte->nachgereicht_am = $_POST['nachgereicht_am'];
-				$akte->updateamum = date('Y-m-d H:i:s');
-				$akte->updatevon = $user;
-
-				if(!$akte->save())
-				{
-					$errormsg='Speichern fehlgeschlagen:'.$akte->errormsg;
-				}
-			}
-
-			if($errormsg=='')
-				$return = true;
-			else
-				$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentDeleteDokument')
-	{
-		$prestudent_id = $_POST['prestudent_id'];
-		$prestudent = new prestudent();
-		if($prestudent->load($prestudent_id))
-		{
-			$studiengang = new studiengang();
-			$studiengang->load($prestudent->studiengang_kz);
-
-			if(!$rechte->isBerechtigt('assistenz',$studiengang->oe_kurzbz,'suid') &&
-			   !$rechte->isBerechtigt('admin',$studiengang->oe_kurzbz, 'suid'))
-			{
-				$error = true;
-				$return = false;
-				$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-			}
-			else
-			{
-
-				$akte_id = $_POST['akte_id'];
-				$errormsg = '';
-				$akte = new akte();
-				if($akte->load($akte_id))
-				{
-					if($akte->person_id==$prestudent->person_id)
-					{
-						if($akte->dms_id!='')
-						{
-							$dms = new dms();
-							if($dms->load($akte->dms_id))
-							{
-								if($akte->delete($akte_id))
-								{
-									// Eintrag im DMS loeschen
-									if(!$dms->deleteDms($akte->dms_id))
-									{
-										$error=true;
-										$errormsg='Fehler beim Loeschen des Dokuments';
-									}
-									else
-									{
-										// Log schreiben
-										$logdata_dms = (array)$dms;
-										$logdata = var_export($logdata_dms, true);
-										$log = new log();
-										$log->executetime = date('Y-m-d H:i:s');
-										$log->mitarbeiter_uid = $user;
-										$log->beschreibung = "Löschen der DMS_ID ".$akte->dms_id;
-										$log->sql = 'LogData:'.$logdata;
-										$log->sqlundo = '';
-										$log->save(true);
-									}
-									// Log schreiben
-									$logdata_akte = (array)$akte;
-									$logdata = var_export($logdata_akte, true);
-									$log = new log();
-									$log->executetime = date('Y-m-d H:i:s');
-									$log->mitarbeiter_uid = $user;
-									$log->beschreibung = "Löschen der Akte '".$akte->dokument_kurzbz."' ID '".$akte_id."'";
-									$log->sql = 'DELETE FROM public.tbl_akte WHERE akte_id='.$db->db_add_param($akte_id, FHC_INTEGER).'; LogData:'.$logdata;
-									$log->sqlundo = '';
-									$log->save(true);
-								}
-								else
-								{
-									$error=true;
-									$errormsg='Fehler beim Loeschen der Akte';
-								}
-							}
-							else
-							{
-								$error=true;
-								$errormsg='Fehler beim Laden des Dokuments';
-							}
-						}
-						// Wenn kein Dokument im DMS vorhanden ist, aber die akte auf "wird nachgereicht" gesetzt ist
-						// darf das Dokument auch gelöscht werden
-						elseif($akte->nachgereicht === true && $akte->inhalt == '')
-						{
-							if($akte->delete($akte_id))
-							{
-								// Log schreiben
-								$logdata_akte = (array)$akte;
-								$logdata = var_export($logdata_akte, true);
-								$log = new log();
-								$log->executetime = date('Y-m-d H:i:s');
-								$log->mitarbeiter_uid = $user;
-								$log->beschreibung = "Löschen der Nachreichung der Akte '".$akte->dokument_kurzbz."' ID '".$akte_id."'";
-								$log->sql = 'DELETE FROM public.tbl_akte WHERE akte_id='.$db->db_add_param($akte_id, FHC_INTEGER).'; LogData:'.$logdata;
-								$log->sqlundo = '';
-								$log->save(true);
-							}
-							else
-							{
-								$error=true;
-								$errormsg='Fehler beim Loeschen der Akte';
-							}
-						}
-						else
-						{
-							$error=true;
-							$errormsg='Dieses Dokument darf hier nicht geloescht werden';
-						}
-					}
-					else
-					{
-						$error=true;
-						$errormsg='Akte und Prestudent passen nicht zusammen';
-					}
-				}
-
-				if($errormsg=='')
-					$return = true;
-				else
-					$return = false;
-			}
-		}
-		else
-		{
-			$errormsg='Prestudent konnte nicht geladen werden';
-			$error=true;
-			$return=false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentdel')
-	{
-		//Loescht die Zuordnung von Dokumenten zu einem Prestudent
-		//Gleichzeitiges loeschen mehrerer Dokumente auf einmal ist moeglich
-		//Dokumente werden durch ';' getrennt uebergeben
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
-		}
-		else
-		{
-			$dokumente = explode(';',$_POST['dokumente']);
-			$errormsg = '';
-			foreach ($dokumente as $dokument_kurzbz)
-			{
-				if($dokument_kurzbz!='')
-				{
-					$dok = new dokument();
-					if($dok->load($dokument_kurzbz, $_POST['prestudent_id']))
-					{
-						if($dok->mitarbeiter_uid==$user || $rechte->isBerechtigt('student/dokumente',$_POST['studiengang_kz'], 'suid'))
-						{
-							if(!$dok->delete($dokument_kurzbz, $_POST['prestudent_id']))
-							{
-								$errormsg .= "Fehler bei $dokument_kurzbz: $dok->errormsg\n";
-							}
-						}
-						else
-						{
-							$errormsg.="Fehler bei $dokument_kurzbz: Loeschen nur durch $dok->mitarbeiter_uid moeglich\n";
-						}
-					}
-					else
-					{
-						$errormsg.="Dokumentenzuteilung existiert nicht: $dokument_kurzbz\n";
-					}
-				}
-			}
-			if($errormsg=='')
-				$return = true;
-			else
-				$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletebetriebsmittel')
-	{
-		//Loescht ein Betriebsmittel
-		//Wenn studiengang_kz uebergeben wird, dann handelt es sich um die Betriebsmittel eines Studenten
-		//Wenn studiengang_kz='' dann werden Mitarbeiterrechte benoetigt
-		//ToDo: hier sollte nicht der Studiengang uebergeben werden sonder aus der DB ermittelt werden ob es
-		//ein Student oder Mitarbeiter ist
-		if(($_POST['studiengang_kz']!='' &&
-			!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-			!$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid') &&
-			!$rechte->isBerechtigt('basis/betriebsmittel',$_POST['studiengang_kz'], 'suid')
-		   ) ||
-		   ($_POST['studiengang_kz']=='' &&
-			!$rechte->isBerechtigt('admin', null, 'suid') &&
-			!$rechte->isBerechtigt('mitarbeiter', null, 'suid') &&
-			!$rechte->isBerechtigt('basis/betriebsmittel', null, 'suid')
-		   ))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			if(isset($_POST['betriebsmittelperson_id']) && is_numeric($_POST['betriebsmittelperson_id']))
-			{
-				$btm = new betriebsmittelperson();
-
-				if($btm->delete($_POST['betriebsmittelperson_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $btm->errormsg;
-					$return = false;
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg  = 'Fehlerhafte Parameteruebergabe';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savebetriebsmittel')
-	{
-		//Speichert eine Betriebsmittelzuordnung
-		//Wenn studiengang_kz uebergeben wird, dann handelt es sich um die Betriebsmittel eines Studenten
-		//Wenn studiengang_kz='' dann werden Mitarbeiterrechte benoetigt
-		//ToDo: hier sollte nicht der Studiengang uebergeben werden sonder aus der DB ermittelt werden ob es
-		//ein Student oder Mitarbeiter ist
-		if(($_POST['studiengang_kz']!='' &&
-			!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-			!$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid') &&
-			!$rechte->isBerechtigt('basis/betriebsmittel',$_POST['studiengang_kz'], 'suid')
-		   ) ||
-		   ($_POST['studiengang_kz']=='' &&
-			!$rechte->isBerechtigt('admin', null, 'suid') &&
-			!$rechte->isBerechtigt('mitarbeiter', null, 'suid') &&
-			!$rechte->isBerechtigt('basis/betriebsmittel', null, 'suid')
-		   ))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$betriebsmittel_id = $_POST['betriebsmittel_id'];
-			$bm = new betriebsmittel();
-
-			// Wenn es kein vorhandenes Inventar ist, dann neu anlegen
-			if($_POST['betriebsmitteltyp']!='Inventar')
-			{
-				if($_POST['betriebsmitteltyp']=='Zutrittskarte')
-					$_POST['nummer']=$bm->transform_kartennummer($_POST['nummer']);
-
-				//Das speichern von Zutrittskarten ohne Nummern verhindern
-				if($_POST['betriebsmitteltyp']=='Zutrittskarte' && $_POST['nummer']=='')
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz';
-				}
-				else
-				{
-					//Nachschauen ob dieses Betriebsmittel schon existiert
-					if($bm->getBetriebsmittel($_POST['betriebsmitteltyp'],$_POST['nummer']))
-					{
-						if(count($bm->result)>0)
-						{
-							//Wenn die Nummer gleich bleibt dann die alte ID verwenden da es
-							//unterschiedliche Schluessel gibt die die gleiche nummer haben ?!?
-							if($_POST['nummer']==$_POST['nummerold'])
-							{
-								$betriebsmittel_id = $_POST['betriebsmittel_id'];
-							}
-							else
-								$betriebsmittel_id = $bm->result[0]->betriebsmittel_id;
-							//Wenn ein Eintrag gefunden wurde, dann wird die Beschreibung aktualisiert
-							if($bm->load($betriebsmittel_id))
-							{
-								$bm->beschreibung = $_POST['beschreibung'];
-								$bm->nummer = $_POST['nummer'];
-								$bm->nummer2 = $_POST['nummer2'];
-								if(!$bm->save(false))
-								{
-									$return = false;
-									$error = true;
-									$errormsg = 'Fehler beim Speichern des Betriebsmittels';
-								}
-							}
-							else
-							{
-								$return = false;
-								$error = true;
-								$errormsg = 'Gefundener Eintrag konnte nicht geladen werden!?!?';
-							}
-						}
-						else
-						{
-							//Wenn kein Eintrag gefunden wurde, dann wird ein neuer Eintrag angelegt
-							$bm->betriebsmitteltyp = $_POST['betriebsmitteltyp'];
-							$bm->nummer = $_POST['nummer'];
-							$bm->nummer2 = $_POST['nummer2'];
-							$bm->beschreibung = $_POST['beschreibung'];
-							$bm->reservieren = false;
-							$bm->ort_kurzbz = null;
-							$bm->insertamum = date('Y-m-d H:i:s');
-							$bm->insertvon = $user;
-
-							if($bm->save(true))
-							{
-								$betriebsmittel_id = $bm->betriebsmittel_id;
-							}
-							else
-							{
-								$error = true;
-								$return = false;
-								$errormsg = 'Fehler beim Anlegen des Betriebsmittels';
-							}
-						}
-
-						if($_POST['betriebsmitteltyp']=='Zutrittskarte')
-						{
-							//Bei Zutrittskarten schauen ob diese schon vergeben sind
-							$qry = "SELECT vorname, nachname, uid
-									FROM public.vw_betriebsmittelperson
-									WHERE betriebsmitteltyp='Zutrittskarte' AND
-										nummer='".$db->db_escape($_POST['nummer'])."'::varchar AND
-										person_id<>".$db->db_add_param($_POST['person_id'], FHC_INTEGER)." AND
-										retouram is null";
-							if($result_bmp = $db->db_query($qry))
-							{
-								if($db->db_num_rows($result_bmp)>0)
-								{
-									$row_bmp = $db->db_fetch_object($result_bmp);
-									$error = true;
-									$return = false;
-									$errormsg = "Diese Zutrittskarte ist bereits ausgegeben an: $row_bmp->vorname $row_bmp->nachname ($row_bmp->uid)";
-								}
-							}
-							else
-							{
-								$error = true;
-								$return = false;
-								$errormsg = 'Fehler beim Laden der Zutrittskarte';
-							}
-						}
-					}
-				}
-			}
-
-			if(!$error)
-			{
-				//Zuordnung Betriebsmittel-Person anlegen
-				$bmp = new betriebsmittelperson();
-				if($_POST['neu']!='true')
-				{
-					if($bmp->load($_POST['betriebsmittelperson_id']))
-					{
-						$bmp->updateamum = date('Y-m-d H:i:s');
-						$bmp->updatevon = $user;
-						$bmp->betriebsmittelperson_id = $_POST['betriebsmittelperson_id'];
-						$bmp->new = false;
-					}
-					else
-					{
-						$error = true;
-						$errormsg = "Zuordnung unbekannt:".$_POST['betriebsmittelperson_id'];
-						$return = false;
-					}
-				}
-				else
-				{
-					$bmp->insertamum = date('Y-m-d H:i:s');
-					$bmp->insertvon = $user;
-					$bmp->new = true;
-				}
-
-				if(!$error)
-				{
-					$bmp->person_id = $_POST['person_id'];
-					$bmp->betriebsmittel_id=$betriebsmittel_id;
-					$bmp->anmerkung = $_POST['anmerkung'];
-					$bmp->kaution = trim(str_replace(',','.',$_POST['kaution']));
-					$bmp->ausgegebenam = $_POST['ausgegebenam'];
-					$bmp->retouram = $_POST['retouram'];
-					if($bmp->new)
-						$bmp->uid = $_POST['uid'];
-
-					if($bmp->save())
-					{
-						$return = true;
-						$data = $bmp->betriebsmittelperson_id;
-					}
-					else
-					{
-						$return = false;
-						$errormsg = $bmp->errormsg;
-					}
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletebisio')
-	{
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			//Loescht einen BisIO Eintrag
-			if(isset($_POST['bisio_id']) && is_numeric($_POST['bisio_id']))
-			{
-				$bisio = new bisio();
-
-				if($bisio->delete($_POST['bisio_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $bisio->errormsg;
-					$return = false;
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg  = 'Fehlerhafte Parameteruebergabe';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savebisio')
-	{
-		//Speichert einen BisIO Eintrag
-		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
-		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
-		{
-			$error = true;
-			$return = false;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-
-			$bisio = new bisio();
-
-			if($_POST['neu']=='true')
-			{
-				$bisio->insertamum = date('Y-m-d H:i:s');
-				$bisio->insertvon = $user;
-				$bisio->new = true;
-			}
-			else
-			{
-				if($bisio->load($_POST['bisio_id']))
-					$bisio->new = false;
-				else
-				{
-					$error = true;
-					$errormsg = $bisio->errormsg;
-					$return = false;
-				}
-			}
-
-			$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
-			$bisio->mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
-			$bisio->nation_code = $_POST['nation_code'];
-			$bisio->von = $_POST['von'];
-			$bisio->bis = $_POST['bis'];
-			$bisio->student_uid = $_POST['student_uid'];
-			$bisio->lehreinheit_id = $_POST['lehreinheit_id'];
-			$bisio->ort = $_POST['ort'];
-			$bisio->universitaet = $_POST['universitaet'];
-			$bisio->ects_erworben = $_POST['ects_erworben'];
-			$bisio->ects_angerechnet = $_POST['ects_angerechnet'];
-			$bisio->updateamum = date('Y-m-d H:i:s');
-			$bisio->updatevon = $user;
-
-			if(!$error)
-			{
-				if($bisio->save())
-				{
-					$return = true;
-					$data = $bisio->bisio_id;
-				}
-				else
-				{
-					$errormsg = $bisio->errormsg;
-					$return = false;
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savebisiozweck')
-	{
-		$bisio = new bisio();
-		if($bisio->load($_POST['bisio_id']))
-		{
-			$student = new student();
-			if($student->load($bisio->student_uid))
-			{
-
-				//Speichert einen BisIO Eintrag
-				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-
-					$bisio = new bisio();
-
-					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
-					$bisio->zweck_code = $_POST['zweck_code'];
-
-					if(!$error)
-					{
-						if($bisio->saveZweck())
-						{
-							$return = true;
-							$data = $bisio->bisio_id;
-						}
-						else
-						{
-							$errormsg = $bisio->errormsg;
-							$return = false;
-						}
-					}
-				}
-			}
-			else
-			{
-				$errormsg = $student->errormsg;
-				$return = false;
-			}
-		}
-		else
-		{
-			$errormsg = $bisio->errormsg;
-			$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletebisiozweck')
-	{
-		$bisio = new bisio();
-		if($bisio->load($_POST['bisio_id']))
-		{
-			$student = new student();
-			if($student->load($bisio->student_uid))
-			{
-				//Speichert einen BisIO Eintrag
-				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-
-					$bisio = new bisio();
-
-					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
-					$bisio->zweck_code = $_POST['zweck_code'];
-
-					if(!$error)
-					{
-						if($bisio->deleteZweck())
-						{
-							$return = true;
-						}
-						else
-						{
-							$errormsg = $bisio->errormsg;
-							$return = false;
-						}
-					}
-				}
-			}
-			else
-			{
-				$errormsg = $student->errormsg;
-				$return = false;
-			}
-		}
-		else
-		{
-			$errormsg = $bisio->errormsg;
-			$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savebisioaufenthaltfoerderung')
-	{
-		$bisio = new bisio();
-		if($bisio->load($_POST['bisio_id']))
-		{
-			$student = new student();
-			if($student->load($bisio->student_uid))
-			{
-
-				//Speichert einen BisIO Eintrag
-				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-
-					$bisio = new bisio();
-
-					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
-					$bisio->aufenthaltfoerderung_code = $_POST['aufenthaltfoerderung_code'];
-
-					if(!$error)
-					{
-						if($bisio->saveAufenthaltFoerderung())
-						{
-							$return = true;
-							$data = $bisio->bisio_id;
-						}
-						else
-						{
-							$errormsg = $bisio->errormsg;
-							$return = false;
-						}
-					}
-				}
-			}
-			else
-			{
-				$errormsg = $student->errormsg;
-				$return = false;
-			}
-		}
-		else
-		{
-			$errormsg = $bisio->errormsg;
-			$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletebisioaufenthaltfoerderung')
-	{
-		$bisio = new bisio();
-		if($bisio->load($_POST['bisio_id']))
-		{
-			$student = new student();
-			if($student->load($bisio->student_uid))
-			{
-				//Speichert einen BisIO Eintrag
-				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
-				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-
-					$bisio = new bisio();
-
-					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
-					$bisio->aufenthaltfoerderung_code = $_POST['aufenthaltfoerderung_code'];
-
-					if(!$error)
-					{
-						if($bisio->deleteAufenthaltFoerderung())
-						{
-							$return = true;
-						}
-						else
-						{
-							$errormsg = $bisio->errormsg;
-							$return = false;
-						}
-					}
-				}
-			}
-			else
-			{
-				$errormsg = $student->errormsg;
-				$return = false;
-			}
-		}
-		else
-		{
-			$errormsg = $bisio->errormsg;
-			$return = false;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='getnotenotenschluessel')
-	{
-		if(!$rechte->isBerechtigt('admin', null, 's') && !$rechte->isBerechtigt('assistenz', null, 's') &&
-		   !$rechte->isBerechtigt('student/noten', null, 's'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$punkte=$_POST['punkte'];
-			if(is_numeric($punkte))
-			{
-				$lehrveranstaltung_id=$_POST['lehrveranstaltung_id'];
-				$studiensemester_kurzbz=$semester_aktuell;
-
-				$notenschluessel = new notenschluessel();
-				if(($note = $notenschluessel->getNote($punkte, $lehrveranstaltung_id, $studiensemester_kurzbz))!==false)
-				{
-					$return = true;
-					$error = false;
-					$data = $note;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg=$notenschluessel->errormsg;
-				}
-			}
-			else
-			{
-				$return = true;
-				$error = false;
-				$data = '';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savenote')
-	{
-		//Speichert einen Noteneintrag
-
-		$noten = new zeugnisnote();
-		$lehrveranstaltung_id = filter_input(INPUT_POST, 'lehrveranstaltung_id');
-		$student_uid = filter_input(INPUT_POST, 'student_uid');
-		$studiensemester_kurzbz = filter_input(INPUT_POST, 'studiensemester_kurzbz');
-
-		if(!is_null($lehrveranstaltung_id) && !is_null($student_uid) && !is_null($studiensemester_kurzbz))
-		{
-			//Berechtigung pruefen
-			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($student_uid);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$stg_std = $row->studiengang_kz;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln des Studenten';
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln des Studenten';
-			}
-
-			if(!$error)
-			{
-				$lva = new lehrveranstaltung($lehrveranstaltung_id);
-
-				if(!$rechte->isBerechtigtMultipleOe('admin', $lva->getAllOe(), 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
-				   !$rechte->isBerechtigtMultipleOe('assistenz', $lva->getAllOe(), 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-
-					if($noten->load($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz))
-					{
-						$noten->new = false;
-						$noten->updateamum = date('Y-m-d H:i:s');
-						$noten->updatevon = $user;
-						$log = new log();
-						$log->executetime = date('Y-m-d H:i:s');
-						$log->mitarbeiter_uid = $user;
-						$log->beschreibung = "Ändern der Note ".$noten->note." bei ".$noten->student_uid;
-						$log->sql = 'UPDATE lehre.tbl_zeugnisnote SET '.
-								'note='.$db->db_add_param($noten->note).', '.
-								'punkte='.$db->db_add_param($noten->punkte).','.
-								'uebernahmedatum='.$db->db_add_param($noten->uebernahmedatum).', '.
-								'benotungsdatum='.$db->db_add_param($noten->benotungsdatum).', '.
-								'bemerkung='.$db->db_add_param($noten->bemerkung).', '.
-								'updateamum= '.$db->db_add_param($noten->updateamum).', '.
-								'updatevon='.$db->db_add_param($noten->updatevon).' '.
-								'WHERE lehrveranstaltung_id='.$db->db_add_param($noten->lehrveranstaltung_id, FHC_INTEGER).' '.
-								'AND student_uid='.$db->db_add_param($noten->student_uid).' '.
-								'AND studiensemester_kurzbz='.$db->db_add_param($noten->studiensemester_kurzbz).';';
-						$log->sqlundo = $noten->getUndo('update');
-						$log->save(true);
-					}
-					else
-					{
-						$noten->new = true;
-						$noten->insertamum = date('Y-m-d H:i:s');
-						$noten->insertvon = $user;
-					}
-
-					$noten->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
-					$noten->student_uid = $_POST['student_uid'];
-					$noten->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
-					$noten->benotungsdatum = date('Y-m-d H:i:s');
-					$noten->note = $_POST['note'];
-					if(isset($_POST['punkte']))
-						$noten->punkte=str_replace(',','.',$_POST['punkte']);
-
-					if($noten->save())
-					{
-						$return = true;
-					}
-					else
-					{
-						$errormsg = $noten->errormsg;
-						$return = false;
-					}
-
-					if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $return == true && $noten->new == true)
-					{
-						NotePruefungAnlegen($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $noten->note);
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='movenote')
-	{
-		//Speichert einen LVGesamtNoten Eintrag in die Tbl Zeugnisnote
-		//Die Daten werden per POST uebermittelt. Es wird ein Feld Anzahl mituebergeben
-		//mit der Anzahl der Felder. Die Felder sind durchnummeriert zB lehreinheit_id_0, lehreinheit_id_1, ...
-		$errormsg = '';
-		$ueberschreibbar=true;
-		$nueberschreibbarbez=array();
-
-		for($i=0;$i<$_POST['anzahl'];$i++)
-		{
-			$lvgesamtnote = new lvgesamtnote();
-			$zeugnisnote = new zeugnisnote();
-			$noten_ueberschreibbar = array();
-			$noten_bezeichnung = array();
-			$note_obj = new note();
-			$note_obj->getAll();
-			foreach($note_obj->result as $row)
-			{
-				$noten_ueberschreibbar[$row->note] = $row->lkt_ueberschreibbar;
-				$noten_bezeichnung[$row->note] = $row->bezeichnung;
-			}
-
-			//Berechtigung pruefen
-			$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($_POST['lehrveranstaltung_id_'.$i], FHC_INTEGER);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$stg_lva = $row->studiengang_kz;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln der LVA';
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln der LVA';
-			}
-
-			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($_POST['student_uid_'.$i]);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$stg_std = $row->studiengang_kz;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln des Studenten';
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln des Studenten';
-			}
-
-			if(!$error)
-			{
-				if(!$rechte->isBerechtigt('student/noten', $stg_lva, 'suid') && !$rechte->isBerechtigt('student/noten', $stg_std, 'suid'))
-				{
-					$return = false;
-					$error = true;
-					$errormsg .= 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-					if($lvgesamtnote->load($_POST['lehrveranstaltung_id_'.$i], $_POST['student_uid_'.$i], $_POST['studiensemester_kurzbz_'.$i]))
-					{
-						if($zeugnisnote->load($_POST['lehrveranstaltung_id_'.$i], $_POST['student_uid_'.$i], $_POST['studiensemester_kurzbz_'.$i]))
-						{
-							$zeugnisnote->new = false;
-							$zeugnisnote->updateamum = date('Y-m-d H:i:s');
-							$zeugnisnote->updatevon = $user;
-							// Noten wie "angerechnet", "nicht erforderlich" werden nicht ueberschrieben
-							if(isset($zeugnisnote->note) && array_key_exists($zeugnisnote->note, $noten_ueberschreibbar) && $noten_ueberschreibbar[$zeugnisnote->note] === false)
-							{
-								$notenbez = '"'.$noten_bezeichnung[$zeugnisnote->note].'"';
-								if (!in_array($notenbez, $nueberschreibbarbez))
-									$nueberschreibbarbez[] = $notenbez;
-								$ueberschreibbar = false;
-								continue;
-							}
-						}
-						else
-						{
-							$zeugnisnote->new = true;
-							$zeugnisnote->insertamum = date('Y-m-d H:i:s');
-							$zeugnisnote->insertvon = $user;
-							$zeugnisnote->lehrveranstaltung_id = $_POST['lehrveranstaltung_id_'.$i];
-							$zeugnisnote->student_uid = $_POST['student_uid_'.$i];
-							$zeugnisnote->studiensemester_kurzbz = $_POST['studiensemester_kurzbz_'.$i];
-						}
-
-						$zeugnisnote->note = $lvgesamtnote->note;
-						$zeugnisnote->punkte = $lvgesamtnote->punkte;
-						$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
-						$zeugnisnote->benotungsdatum = $lvgesamtnote->benotungsdatum;
-						$zeugnisnote->bemerkung = $lvgesamtnote->bemerkung;
-
-						if(!$zeugnisnote->save())
-						{
-							$errormsg .= "\n".$zeugnisnote->errormsg;
-						}
-						else
-						{
-							if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $zeugnisnote->new == true)
-							{
-								NotePruefungAnlegen($zeugnisnote->studiensemester_kurzbz, $zeugnisnote->student_uid, $zeugnisnote->lehrveranstaltung_id, $zeugnisnote->note);
-							}
-						}
-					}
-					else
-					{
-						$errormsg .= "\nLvGesamtNote wurde nicht gefunden";
-					}
-				}
-			}
-		}
-		if(!$ueberschreibbar)
-		{
-			$errormsg.="\nNote(n) ".implode(', ', $nueberschreibbarbez)." waren nicht ueberschreibbar";
-		}
-
-		if($errormsg=='')
-			$return = true;
-		else
-			$return = false;
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='importnoten')
-	{
-		//Importiert die Noten einer Lehrveranstaltung
-		//als Parameter wird die Matrikelnummer und die Note uebergeben
-		//Die Felder sind durchnummeriert zB matrikelnummer_0, matrikelnummer_1, ...
-		//Die Anzahl der Gesamten Daten wird auch als Parameter uebergeben
-		$errormsg = '';
-		$ueberschreibbar=true;
-		$nueberschreibbarbez=array();
-
-		$noten_anmerkung_arr=array();
-		$noten_ueberschreibbar = array();
-		$noten_bezeichnung = array();
-		$note_obj = new note();
-		$note_obj->getAll();
-		foreach($note_obj->result as $row)
-		{
-			$noten_ueberschreibbar[$row->note] = $row->lkt_ueberschreibbar;
-			$noten_bezeichnung[$row->note] = $row->bezeichnung;
-			$noten_anmerkung_arr[$row->anmerkung] = $row->note;
-		}
-
-		for($i=0;$i<$_POST['anzahl'];$i++)
-		{
-			if($_POST['matrikelnummer_'.$i]!='')
-			{
-				$zeugnisnote = new zeugnisnote();
-				$error = false;
-				if(!is_numeric(trim($_POST['matrikelnummer_'.$i])))
-				{
-					$error = true;
-					$errormsg = "\nMatrikelnummer ist ungueltig: ".$_POST['matrikelnummer_'.$i];
-				}
-				if((isset($_POST['note_'.$i]) && !is_numeric($_POST['note_'.$i]) && !isset($noten_anmerkung_arr[$_POST['note_'.$i]])))
-				{
-					$error = true;
-					$errormsg = "\nNote ist ungueltig: ".$_POST['note_'.$i];
-				}
-				if(!$error)
-				{
-					$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE trim(matrikelnr)=".$db->db_add_param(trim($_POST['matrikelnummer_'.$i]));
-					if($result = $db->db_query($qry))
-					{
-						if($row = $db->db_fetch_object($result))
-						{
-							$uid = $row->student_uid;
-							$stg_std = $row->studiengang_kz;
-						}
-						else
-						{
-							$error = true;
-							$errormsg.="\nMatrikelnummer ".$_POST['matrikelnummer_'.$i]." wurde nicht gefunden";
-						}
-					}
-					else
-					{
-						$error = true;
-						$errormsg.="\nFehler beim Ermitteln der UID";
-					}
-
-					//Berechtigung pruefen
-					$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($_POST['lehrveranstaltung_id'], FHC_INTEGER);
-					if($result = $db->db_query($qry))
-					{
-						if($row = $db->db_fetch_object($result))
-						{
-							$stg_lva = $row->studiengang_kz;
-						}
-						else
-						{
-							$return = false;
-							$error = true;
-							$errormsg = 'Fehler beim Ermitteln der LVA';
-						}
-					}
-					else
-					{
-						$return = false;
-						$error = true;
-						$errormsg = 'Fehler beim Ermitteln der LVA';
-					}
-
-					if(!$error)
-					{
-						if(!$rechte->isBerechtigt('admin', $stg_lva, 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
-						   !$rechte->isBerechtigt('assistenz', $stg_lva, 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
-						{
-							$return = false;
-							$error = true;
-							$errormsg .= 'Sie haben keine Berechtigung';
-						}
-						else
-						{
-							if($zeugnisnote->load($_POST['lehrveranstaltung_id'], $uid, $semester_aktuell))
-							{
-								$zeugnisnote->new = false;
-								$zeugnisnote->updateamum = date('Y-m-d H:i:s');
-								$zeugnisnote->updatevon = $user;
-								// Noten wie "angerechnet", "nicht erforderlich" werden nicht ueberschrieben
-								if(isset($zeugnisnote->note) && array_key_exists($zeugnisnote->note, $noten_ueberschreibbar) && $noten_ueberschreibbar[$zeugnisnote->note] === false)
-								{
-									$notenbez = '"'.$noten_bezeichnung[$zeugnisnote->note].'"';
-									if (!in_array($notenbez, $nueberschreibbarbez))
-										$nueberschreibbarbez[] = $notenbez;
-									$ueberschreibbar = false;
-									continue;
-								}
-							}
-							else
-							{
-								$zeugnisnote->new = true;
-								$zeugnisnote->insertamum = date('Y-m-d H:i:s');
-								$zeugnisnote->insertvon = $user;
-								$zeugnisnote->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
-								$zeugnisnote->student_uid = $uid;
-								$zeugnisnote->studiensemester_kurzbz = $semester_aktuell;
-							}
-
-							if(isset($_POST['note_'.$i]))
-							{
-								$zeugnisnote->note = $_POST['note_'.$i];
-								$zeugnisnote->punkte = null;
-								// Wenn es nicht numerisch ist, dann nachsehen ob es eine anmerkung gibt die so heisst
-								// zB fuer met, nb, ar, etc
-								if(!is_numeric($zeugnisnote->note) && isset($noten_anmerkung_arr[$zeugnisnote->note]))
-								{
-									$zeugnisnote->note = $noten_anmerkung_arr[$zeugnisnote->note];
-								}
-							}
-							elseif(isset($_POST['punkte_'.$i]))
-							{
-								$zeugnisnote->punkte=$_POST['punkte_'.$i];
-								$zeugnisnote->punkte = str_replace(',','.', $zeugnisnote->punkte);
-								$notenschluessel = new notenschluessel();
-								$note = $notenschluessel->getNote($zeugnisnote->punkte, $_POST['lehrveranstaltung_id'], $semester_aktuell);
-								$zeugnisnote->note = $note;
-							}
-							$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
-							$zeugnisnote->benotungsdatum = date('Y-m-d H:i:s');
-
-							if(!$zeugnisnote->save())
-							{
-								$errormsg .= "\n".$zeugnisnote->errormsg;
-							}
-							else
-							{
-								if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $zeugnisnote->new == true)
-								{
-									NotePruefungAnlegen($semester_aktuell, $uid, $_POST['lehrveranstaltung_id'], $zeugnisnote->note);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if(!$ueberschreibbar)
-		{
-			$errormsg.="\nNote(n) ".implode(', ', $nueberschreibbarbez)." waren nicht ueberschreibbar";
-		}
-
-		if($errormsg=='')
-			$return = true;
-		else
-			$return = false;
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletenote')
-	{
-		//Loescht einen Noteneintrag
-
-		$noten = new zeugnisnote();
-		$lehrveranstaltung_id = filter_input(INPUT_POST, 'lehrveranstaltung_id');
-		$student_uid = filter_input(INPUT_POST, 'student_uid');
-		$studiensemester_kurzbz = filter_input(INPUT_POST, 'studiensemester_kurzbz');
-
-		if(!is_null($lehrveranstaltung_id) && !is_null($student_uid) && !is_null($studiensemester_kurzbz))
-		{
-			//Berechtigung pruefen
-			$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$stg_lva = $row->studiengang_kz;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln der LVA';
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln der LVA';
-			}
-
-			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($student_uid);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$stg_std = $row->studiengang_kz;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Fehler beim Ermitteln des Studenten';
-				}
-			}
-			else
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln des Studenten';
-			}
-
-			if(!$error)
-			{
-				if(!$rechte->isBerechtigt('admin', $stg_lva, 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
-				   !$rechte->isBerechtigt('assistenz', $stg_lva, 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-					$noten->load($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz);
-					if($noten->delete($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz))
-					{
-						$log = new log();
-						$log->executetime = date('Y-m-d H:i:s');
-						$log->mitarbeiter_uid = $user;
-						$log->beschreibung = "Löschen der Note ".$noten->note." bei ".$noten->student_uid;
-						$log->sql = "DELETE FROM lehre.tbl_zeugnisnote WHERE
-								lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER, false)." AND
-								student_uid=".$db->db_add_param($student_uid)." AND
-								studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz).";";
-						$log->sqlundo = $noten->getUndo('insert');
-						$log->save(true);
-						$return = true;
-					}
-					else
-					{
-						$return = false;
-						$errormsg = $noten->errormsg;
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletepruefung')  // **** PRUEFUNGEN **** //
-	{
-		//Loescht einen Pruefungs Eintrag
-		if(isset($_POST['pruefung_id']) && is_numeric($_POST['pruefung_id']))
-		{
-			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Sie haben keine Berechtigung';
-			}
-			else
-			{
-				$pruefung = new pruefung();
-
-				if($pruefung->delete($_POST['pruefung_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $pruefung->errormsg;
-					$return = false;
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savepruefung')  // **** PRUEFUNGEN **** //
-	{
-		$datum_obj = new datum();
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$pruefung = new pruefung();
-
-			if($_POST['neu']=='false')
-			{
-				if($pruefung->load($_POST['pruefung_id']))
-				{
-					$pruefung->new = false;
-				}
-				else
-				{
-					$error = true;
-					$return = false;
-					$errormsg = $pruefung->errormsg;
-				}
-			}
-			else
-			{
-				$pruefung->new = true;
-				$pruefung->insertamum = date('Y-m-d H:i:s');
-				$pruefung->insertvon = $user;
-			}
-
-			$db->db_query('BEGIN');
-
-			if($_POST['pruefungstyp_kurzbz']=='Termin2')
-			{
-				//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
-				//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
-				$qry = "SELECT * FROM lehre.tbl_pruefung WHERE
-						student_uid=".$db->db_add_param($_POST['student_uid'])." AND
-						lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER)." AND
-						pruefungstyp_kurzbz='Termin1'";
-				if($result = $db->db_query($qry))
-				{
-					if($db->db_num_rows($result)==0)
-					{
-						$qry = "SELECT note,punkte, benotungsdatum FROM lehre.tbl_zeugnisnote JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id) WHERE
-								student_uid=".$db->db_add_param($_POST['student_uid'])." AND
-								tbl_lehreinheit.lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER)." AND
-								tbl_lehreinheit.studiensemester_kurzbz = tbl_zeugnisnote.studiensemester_kurzbz";
-						if($result = $db->db_query($qry))
-						{
-							if($row = $db->db_fetch_object($result))
-							{
-								//Wenn kein Ersttermin existiert, dann wird einer angelegt
-								$ersttermin = new pruefung();
-								$ersttermin->new=true;
-								$ersttermin->insertamum = date('Y-m-d H:i:s');
-								$ersttermin->insertvon = $user;
-								$ersttermin->lehreinheit_id = $_POST['lehreinheit_id'];
-								$ersttermin->student_uid = $_POST['student_uid'];
-								$ersttermin->mitarbeiter_uid = $_POST['mitarbeiter_uid'];
-								$ersttermin->note = $row->note;
-								$ersttermin->punkte = $row->punkte;
-								$ersttermin->pruefungstyp_kurzbz = 'Termin1';
-								$ersttermin->datum = $row->benotungsdatum;
-								$ersttermin->anmerkung = '';
-
-								if(!$ersttermin->save())
-								{
-									$error = true;
-									$return = false;
-									$errormsg = 'Fehler beim Anlegen des 1.Termin:'.$ersttermin->errormsg;
-								}
-							}
-						}
-						//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
-						//1.Termin angelegt
-					}
-				}
-				else
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Fehler beim Ermitteln des Ersttermines';
-				}
-
-			}
-
-			if(!$error)
-			{
-				$pruefung->lehreinheit_id = $_POST['lehreinheit_id'];
-				$pruefung->student_uid = $_POST['student_uid'];
-				$pruefung->mitarbeiter_uid = $_POST['mitarbeiter_uid'];
-				$pruefung->note = $_POST['note'];
-				if(isset($_POST['punkte']))
-					$pruefung->punkte = str_replace(',','.',$_POST['punkte']);
-				$pruefung->pruefungstyp_kurzbz = $_POST['pruefungstyp_kurzbz'];
-				$pruefung->datum = $_POST['datum'];
-				$pruefung->anmerkung = $_POST['anmerkung'];
-				$pruefung->updateamum = date('Y-m-d H:i:s');
-				$pruefung->updatevon = $user;
-
-
-				if($pruefung->save())
-				{
-					$return = true;
-					$data = $pruefung->pruefung_id;
-					//Zeugnisnote aktualisieren
-					$qry = "SELECT lehrveranstaltung_id, studiensemester_kurzbz FROM lehre.tbl_lehreinheit
-							WHERE lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER);
-					if($result_le = $db->db_query($qry))
-					{
-						if($row_le = $db->db_fetch_object($result_le))
-						{
-							$lehrveranstaltung_id = $row_le->lehrveranstaltung_id;
-							$studiensemester_kurzbz = $row_le->studiensemester_kurzbz;
-						}
-						else
-						{
-							$error = true;
-							$return = false;
-							$errormsg = 'Fehler beim Ermitteln der Lehrveranstaltung';
-						}
-					}
-					else
-					{
-						$error = true;
-						$return = false;
-						$errormsg = 'Fehler beim Ermitteln der Lehrveranstaltung';
-					}
-
-
-					if(!$error)
-					{
-						$zeugnisnote = new zeugnisnote();
-						if($zeugnisnote->load($lehrveranstaltung_id, $_POST['student_uid'], $studiensemester_kurzbz))
-						{
-							if($zeugnisnote->uebernahmedatum=='' ||
-								($datum_obj->mktime_fromtimestamp($zeugnisnote->benotungsdatum) >
-								 $datum_obj->mktime_fromtimestamp($zeugnisnote->uebernahmedatum)))
-								$checkdatum = $zeugnisnote->benotungsdatum;
-							else
-								$checkdatum = $zeugnisnote->uebernahmedatum;
-
-							if($datum_obj->mktime_fromtimestamp($checkdatum)>$datum_obj->mktime_fromdate($_POST['datum']))
-							{
-								if($zeugnisnote->note!=$_POST['note'])
-								{
-									$error = true;
-									$return = false;
-									$errormsg = 'ACHTUNG! Diese Pruefungsnote wurde nicht ins Zeugnis uebernommen da die Zeugnisnote nach dem Pruefungsdatum veraendert wurde';
-								}
-							}
-							else
-							{
-								$zeugnisnote->new = false;
-							}
-						}
-						else
-						{
-							$zeugnisnote->new = true;
-							$zeugnisnote->insertamum = date('Y-m-d H:i:s');
-							$zeugnisnote->insertvon = $user;
-						}
-
-						if(!$error)
-						{
-							$zeugnisnote->student_uid = $_POST['student_uid'];
-							$zeugnisnote->lehrveranstaltung_id = $lehrveranstaltung_id;
-							$zeugnisnote->studiensemester_kurzbz = $studiensemester_kurzbz;
-							$zeugnisnote->note = $_POST['note'];
-							if(isset($_POST['punkte']))
-								$zeugnisnote->punkte = str_replace(',','.',$_POST['punkte']);
-							else
-								$zeugnisnote->punkte='';
-							$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
-							$zeugnisnote->benotungsdatum = date('Y-m-d',$datum_obj->mktime_fromdate($_POST['datum']));
-							$zeugnisnote->updateamum = date('Y-m-d H:i:s');
-							$zeugnisnote->updatevon = $user;
-
-							if(!$zeugnisnote->save())
-							{
-								$return = false;
-								$error = true;
-								$errormsg = 'Fehler beim Speichern der Zeungisnote:'.$zeugnisnote->errormsg;
-								$db->db_query('ROLLBACK');
-							}
-							else
-							{
-								$db->db_query('COMMIT');
-							}
-						}
-						else
-						{
-							//Kein Rollback damit die Pruefung gespeichert wird
-							//returnwert ist aber false damit die Meldung angezeigt wird,
-							//dass die Note nicht ins Zeugnis uebernommen wird
-							$db->db_query('COMMIT');
-						}
-					}
-					else
-					{
-						$db->db_query('ROLLBACK');
-					}
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $pruefung->errormsg;
-					$db->db_query('ROLLBACK');
-				}
-			}
-			else
-			{
-				$db->db_query('ROLLBACK');
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveabschlusspruefung')  // **** ABSCHLUSSPRUEFUNGEN **** //
-	{
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$pruefung = new abschlusspruefung();
-
-			if($_POST['neu']=='false')
-			{
-				if($pruefung->load($_POST['abschlusspruefung_id']))
-				{
-					$pruefung->new = false;
-				}
-				else
-				{
-					$error = true;
-					$return = false;
-					$errormsg = $pruefung->errormsg;
-				}
-			}
-			else
-			{
-				$pruefung->new = true;
-				$pruefung->insertamum = date('Y-m-d H:i:s');
-				$pruefung->insertvon = $user;
-			}
-
-			$pruefung->student_uid = $_POST['student_uid'];
-			$pruefung->vorsitz = $_POST['vorsitz'];
-			$pruefung->pruefer1 = $_POST['pruefer1'];
-			$pruefung->pruefer2 = $_POST['pruefer2'];
-			$pruefung->pruefer3 = $_POST['pruefer3'];
-			$pruefung->abschlussbeurteilung_kurzbz = $_POST['abschlussbeurteilung_kurzbz'];
-			$pruefung->note = $_POST['notekommpruef'];
-			$pruefung->akadgrad_id = $_POST['akadgrad_id'];
-			$pruefung->pruefungstyp_kurzbz = $_POST['pruefungstyp_kurzbz'];
-			$pruefung->datum = $_POST['datum'];
-			$pruefung->uhrzeit = $_POST['uhrzeit'];
-			$pruefung->sponsion = $_POST['sponsion'];
-			$pruefung->anmerkung = $_POST['anmerkung'];
-			$pruefung->updateamum = date('Y-m-d H:i:s');
-			$pruefung->updatevon = $user;
-
-			if(!$error)
-			{
-				if($pruefung->save())
-				{
-					$return = true;
-					$data = $pruefung->abschlusspruefung_id;
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $pruefung->errormsg;
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteabschlusspruefung')
-	{
-		//Loescht einen Pruefungs Eintrag
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			if(isset($_POST['abschlusspruefung_id']) && is_numeric($_POST['abschlusspruefung_id']))
-			{
-				$pruefung = new abschlusspruefung();
-
-				if($pruefung->delete($_POST['abschlusspruefung_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $pruefung->errormsg;
-					$return = false;
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg  = 'Fehlerhafte Parameteruebergabe';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveprojektarbeit')  // **** Projektarbeit **** //
-	{
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$projektarbeit = new projektarbeit();
-
-			if($_POST['neu']=='false')
-			{
-				if($projektarbeit->load($_POST['projektarbeit_id']))
-				{
-					$projektarbeit->new = false;
-				}
-				else
-				{
-					$error = true;
-					$return = false;
-					$errormsg = $projektarbeit->errormsg;
-				}
-			}
-			else
-			{
-				$projektarbeit->new = true;
-				$projektarbeit->insertamum = date('Y-m-d H:i:s');
-				$projektarbeit->insertvon = $user;
-			}
-
-			$projektarbeit->projekttyp_kurzbz = $_POST['projekttyp_kurzbz'];
-			$projektarbeit->titel = $_POST['titel'];
-			$projektarbeit->titel_english = $_POST['titel_english'];
-			$projektarbeit->lehreinheit_id = $_POST['lehreinheit_id'];
-			$projektarbeit->student_uid = $_POST['student_uid'];
-			$projektarbeit->firma_id = $_POST['firma_id'];
-			$projektarbeit->note = $_POST['note'];
-			$projektarbeit->punkte = str_replace(',','.',$_POST['punkte']);
-			$projektarbeit->beginn = $_POST['beginn'];
-			$projektarbeit->ende = $_POST['ende'];
-			$projektarbeit->faktor = str_replace(',','.',$_POST['faktor']);
-			$projektarbeit->freigegeben = ($_POST['freigegeben']=='true'?true:false);
-			$projektarbeit->gesperrtbis = $_POST['gesperrtbis'];
-			$projektarbeit->stundensatz = str_replace(',','.',$_POST['stundensatz']);
-			$projektarbeit->gesamtstunden = $_POST['gesamtstunden'];
-			$projektarbeit->themenbereich = $_POST['themenbereich'];
-			$projektarbeit->anmerkung = $_POST['anmerkung'];
-			$projektarbeit->updateamum = date('Y-m-d H:i:s');
-			$projektarbeit->updatevon = $user;
-			$projektarbeit->final = ($_POST['final']=='true'?true:false);
-
-			if(!$error)
-			{
-				if($projektarbeit->save())
-				{
-					$return = true;
-					$data = $projektarbeit->projektarbeit_id;
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $projektarbeit->errormsg;
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteprojektarbeit')
-	{
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			//Loescht einen Projektarbeit Eintrag
-			if(isset($_POST['projektarbeit_id']) && is_numeric($_POST['projektarbeit_id']))
-			{
-				$projektarbeit = new projektarbeit();
-
-				$qry = "SELECT count(*) as anzahl FROM lehre.tbl_projektbetreuer
-					WHERE projektarbeit_id=".$db->db_add_param($_POST['projektarbeit_id'], FHC_INTEGER);
-
-				if($result = $db->db_query($qry))
-				{
-					if($row = $db->db_fetch_object($result))
-					{
-						if($row->anzahl>0)
-						{
-							$errormsg = 'Bitte zuerst alle BetreuerInnen loeschen';
-							$return = false;
-						}
-						else
-						{
-							$qry = "SELECT count(*) as anzahl FROM campus.tbl_paabgabe
-									WHERE projektarbeit_id=".$db->db_add_param($_POST['projektarbeit_id'], FHC_INTEGER).";";
-
-							if($result = $db->db_query($qry))
-							{
-								if($row = $db->db_fetch_object($result))
-								{
-									if($row->anzahl>0)
-									{
-										$errormsg = 'Diese Projektarbeit kann nicht gelöscht werden, da bereits AbgabeTermine bzw Abgaben vorhanden sind';
-										$return = false;
-									}
-									else
-									{
-										if($projektarbeit->delete($_POST['projektarbeit_id']))
-										{
-											$return = true;
-										}
-										else
-										{
-											$errormsg = $projektarbeit->errormsg;
-											$return = false;
-										}
-									}
-								}
-							}
-						}
-					}
-					else
-					{
-						$errormsg = 'Fehler beim Loeschen';
-						$return = false;
-					}
-				}
-				else
-				{
-					$errormsg = 'Fehler beim Loeschen';
-					$return = false;
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg  = 'Fehlerhafte Parameteruebergabe';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveprojektbetreuer')  // **** Projektbetreuer **** //
-	{
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$projektbetreuer = new projektbetreuer();
-
-			if($_POST['neu']=='false')
-			{
-				if($projektbetreuer->load($_POST['person_id_old'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz_old']))
-				{
-					$projektbetreuer->new = false;
-				}
-				else
-				{
-					$error = true;
-					$return = false;
-					$errormsg = $projektbetreuer->errormsg;
-				}
-			}
-			else
-			{
-				if($projektbetreuer->load($_POST['person_id'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz']))
-				{
-					$error = true;
-					$errormsg = 'Diese/r BetreuerIn ist bereits zugeteilt';
-				}
-				$projektbetreuer->new = true;
-				$projektbetreuer->insertamum = date('Y-m-d H:i:s');
-				$projektbetreuer->insertvon = $user;
-			}
-
-			$projektbetreuer->person_id = $_POST['person_id'];
-			$projektbetreuer->person_id_old = $_POST['person_id_old'];
-			$projektbetreuer->projektarbeit_id = $_POST['projektarbeit_id'];
-			$projektbetreuer->note = $_POST['note'];
-			$projektbetreuer->faktor = str_replace(',','.', $_POST['faktor']);
-			$projektbetreuer->name = $_POST['name'];
-			$projektbetreuer->punkte = str_replace(',','.', $_POST['punkte']);
-			$projektbetreuer->stunden = str_replace(',','.', $_POST['stunden']);
-			$projektbetreuer->stundensatz = str_replace(',','.', $_POST['stundensatz']);
-			$projektbetreuer->betreuerart_kurzbz = $_POST['betreuerart_kurzbz'];
-			$projektbetreuer->betreuerart_kurzbz_old = $_POST['betreuerart_kurzbz_old'];
-			$projektbetreuer->updateamum = date('Y-m-d H:i:s');
-			$projektbetreuer->updatevon = $user;
-
-			if(!$error)
-			{
-				if($projektbetreuer->save())
-				{
-					$return = true;
-				}
-				else
-				{
-					$return = false;
-					$errormsg = $projektbetreuer->errormsg;
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteprojektbetreuer')
-	{
-		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			// Wenn der Projektbetreuer schon einen Vertrag hat, wird das Loeschen verhindert
-			if (isset($_POST['vertrag_id']) && is_numeric($_POST['vertrag_id']) &&
-				(defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN') && FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN))
-			{
-				$return = false;
-				$errormsg = 'Löschen nur nach Stornierung des Vertrags möglich.';
-			}
-			else
-			{
-				//Loescht einen Projektbetreuer Eintrag
-				if (isset($_POST['person_id']) && is_numeric($_POST['person_id'])) {
-					$projektbetreuer = new projektbetreuer();
-					if ($projektbetreuer->delete($_POST['person_id'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz'])) {
-						$return = true;
-					} else {
-						$errormsg = $projektbetreuer->errormsg;
-						$return = false;
-					}
-				} else {
-					$return = false;
-					$errormsg = 'Fehlerhafte Parameteruebergabe';
-				}
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='getprivatemailadress')
-	{
-		if(isset($_POST['person_ids']))
-		{
-			$pers_arr = explode(';',$_POST['person_ids']);
-			$data='';
-			$anz_error=0;
-
-			foreach ($pers_arr as $person_id)
-			{
-				if(is_numeric($person_id))
-				{
-					$qry = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email'
-						AND person_id=".$db->db_add_param($person_id, FHC_INTEGER)." AND zustellung=true LIMIT 1";
-					if($result = $db->db_query($qry))
-					{
-						if($row = $db->db_fetch_object($result))
-						{
-							if($data!='')
-								$data.=$emailadressentrennzeichen.$row->kontakt;
-							else
-								$data = $row->kontakt;
-						}
-						else
-						{
-							$anz_error++;
-						}
-					}
-				}
-			}
-			if($data!='')
-			{
-				if($anz_error==0)
-					$return = true;
-				else
-				{
-					$return = false;
-					$errormsg = "Bei $anz_error Personen wurde keine Emailadresse gefunden!";
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg = 'Es wurde keine Privatadresse gefunden';
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='getReihungstestPunkte')
-	{
-		//Liefert die Reihungstestpunkte eines Prestudenten
-		if(isset($_POST['person_id']) && isset($_POST['reihungstest_id']))
-		{
-			$pruefling = new pruefling();
-			if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
-				$data = $pruefling->getReihungstestErgebnisPerson($_POST['person_id'], true, $_POST['reihungstest_id']);
-			else
-				$data = $pruefling->getReihungstestErgebnisPerson($_POST['person_id'], false, $_POST['reihungstest_id']);
-
-			// Runden auf 2 Nachkommastellen
-			$data = number_format($data, 2, '.','');
-			$return = true;
-		}
-		else
-		{
-			$return = false;
-			$errormsg = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='getstundensatz')
-	{
-		if(isset($_POST['person_id']))
-		{
-			$qry = "SELECT stundensatz FROM public.tbl_mitarbeiter JOIN public.tbl_benutzer ON(uid=mitarbeiter_uid)
-					WHERE person_id=".$db->db_add_param($_POST['person_id'], FHC_INTEGER);
-			if($result = $db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object($result))
-				{
-					$data = $row->stundensatz;
-					$return = true;
-				}
-				else
-				{
-					$data = '80.00';
-					$return = true;
-				}
-			}
-			else
-			{
-				$return = false;
-				$errormsg = 'Unbekannter Fehler';
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='saveanrechnung')
-	{
-		$anrechnung = new anrechnung();
-
-		$anrechnung->new = $_POST['neu'];
-		$anrechnung->anrechnung_id = $_POST['anrechnung_id'];
-		$anrechnung->prestudent_id = $_POST['prestudent_id'];
-		$anrechnung->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
-		$anrechnung->begruendung_id = $_POST['begruendung_id'];
-		isset($_POST['lehrveranstaltung_id_kompatibel']) ? $anrechnung->lehrveranstaltung_id_kompatibel = $_POST['lehrveranstaltung_id_kompatibel'] : $anrechnung->lehrveranstaltung_id_kompatibel = null;
-		isset($_POST['notiz_id']) ? $anrechnung->notiz_id = $_POST['notiz_id'] : $anrechnung->notiz_id = null;
-		$anrechnung->genehmigt_von = $_POST['genehmigt_von'];
-		$anrechnung->insertvon = $user;
-		$anrechnung->updatevon = $user;
-
-		if($anrechnung->save())
-		{
-			$return = true;
-		}
-		else
-		{
-			$return = false;
-			$errormsg = $anrechnung->errormsg;
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deleteanrechnung')
-	{
-		//Loescht eine Anrechunng
-		if(isset($_POST['anrechnung_id']) && is_numeric($_POST['anrechnung_id']))
-		{
-			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = 'Sie haben keine Berechtigung';
-			}
-			else
-			{
-				$anrechnung = new anrechnung();
-
-				if($anrechnung->delete($_POST['anrechnung_id']))
-				{
-					$return = true;
-				}
-				else
-				{
-					$errormsg = $anrechnung->errormsg;
-					$return = false;
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-
-    //******** AUFNAHMETERMINE *****
-	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineSave')  // **** AufnahmeTermine **** //
-	{
-		//Speichert einen Aufnahmetermin einer Person
-		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
-		{
-			$prestudent = new prestudent();
-			if(!$prestudent->load($_POST['prestudent_id']))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = $prestudent->errormsg;
-			}
-			else
-			{
-				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-					$rt_person_id = $_POST['rt_person_id'];
-					$rt_id = $_POST['rt_id'];
-					$person_id = $_POST['person_id'];
-					if($person_id=='')
-						$person_id=$prestudent->person_id;
-					$punkte = str_replace(',','.',$_POST['punkte']);
-					$teilgenommen = ($_POST['teilgenommen']=='true'?true:false);
-					$anmeldedatum = $_POST['anmeldedatum'];
-					$studienplan_id = $_POST['studienplan_id'];
-
-					$reihungstest = new reihungstest();
-
-					if($rt_person_id!='')
-					{
-						$reihungstest->loadReihungstestPerson($rt_person_id);
-					}
-					else
-					{
-						$reihungstest->new=true;
-					}
-
-					$warnung_zu_viele_teilnehmer = false;
-					$warnung_raumzuordnungentfernt = false;
-					if($reihungstest->reihungstest_id != $rt_id)
-					{
-						// Wenn ein neuer Reihungstesttermin ausgewählt wird, dann wird geprueft ob
-						// noch genuegend Platz vorhanden ist.
-						$rt_help = new reihungstest();
-						$aktuelle_anzahl = $rt_help->getTeilnehmerAnzahl($rt_id);
-						$rt_help->load($rt_id);
-						$max_teilnehmer = $rt_help->max_teilnehmer;
-						if($max_teilnehmer == '')
-						{
-							// Wenn keine Teilnehmer eingetragen sind, dann schauen welche Raeume zugeteilt
-							// sind und wie viel Platz dort ist
-							$max_teilnehmer = $rt_help->getPlatzAnzahlRaum($rt_id);
-						}
-						if($max_teilnehmer!='' && $aktuelle_anzahl >= $max_teilnehmer)
-							$warnung_zu_viele_teilnehmer = true;
-
-						if ($reihungstest->ort_kurzbz != '')
-						{
-							$reihungstest->ort_kurzbz = '';
-							$warnung_raumzuordnungentfernt = true;
-						}
-					}
-					$reihungstest->reihungstest_id = $rt_id;
-					$reihungstest->person_id = $person_id;
-					$reihungstest->punkte = $punkte;
-					$reihungstest->teilgenommen = $teilgenommen;
-					$reihungstest->anmeldedatum = $anmeldedatum;
-					$reihungstest->studienplan_id = $studienplan_id;
-                    ($reihungstest->new) ? $reihungstest->insertamum = date('Y-m-d H:i:s'): $reihungstest->updateamum = date('Y-m-d H:i:s');
-                    ($reihungstest->new) ? $reihungstest->insertvon = $user : $reihungstest->updatevon = $user;
-
-					if($reihungstest->savePersonReihungstest())
-					{
-						$return = true;
-						$error = false;
-						$errormsg = 'Erfolgreich gespeichert';
-						$data = $reihungstest->rt_person_id;
-						if($warnung_zu_viele_teilnehmer)
-						{
-							$return = false;
-							$error = true;
-							$errormsg .= ' - Achtung - die Maximalanzahl der Teilnehmer wurde überschritten;'.
-							' Prüfen Sie ob genug Platz zur Verfügung steht';
-						}
-						if ($warnung_raumzuordnungentfernt)
-						{
-							$return = false;
-							$error = true;
-							$errormsg .= ' - Achtung - Die Person war bereits einem Raum für den Reihungstest zugeordnet.'.
-							'Die Raumzuordnung wurde entfernt.';
-						}
-					}
-					else
-					{
-						$return = false;
-						$error = true;
-						$errormsg = $reihungstest->errormsg;
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineDelete')
-	{
-		//Loescht einen Aufnahmetermin einer Person
-		if(isset($_POST['rt_person_id']) && is_numeric($_POST['rt_person_id']))
-		{
-			$rt_person_id = $_POST['rt_person_id'];
-			$reihungstest = new reihungstest();
-			if(!$reihungstest->loadReihungstestPerson($rt_person_id))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = $reihungstest->errormsg;
-			}
-			else
-			{
-				$prestudent = new prestudent();
-				if(!$prestudent->getPrestudenten($reihungstest->person_id))
-				{
-					$return = false;
-					$error = true;
-					$errormsg = $prestudent->errormsg;
-				}
-				else
-				{
-					$berechtigt = false;
-					foreach($prestudent->result as $row_prest)
-					{
-						if($rechte->isBerechtigt('admin', $row_prest->studiengang_kz, 'suid') || $rechte->isBerechtigt('assistenz', $row_prest->studiengang_kz, 'suid'))
-						{
-							$berechtigt = true;
-							break;
-						}
-					}
-
-					if(!$berechtigt)
-					{
-						$return = false;
-						$error = true;
-						$errormsg = 'Sie haben keine Berechtigung';
-					}
-					else
-					{
-						$reihungstest = new reihungstest();
-
-						if($reihungstest->deletePersonReihungstest($rt_person_id))
-						{
-							$return = true;
-							$error = false;
-							$errormsg = 'Erfolgreich geloescht';
-						}
-						else
-						{
-							$return = false;
-							$error = true;
-							$errormsg = $reihungstest->errormsg;
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineSaveGesamtpunkte')
-	{
-		//Speichert einen Aufnahmetermin einer Person
-		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
-		{
-			$prestudent = new prestudent();
-			if(!$prestudent->load($_POST['prestudent_id']))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = $prestudent->errormsg;
-			}
-			else
-			{
-				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
-				{
-					$return = false;
-					$error = true;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-					$punkte = str_replace(',','.',$_POST['punkte']);
-					$reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
-					$prestudent->punkte = $punkte;
-					$prestudent->reihungstestangetreten = $reihungstestangetreten;
-					$prestudent->aufnahmegruppe_kurzbz = $_POST['aufnahmegruppe_kurzbz'];
-					$prestudent->new=false;
-
-					if($prestudent->save())
-					{
-						$return = true;
-						$error = false;
-						$errormsg = 'Erfolgreich gespeichert';
-					}
-					else
-					{
-						$return = false;
-						$error = true;
-						$errormsg = $reihungstest->errormsg;
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineBerechneGesamtpunkte')
-	{
-		//Speichert einen Aufnahmetermin einer Person
-		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
-		{
-			$prestudent = new prestudent();
-			if(!$prestudent->load($_POST['prestudent_id']))
-			{
-				$return = false;
-				$error = true;
-				$errormsg = $prestudent->errormsg;
-			}
-			else
-			{
-				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
-				{
-					$return = false;
-					$error = true;
-				}
-				else
-				{
-					$gesamtpunkte_arr = array();
-					$reihungstest = new reihungstest();
-					if($reihungstest->getReihungstestPerson($prestudent->person_id))
-					{
-						foreach($reihungstest->result as $row)
-						{
-							$studienplan = new studienplan();
-							if($studienplan->loadStudienplan($row->studienplan_id))
-							{
-								$studienordnung = new studienordnung();
-								if($studienordnung->loadStudienordnung($studienplan->studienordnung_id))
-								{
-									if($studienordnung->studiengang_kz == $prestudent->studiengang_kz)
-									{
-										$rt_obj = new reihungstest();
-										$rt_obj->load($row->reihungstest_id);
-										if(!isset($gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz]))
-											$gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz]=0;
-										$gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz] += $row->punkte;
-									}
-								}
-								else
-								{
-									$return = false;
-									$errormsg = $studienordnung->errormsg;
-									$error = true;
-								}
-							}
-							else
-							{
-								$return = false;
-								$errormsg = $studienplan->errormsg;
-								$error = true;
-							}
-						}
-
-						if(!$error)
-						{
-							if(count(array_keys($gesamtpunkte_arr))>0)
-							{
-								$studiensemester = new studiensemester();
-								$stsem = $studiensemester->getYoungestFromArray(array_keys($gesamtpunkte_arr));
-								$gesamtpunkte = $gesamtpunkte_arr[$stsem];
-							}
-							else
-								$gesamtpunkte = '0';
-							$return = true;
-							$error = false;
-							$data = $gesamtpunkte;
-							$errormsg = 'Erfolgreich gespeichert';
-						}
-					}
-					else
-					{
-						$return = false;
-						$error = true;
-						$errormsg = $reihungstest->errormsg;
-					}
-				}
-			}
-		}
-		else
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Falsche Parameteruebergabe';
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='savemobilitaet')
-	{
-		// Speichert Mobilitaet/Gemeinsames Studium
-		$prestudent_id = $_POST['prestudent_id'];
-		$prestudent_obj = new prestudent();
-		$prestudent_obj->load($prestudent_id);
-
-		if(!$rechte->isBerechtigt('student/stammdaten', $prestudent_obj->studiengang_kz, 'suid'))
-		{
-			$return = false;
-			$error = true;
-			$errormsg = 'Sie haben keine Berechtigung';
-		}
-		else
-		{
-			$mob = new mobilitaet();
-
-			$error = false;
-			if(isset($_POST['mobilitaet_id']))
-			{
-				$mobilitaet_id = $_POST['mobilitaet_id'];
-				if(!$mob->load($mobilitaet_id))
-				{
-					$error=true;
-					$errormsg = $mob->errormsg;
-				}
-			}
-			else
-			{
-				$mob->new = true;
-				$mob->inservon = $user;
-			}
-
-			if(isset($_POST['studiensemester_kurzbz'])
-			&& isset($_POST['mobilitaetsprogramm_code'])
-			&& isset($_POST['gsprogramm_id'])
-			&& isset($_POST['mobilitaetstyp_kurzbz'])
-			&& isset($_POST['firma_id'])
-			&& isset($_POST['status_kurzbz'])
-			&& isset($_POST['ausbildungssemester']))
-			{
-				$studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
-				$mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
-				$gsprogramm_id = $_POST['gsprogramm_id'];
-				$mobilitaetstyp_kurzbz = $_POST['mobilitaetstyp_kurzbz'];
-				$firma_id = $_POST['firma_id'];
-				$status_kurzbz = $_POST['status_kurzbz'];
-				$ausbildungssemester = $_POST['ausbildungssemester'];
-			}
-			else
-			{
-				$error = true;
-				$errormsg = 'Fehlerhafte Parameteruebergabe';
-				$return = false;
-			}
-
-			if(!$error)
-			{
-				$mob->prestudent_id = $prestudent_id;
-				$mob->studiensemester_kurzbz = $studiensemester_kurzbz;
-				$mob->mobilitaetsprogramm_code = $mobilitaetsprogramm_code;
-				$mob->gsprogramm_id = $gsprogramm_id;
-				$mob->mobilitaetstyp_kurzbz = $mobilitaetstyp_kurzbz;
-				$mob->firma_id = $firma_id;
-				$mob->status_kurzbz = $status_kurzbz;
-				$mob->ausbildungssemester = $ausbildungssemester;
-				$mob->updatevon = $user;
-
-				if($mob->save())
-				{
-					$return = true;
-					$data = $mob->mobilitaet_id;
-				}
-				else
-				{
-					$return = false;
-					$error = true;
-					$errormsg = $mob->errormsg;
-				}
-			}
-			else
-			{
-				$return = false;
-			}
-		}
-	}
-	elseif(isset($_POST['type']) && $_POST['type']=='deletemobilitaet')
-	{
-		$mobilitaet_id = $_POST['mobilitaet_id'];
-		$mob = new mobilitaet();
-		if($mob->load($mobilitaet_id))
-		{
-			$prestudent = new prestudent();
-			if($prestudent->load($mob->prestudent_id))
-			{
-				if(!$rechte->isBerechtigt('student/stammdaten',$prestudent->studiengang_kz,'suid'))
-				{
-					$error = true;
-					$return = false;
-					$errormsg = 'Sie haben keine Berechtigung';
-				}
-				else
-				{
-					if($mob->delete($mobilitaet_id))
-					{
-						$return = true;
-					}
-					else
-					{
-						$errormsg = $mob->errormsg;
-						$return = false;
-					}
-				}
-			}
-			else
-			{
-				$error = true;
-				$return = false;
-				$errormsg = $prestudent->errormsg;
-			}
-		}
-		else
-		{
-			$return = false;
-			$errormsg  = 'Fehlerhafte Parameteruebergabe';
-			$errormsg  = $mob->errormsg;
-		}
-	}
-	else
-	{
-		$return = false;
-		$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
-		$data = '';
-	}
-}
-echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<RDF:RDF
-	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:NC="http://home.netscape.com/NC-rdf#"
-	xmlns:DBDML="http://www.technikum-wien.at/dbdml/rdf#"
->
-  <RDF:Seq RDF:about="http://www.technikum-wien.at/dbdml/msg">
-	<RDF:li>
-		<RDF:Description RDF:about="http://www.technikum-wien.at/dbdml/0" >
-			<DBDML:return>'.($return?'true':'false').'</DBDML:return>
-			<DBDML:errormsg><![CDATA['.$errormsg.']]></DBDML:errormsg>
-			<DBDML:warning><![CDATA['.$warning.']]></DBDML:warning>
-			<DBDML:data><![CDATA['.$data.']]></DBDML:data>
-		</RDF:Description>
-	</RDF:li>
-  </RDF:Seq>
-</RDF:RDF>';
-?>
+<?php
+/* Copyright (C) 2006 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: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *			Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *			Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+// ****************************************
+// * Insert/Update/Delete
+// * der Studenten
+// *
+// * Script sorgt fuer den Datenbanzugriff
+// * fuer das XUL - Studenten-Modul
+// *
+// ****************************************
+
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../config/global.config.inc.php');
+require_once('../../include/'.EXT_FKT_PATH.'/generateuid.inc.php');
+require_once('../../include/'.EXT_FKT_PATH.'/generatematrikelnr.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/benutzergruppe.class.php');
+require_once('../../include/log.class.php');
+require_once('../../include/person.class.php');
+require_once('../../include/benutzer.class.php');
+require_once('../../include/student.class.php');
+require_once('../../include/prestudent.class.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/akte.class.php');
+require_once('../../include/konto.class.php');
+require_once('../../include/dokument.class.php');
+require_once('../../include/studiensemester.class.php');
+require_once('../../include/betriebsmittel.class.php');
+require_once('../../include/betriebsmittelperson.class.php');
+require_once('../../include/bisio.class.php');
+require_once('../../include/zeugnisnote.class.php');
+require_once('../../include/lvgesamtnote.class.php');
+require_once('../../include/pruefung.class.php');
+require_once('../../include/abschlusspruefung.class.php');
+require_once('../../include/projektarbeit.class.php');
+require_once('../../include/projektbetreuer.class.php');
+require_once('../../include/lehrverband.class.php');
+require_once('../../include/gruppe.class.php');
+require_once('../../include/datum.class.php');
+require_once('../../include/pruefling.class.php');
+require_once('../../include/mail.class.php');
+require_once('../../include/kontakt.class.php');
+require_once('../../include/dms.class.php');
+require_once('../../include/notenschluessel.class.php');
+require_once('../../include/anrechnung.class.php');
+require_once('../../include/lehrveranstaltung.class.php');
+require_once('../../include/anwesenheit.class.php');
+require_once('../../include/benutzerfunktion.class.php');
+require_once('../../include/note.class.php');
+require_once('../../include/standort.class.php');
+require_once('../../include/adresse.class.php');
+require_once('../../include/reihungstest.class.php');
+require_once('../../include/studienplan.class.php');
+require_once('../../include/mobilitaet.class.php');
+require_once('../../include/studienordnung.class.php');
+
+$user = get_uid();
+$db = new basis_db();
+
+$return = false;
+$errormsg = 'unknown';
+$warning = '';
+$data = '';
+$error = false;
+
+loadVariables($user);
+//Berechtigungen laden
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('assistenz') && !$rechte->isBerechtigt('mitarbeiter'))
+{
+	$return = false;
+	$errormsg = 'Keine Berechtigung';
+	$data = '';
+	$error = true;
+}
+
+// *** FUNKTIONEN ***
+
+// ****
+// * Generiert die Matrikelnummer
+// * FORMAT: 0710254001
+// * 07 = Jahr
+// * 1/2/0  = WS/SS/Incomming
+// * 0254 = Studiengangskennzahl vierstellig
+// * 001 = Laufende Nummer
+// ****
+function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz)
+{
+	$db = new basis_db();
+
+	$jahr = substr($studiensemester_kurzbz, 4);
+	$art = substr($studiensemester_kurzbz, 0, 2);
+
+	if($studiengang_kz<0)
+	{
+		$studiengang_kz=abs($studiengang_kz);
+		//Lehrgang
+		switch($art)
+		{
+			case 'WS': $art = '3'; break;
+			case 'SS': $art = '4'; break;
+			default: $art = '0'; break;
+		}
+	}
+	else
+	{
+		//Studiengang
+		switch($art)
+		{
+			case 'WS': $art = '1'; break;
+			case 'SS': $art = '2'; break;
+			default: $art = '0'; break;
+		}
+	}
+	if($art=='2' || $art=='4')
+		$jahr = $jahr-1;
+	$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
+
+	$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE '$matrikelnummer%' ORDER BY matrikelnr DESC LIMIT 1";
+
+	if($result = $db->db_query($qry))
+	{
+		if($row = $db->db_fetch_object($result))
+		{
+			$max = substr($row->matrikelnr, (strlen(trim($row->matrikelnr))-3));
+		}
+		else
+			$max = 0;
+
+		$max += 1;
+		return $matrikelnummer.sprintf("%03d",$max);
+	}
+	else
+	{
+		return false;
+	}
+}
+
+/**
+ * Wenn die Anwesenheit und einen bestimmten Prozentsatz faellt, wird ein Pruefungstermin abgezogen
+ * @param $studiensemester_kurzbz
+ * @param $student_uid
+ * @param $lehrveranstaltung_id
+ * @param $note
+ * @return null, error wird direkt in globale Variable geschrieben
+ */
+function NotePruefungAnlegen($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $note)
+{
+	global $return, $error, $errormsg;
+
+	$db = new basis_db();
+	$anwesenheit = new anwesenheit();
+	$anwesenheit->loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id);
+
+	// Lehreinheit ermitteln
+	$error = false;
+	$qry = "
+		SELECT
+			lehreinheit_id
+		FROM
+			campus.vw_student_lehrveranstaltung
+		WHERE
+			uid=".$db->db_add_param($student_uid)."
+		 	AND lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id)."
+			AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
+		ORDER BY lehreinheit_id ASC
+		LIMIT 1";
+
+	if($result = $db->db_query($qry))
+	{
+		if($row = $db->db_fetch_object($result))
+		{
+			$lehreinheit_id = $row->lehreinheit_id;
+		}
+		else
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Fehler beim Ermitteln der Lehreinheit ID';
+		}
+	}
+	else
+	{
+		$return = false;
+		$error = true;
+		$errormsg = 'Fehler beim Ermitteln der Lehreinheit ID';
+	}
+
+	if(!$error)
+	{
+		$pruefung = new pruefung;
+		$pruefung->new = true;
+		$pruefung->student_uid = $student_uid;
+		$pruefung->lehreinheit_id = $lehreinheit_id;
+		$pruefung->datum = date("Y-m-d");
+
+		$stsem_obj = new studiensemester();
+		$stsem_obj->load($studiensemester_kurzbz);
+
+		// In Benutzerfunktion nachsehen ob eine Anwesenheitsbefreiung eingetragen ist
+		$benutzerfunktion = new benutzerfunktion();
+		$benutzerfunktion->getBenutzerFunktionByUid($student_uid, 'awbefreit', $stsem_obj->start, $stsem_obj->ende);
+
+		$anwesenheitsbefreit=false;
+		if(count($benutzerfunktion->result)>0)
+			$anwesenheitsbefreit=true;
+
+		// Wenn nicht Anwesenheitsbefreit und Anwesenheit unter einem bestimmten Prozentsatz faellt dann wird ein
+		// Pruefungsantritt abgezogen
+		if(isset($anwesenheit->result[0]) && $anwesenheit->result[0]->prozent < FAS_ANWESENHEIT_ROT && !$anwesenheitsbefreit)
+		{
+			// 1. Termin mit "nicht beurteilt" erstellen
+			$pruefung->pruefungstyp_kurzbz = "Termin1";
+			$pruefung->note = 7;
+			if($pruefung->save())
+			{
+				// 2. Termin mit Note erstellen
+				$pruefung->pruefungstyp_kurzbz = "Termin2";
+				$pruefung->note = $note;
+				if($pruefung->save())
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $pruefung->errormsg;
+					$return = false;
+				}
+			}
+			else
+			{
+				$errormsg = $pruefung->errormsg;
+				$return = false;
+			}
+		}
+		else
+		{
+			// 1. Termin mit Note erstellen
+			$pruefung->pruefungstyp_kurzbz = "Termin1";
+			$pruefung->note = $note;
+
+			if($pruefung->save())
+			{
+				$return = true;
+			}
+			else
+			{
+				$errormsg = $pruefung->errormsg;
+				$return = false;
+			}
+		}
+	}
+}
+
+if(!$error)
+{
+
+	if(isset($_POST['type']) && $_POST['type']=='savestudent')
+	{
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+
+		//Studentendaten speichern
+		if(!$error)
+		{
+			$student = new student();
+
+			if(!$student->load($_POST['uid']))
+			{
+				$return = false;
+				$errormsg = 'Fehler beim Laden:'.$student->errormsg;
+				$error = true;
+			}
+
+			if(!$error)
+			{
+				$student->uid = $_POST['uid'];
+				$student->anrede = $_POST['anrede'];
+				$student->titelpre = $_POST['titelpre'];
+				$student->titelpost = $_POST['titelpost'];
+				$student->vorname = $_POST['vorname'];
+				$student->vornamen = $_POST['vornamen'];
+				$student->nachname = $_POST['nachname'];
+				$student->gebdatum = $_POST['geburtsdatum'];
+				$student->gebort = $_POST['geburtsort'];
+				$student->gebzeit = $_POST['geburtszeit'];
+				$student->anmerkungen = $_POST['anmerkung'];
+				$student->homepage = $_POST['homepage'];
+				$student->matr_nr = $_POST['matr_nr'];
+				$student->svnr = $_POST['svnr'];
+				$student->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
+				$student->familienstand = $_POST['familienstand'];
+				$student->geschlecht = $_POST['geschlecht'];
+				$student->bnaktiv = ($_POST['aktiv']=='true'?true:false);
+				$student->anzahlkinder = $_POST['anzahlderkinder'];
+				$student->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
+				$student->geburtsnation = $_POST['geburtsnation'];
+				$student->sprache = $_POST['sprache'];
+				$student->matrikelnr = $_POST['matrikelnummer'];
+				$student->updateamum = date('Y-m-d H:i:s');
+				$student->updatevon = $user;
+
+				if($_POST['alias']!='')
+				{
+					if(checkalias($_POST['alias']))
+					{
+						$student->alias = $_POST['alias'];
+					}
+					else
+					{
+						$error = true;
+						$return = false;
+						$errormsg = 'Alias ist ungueltig';
+					}
+				}
+				else
+					$student->alias = '';
+
+				if(!$error)
+				{
+					$stsem = new studiensemester();
+					$stsem_kurzbz = $stsem->getaktorNext();
+					//Wenn das ausgewaehlte Semester das aktuelle ist, dann wird auch in der
+					//Tabelle Student der Stg/Semester/Verband/Gruppe geaendert.
+					//Sonst nur in der Tabelle Studentlehrverband
+					if($semester_aktuell == $stsem_kurzbz)
+					{
+						$student->studiengang_kz = $_POST['studiengang_kz'];
+						$student->semester = $_POST['semester'];
+						$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+						$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+					}
+
+					$student->new=false;
+
+					$lehrverband = new lehrverband();
+					if(!$lehrverband->exists($_POST['studiengang_kz'],$_POST['semester'],$_POST['verband'], $_POST['gruppe']))
+					{
+						$errormsg = 'Die angegebene Lehrverbandsgruppe existiert nicht!';
+						$return = false;
+						$error = true;
+					}
+
+					if(!$error)
+					{
+						if($student->save())
+						{
+							$student_lvb = new student();
+
+							// Studentlehrverband Eintrag nur Speichern, wenn der Student in diesem Studiensemester
+							// einen Status besitzt da es sonst beim Bearbeiten von alten Studenten immer in das
+							// entsprechende Studiensemester gewechselt werden muss.
+							$prestudentobj = new prestudent();
+							$prestudentobj->getPrestudentRolle($student->prestudent_id, null, $semester_aktuell);
+
+							if(count($prestudentobj->result)>0)
+							{
+								if($student_lvb->studentlehrverband_exists($_POST['uid'], $semester_aktuell))
+									$student_lvb->new = false;
+								else
+									$student_lvb->new = true;
+
+								$student_lvb->uid = $_POST['uid'];
+								$student_lvb->studiensemester_kurzbz = $semester_aktuell;
+								$student_lvb->studiengang_kz = $_POST['studiengang_kz'];
+								$student_lvb->semester = $_POST['semester'];
+								$student_lvb->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+								$student_lvb->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+								$student_lvb->updateamum = date('Y-m-d H:i:s');
+								$student_lvb->updatevon = $user;
+
+								if($student_lvb->save_studentlehrverband())
+								{
+									$return = true;
+									$error=false;
+									$data = $student->prestudent_id;
+								}
+								else
+								{
+									$error = true;
+									$errormsg = $student_lvb->errormsg;
+									$return = false;
+								}
+							}
+							else
+							{
+								$error = false;
+								$return = true;
+								$data = $student->prestudent_id;
+							}
+						}
+						else
+						{
+							$return = false;
+							$errormsg  = $student->errormsg;
+							$error = true;
+						}
+					}
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveperson')
+	{
+
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+		//Personendaten Speichern
+
+		if(!$error)
+		{
+			$person = new person();
+
+			if(!$person->load($_POST['person_id']))
+			{
+				$return = false;
+				$errormsg = 'Fehler beim Laden:'.$person->errormsg;
+				$error = true;
+			}
+
+			if(!$error)
+			{
+				$person->person_id = $_POST['person_id'];
+				$person->anrede = $_POST['anrede'];
+				$person->titelpre = $_POST['titelpre'];
+				$person->titelpost = $_POST['titelpost'];
+				$person->vorname = $_POST['vorname'];
+				$person->vornamen = $_POST['vornamen'];
+				$person->nachname = $_POST['nachname'];
+				$person->gebdatum = $_POST['geburtsdatum'];
+				$person->gebort = $_POST['geburtsort'];
+				$person->gebzeit = $_POST['geburtszeit'];
+				$person->anmerkungen = $_POST['anmerkung'];
+				$person->homepage = $_POST['homepage'];
+				$person->svnr = $_POST['svnr'];
+				$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
+				$person->familienstand = $_POST['familienstand'];
+				$person->geschlecht = $_POST['geschlecht'];
+				//$person->aktiv = ($_POST['aktiv']=='true'?true:false);
+				$person->anzahlkinder = $_POST['anzahlderkinder'];
+				$person->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
+				$person->geburtsnation = $_POST['geburtsnation'];
+				$person->sprache = $_POST['sprache'];
+				$person->matr_nr = $_POST['matr_nr'];
+				$person->updateamum = date('Y-m-d H:i:s');
+				$person->updatevon = $user;
+
+				$person->new=false;
+
+				if(!$error)
+				{
+					if($person->save())
+					{
+						$return = true;
+						$error=false;
+						$data = $person->person_id;
+					}
+					else
+					{
+						$return = false;
+						$errormsg  = $person->errormsg;
+						$error = true;
+					}
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveprestudent')
+	{
+		//PreStudentdaten Speichern
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+
+		if(!$error)
+		{
+			$prestudent = new prestudent();
+
+			if(!$prestudent->load($_POST['prestudent_id']))
+			{
+				$return = false;
+				$errormsg = 'Fehler beim Laden:'.$prestudent->errormsg;
+				$error = true;
+			}
+
+			if(!$error)
+			{
+				$prestudent->prestudent_id = $_POST['prestudent_id'];
+				$prestudent->aufmerksamdurch_kurzbz = $_POST['aufmerksamdurch_kurzbz'];
+				$prestudent->person_id = $_POST['person_id'];
+				$prestudent->studiengang_kz = $_POST['studiengang_kz'];
+				$prestudent->berufstaetigkeit_code = $_POST['berufstaetigkeit_code'];
+				$prestudent->ausbildungcode = $_POST['ausbildungcode'];
+				// Die Bachelor-ZGV darf nur mit einem eigenen Recht geändert werden
+				if($rechte->isBerechtigt('student/editBakkZgv',$_POST['studiengang_kz'],'suid'))
+				{
+					$prestudent->zgv_code = $_POST['zgv_code'];
+				}
+				elseif ($prestudent->zgv_code != $_POST['zgv_code'])
+				{
+					$errormsg = 'Keine Berechtigung zum Ändern der ZGV';
+					$error = true;
+				}
+				$prestudent->zgvort = $_POST['zgvort'];
+				$prestudent->zgvdatum = $_POST['zgvdatum'];
+				$prestudent->zgvnation = $_POST['zgvnation'];
+				$prestudent->zgvmas_code = $_POST['zgvmas_code'];
+				$prestudent->zgvmaort = $_POST['zgvmaort'];
+				$prestudent->zgvmadatum = $_POST['zgvmadatum'];
+				$prestudent->zgvmanation = $_POST['zgvmanation'];
+				$prestudent->aufnahmeschluessel = $_POST['aufnahmeschluessel'];
+				$prestudent->facheinschlberuf = ($_POST['facheinschlberuf']=='true'?true:false);
+				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
+				$prestudent->dual = ($_POST['dual']=='true'?true:false);
+				$prestudent->anmerkung = $_POST['anmerkung'];
+				$prestudent->mentor = $_POST['mentor'];
+				$prestudent->gsstudientyp_kurzbz = $_POST['gsstudientyp_kurzbz'];
+				$prestudent->priorisierung = $_POST['priorisierung'];
+				//$prestudent->insertamum = date('Y-m-d H:i:s');
+				//$prestudent->insertvon = $user;
+				$prestudent->updateamum = date('Y-m-d H:i:s');
+				$prestudent->updatevon = $user;
+				$prestudent->new=false;
+
+				if(!$error)
+				{
+					if($prestudent->save())
+					{
+						$return = true;
+						$error=false;
+						$data = $prestudent->prestudent_id;
+					}
+					else
+					{
+						$return = false;
+						$errormsg  = $prestudent->errormsg;
+						$error = true;
+					}
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='addrolle')
+	{
+		//Prestudentrolle hinzufuegen
+
+		if(!$error)
+		{
+			$prestudent_ids = explode(';', $_POST['prestudent_id']);
+			$errormsg='';
+			$anzahl_fehler=0;
+			foreach($prestudent_ids as $prestudent_id)
+			{
+				$error = false;
+				if($prestudent_id!='')
+				{
+					$prestd = new prestudent();
+					if(!$prestd->load($prestudent_id))
+					{
+						$error = true;
+						$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Laden des Prestudenten";
+						$anzahl_fehler++;
+					}
+					else
+					{
+						if(!$rechte->isBerechtigt('assistenz',$prestd->studiengang_kz,'suid') &&
+						   !$rechte->isBerechtigt('admin',$prestd->studiengang_kz, 'suid'))
+						{
+							$error = true;
+							$errormsg .= "\n$prestd->vorname $prestd->nachname: Sie haben keine Schreibrechte fuer diesen Studiengang";
+							$anzahl_fehler++;
+						}
+					}
+
+					// Check ob Reihungstest berücksichtigt werden soll
+					// kann in Config abgestellt werden
+					if(REIHUNGSTEST_CHECK)
+					{
+						$reihungstestangetreten = $prestd->reihungstestangetreten;
+
+						if($_POST['status_kurzbz']=='Bewerber' && !$reihungstestangetreten)
+						{
+							$error = true;
+							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben";
+							$anzahl_fehler++;
+						}
+					}
+
+					if(!defined("ZGV_CHECK") || ZGV_CHECK)
+					{
+						if($_POST['status_kurzbz']=='Bewerber' && $prestd->zgv_code=='')
+						{
+							$error = true;
+							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.";
+							$anzahl_fehler++;
+						}
+					}
+
+					$stg_obj = new studiengang();
+					$stg_obj->load($prestd->studiengang_kz);
+					if(!defined("ZGV_CHECK") || ZGV_CHECK)
+					{
+						if($_POST['status_kurzbz']=='Bewerber' && $prestd->zgvmas_code=='' && $stg_obj->typ=='m')
+						{
+							$error = true;
+							$errormsg .= "\n $prestd->vorname $prestd->nachname: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.";
+							$anzahl_fehler++;
+						}
+					}
+
+					if(!$error)
+					{
+
+						if($prestd->getLastStatus($prestudent_id))
+						{
+							if($_POST['status_kurzbz']=='Absolvent' || $_POST['status_kurzbz']=='Diplomand')
+								$studiensemester = $semester_aktuell;
+							else
+								$studiensemester = $prestd->studiensemester_kurzbz;
+							$hlp = new prestudent();
+
+							if($_POST['status_kurzbz']=='Student')
+								$sem=$_POST['semester'];
+							else
+								$sem=$prestd->ausbildungssemester;
+
+							$hlp->getPrestudentRolle($prestudent_id, $_POST['status_kurzbz'], $studiensemester, "datum, insertamum", $sem);
+							if(count($hlp->result)>0)
+							{
+								$errormsg .= "\n$prestd->vorname $prestd->nachname: Diese Rolle ist bereits vorhanden";
+								$anzahl_fehler++;
+								$return = false;
+							}
+							else
+							{
+								//Wenn der Status auf Aufgenommener oder Wartender geaendert wird,
+								//muss ein Bewerberstatus vorhanden sein
+								if($_POST['status_kurzbz']=='Aufgenommener' || $_POST['status_kurzbz']=='Wartender')
+								{
+									$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($prestudent_id, FHC_INTEGER)." AND status_kurzbz='Bewerber'";
+									if($result_bw = $db->db_query($qry))
+									{
+										if($db->db_num_rows($result_bw)==0)
+										{
+											$return = false;
+											$error = true;
+											$errormsg .= "\n$prestd->vorname $prestd->nachname: Person muss zuerst zum Bewerber gemacht werden!";
+											$anzahl_fehler++;
+										}
+									}
+								}
+
+								if(!$error)
+								{
+									$prestd_neu = new prestudent();
+									$prestd_neu->prestudent_id = $prestudent_id;
+									$prestd_neu->status_kurzbz = $_POST['status_kurzbz'];
+									$prestd_neu->studiensemester_kurzbz = $studiensemester;
+									$prestd_neu->datum = date('Y-m-d');
+									$prestd_neu->ausbildungssemester = $sem;
+									$prestd_neu->orgform_kurzbz = $prestd->orgform_kurzbz;
+									$prestd_neu->studienplan_id = $prestd->studienplan_id;
+									$prestd_neu->insertamum = date('Y-m-d H:i:s');
+									$prestd_neu->insertvon = $user;
+									$prestd_neu->bestaetigtam = date('Y-m-d');
+									$prestd_neu->bestaetigtvon = $user;
+									if(isset($_POST['statusgrund_id']))
+										$prestd_neu->statusgrund_id = $_POST['statusgrund_id'];
+									$prestd_neu->new = true;
+
+									if($prestd_neu->save_rolle())
+									{
+										// wenn kein fehler und status bewerber und "email senden an bewerber" eingestellt ist
+										if($_POST['status_kurzbz']=='Bewerber' && SEND_BEWERBER_INFOMAIL)
+										{
+											// hole Email Adresse
+											$kontakt = new kontakt();
+											$kontakt->load_persKontakttyp($prestd->person_id, 'email');
+
+											// Wenn zumindest eine Email Adresse gefunden wurde
+											if(count($kontakt->result)>0)
+											{
+												$email = "Sehr geehrter Frau/Herr ".$prestd->vorname." ".$prestd->nachname.",<br><br> ";
+
+												$email.= INFOMAIL_BEWERBER;
+												foreach($kontakt->result as $k)
+												{
+													$mail = new mail($k->kontakt, 'no-reply', 'Infomail', 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Link vollständig darzustellen.');
+
+													$mail->setHTMLContent($email);
+													if(!$mail->send())
+													{
+														$errormsg= 'Fehler beim Senden des Mails!';
+														$anzahl_fehler++;
+													}
+												}
+											}
+										}
+
+										//Unterbrecher und Abbrecher werden ins 0. Semester verschoben
+										if($_POST['status_kurzbz']=='Unterbrecher' || $_POST['status_kurzbz']=='Abbrecher')
+										{
+											$student = new student();
+											$uid = $student->getUid($prestudent_id);
+											$student->load($uid);
+											$student->studiensemester_kurzbz=$studiensemester;
+											$student->semester = '0';
+											if($_POST['status_kurzbz']=='Abbrecher')
+											{
+												$student->verband='A';
+												$student->gruppe='';
+											}
+											if($_POST['status_kurzbz']=='Unterbrecher')
+											{
+												$student->verband='B';
+												$student->gruppe='';
+											}
+
+											// noch nicht eingetragene Noten ergänzen
+											$noten = new zeugnisnote();
+											$noten->getZeugnisnoten(null, $uid, $semester_aktuell);
+											foreach($noten->result as $obj)
+											{
+												if($obj->note == '')
+												{
+													$obj->note = 9;
+													$obj->save(true);
+												}
+											}
+
+											//Nachschauen ob dieser Lehrverband schon existiert, falls nicht dann anlegen
+											$lehrverband = new lehrverband();
+											if(!$lehrverband->exists($student->studiengang_kz, $student->semester, $student->verband, ''))
+											{
+												//Pruefen ob der uebergeordnete Lehrverband existiert, falls nicht dann anlegen
+												if(!$lehrverband->exists($student->studiengang_kz, $student->semester, '', ''))
+												{
+													$lehrverband->studiengang_kz = $student->studiengang_kz;
+													$lehrverband->semester = $student->semester;
+													$lehrverband->verband = '';
+													$lehrverband->gruppe = '';
+													$lehrverband->aktiv = true;
+													$lehrverband->bezeichnung = 'Ab-Unterbrecher';
+
+													$lehrverband->save(true);
+												}
+
+												$lehrverband->studiengang_kz = $student->studiengang_kz;
+												$lehrverband->semester = $student->semester;
+												$lehrverband->verband = $student->verband;
+												$lehrverband->gruppe = '';
+												$lehrverband->aktiv = true;
+												if($student->verband=='A')
+													$lehrverband->bezeichnung = 'Abbrecher';
+												else
+													$lehrverband->bezeichnung = 'Unterbrecher';
+
+												$lehrverband->save(true);
+											}
+											$student->updatevon = $user;
+											$student->updateamum = date('Y-m-d H:i:s');
+											//Student Speichern
+											$student->save(false, false);
+											//Studentlehrverband Eintrag Speichern
+											$student->save_studentlehrverband(false);
+										}
+
+										//Wenn Unterbrecher zu Studenten werden, dann wird das Semester mituebergeben
+										//Verband und Gruppe wird entfernt.
+										if($_POST['status_kurzbz']=='Student')
+										{
+											$student = new student();
+											$uid = $student->getUid($prestudent_id);
+											$student->load($uid);
+											$student->studiensemester_kurzbz=$semester_aktuell;
+											$student->semester = $_POST['semester'];
+											$student->verband = '';
+											$student->gruppe = '';
+											$student->save(false, false);
+											$student->save_studentlehrverband(false);
+											//Aktiv Status setzen
+											$benutzer = new benutzer();
+											if($benutzer->load($uid))
+											{
+												$benutzer->updateamum = date('Y-m-d H:i:s');
+												$benutzer->updatevon = $user;
+												$benutzer->bnaktiv=true;
+												$benutzer->save(false, false);
+											}
+										}
+
+										//bei Abbrechern und Absolventen wird der Aktiv Status auf false gesetzt
+										if($_POST['status_kurzbz']=='Abbrecher' || $_POST['status_kurzbz']=='Absolvent')
+										{
+											$student = new student();
+											$uid = $student->getUid($prestudent_id);
+
+											$benutzer = new benutzer();
+											if($benutzer->load($uid))
+											{
+												$benutzer->updateamum = date('Y-m-d H:i:s');
+												$benutzer->updatevon = $user;
+												$benutzer->bnaktiv=false;
+												$benutzer->save(false, false);
+											}
+										}
+										$return = true;
+									}
+									else
+									{
+										$return = false;
+										$errormsg = "\n$prestd->vorname $prestd->nachname: ".$prestd_neu->errormsg;
+										$anzahl_fehler++;
+									}
+								}
+							}
+						}
+						else
+						{
+							$return = false;
+							$errormsg .= "\n$prestd->vorname $prestd->nachname: Es ist keine Rolle fuer diesen Prestudent vorhanden";
+							$anzahl_fehler++;
+						}
+					}
+				}
+			}
+
+			if($anzahl_fehler>0)
+			{
+				$return = false;
+				$errormsg = "Es sind $anzahl_fehler Fehler aufgetreten: ".$errormsg;
+			}
+			else
+			{
+				$return = true;
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleterolle')
+	{
+		//Loescht eine Prestudentrolle
+		$deletePrestudent = false;
+
+		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
+		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
+		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
+		{
+			if($_POST['status_kurzbz']=='Student' && !$rechte->isBerechtigt('admin', null, 'suid'))
+			{
+				$return = false;
+				$errormsg = 'Studentenrolle kann nur durch den Administrator geloescht werden';
+			}
+			else
+			{
+				$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
+				if($result = $db->db_query($qry))
+				{
+					if($row = $db->db_fetch_object($result))
+					{
+						// Die letzte Rolle darf nur durch einen Administrator geloescht werden. Danach wird auch der PreStudent-Eintrag geloescht
+						if($row->anzahl<=1)
+						{
+							$deletePrestudent = true;
+							if (!$rechte->isBerechtigt('admin', null, 'suid'))
+							{
+								$return = false;
+								$errormsg = 'Die letzte Rolle kann nur durch den Administrator geloescht werden';
+								$error = true;
+							}
+						}
+					}
+					else
+					{
+						$return = false;
+						$errormsg = 'Fehler beim Ermitteln der Rollen';
+						$error = true;
+					}
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln der Rollen';
+				}
+
+				if(!$error)
+				{
+					$rolle = new prestudent();
+					if($rolle->load_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
+					{
+						if($rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') || $rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+						{
+							if($rolle->delete_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
+							{
+								$log_id = $rolle->log_id;
+								$return = true;
+								// Wenn in diesem Semester kein Status mehr vorhanden ist,
+								// dann wird auch der Studentlehrverband eintrag entfernt
+								if($rolle->getLastStatus($_POST['prestudent_id'],$_POST['studiensemester_kurzbz'])===false)
+								{
+									if($return)
+									{
+										$student = new student();
+										$temp_uid = $student->getUid($rolle->prestudent_id);
+										if(!$student->delete_studentLehrverband($temp_uid, $_POST['studiengang_kz'], $rolle->studiensemester_kurzbz, $rolle->ausbildungssemester))
+										{
+											$return = false;
+											$errormsg = "Fehler beim Löschen der Lehrverbandszuordnung.";
+										}
+									}
+								}
+								// Wenn kein Prestudent-Eintrag mehr vorhanden ist, wird der ganze Prestudent-Datensatz geloescht
+								if ($deletePrestudent == true)
+								{
+									$prestudent = new prestudent();
+									if(!$prestudent->deletePrestudent($_POST['prestudent_id']))
+									{
+										$return = false;
+										$errormsg = "Fehler beim Löschen des Prestudenten.";
+										$log = new log();
+										$log->undo($log_id);
+									}
+								}
+							}
+							else
+							{
+								$return = false;
+								$errormsg = $rolle->errormsg;
+							}
+						}
+						else
+						{
+							$return = false;
+							$errormsg = 'Sie haben keine Berechtigung zum Loeschen dieser Rolle';
+						}
+					}
+					else
+					{
+						$return = false;
+						$errormsg = $rolle->errormsg;
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='returnDeletePrestudent')
+	{
+		//Prueft, wie viele Prestudentrolle-Eintraege noch vorhanden sind und gibt diese Anzahl als Wert zurueck
+
+		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
+		{
+			$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$return = true;
+					$data = $row->anzahl;
+				}
+				else
+				{
+					$return = false;
+					$errormsg = 'Fehler beim Zaehlen der Rollen';
+					$error = true;
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Zaehlen der Rollen';
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='bestaetigerolle')
+	{
+		//Bestaetigt eine Prestudentrolle
+
+		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
+		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
+		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
+		{
+			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+			{
+				$return = false;
+				$errormsg = 'keine Berechtigung';
+			}
+			else
+			{
+				$rolle = new prestudent();
+				if($rolle->load_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester']))
+				{
+					if($rolle->bestaetige_rolle($_POST['prestudent_id'],$_POST['status_kurzbz'],$_POST['studiensemester_kurzbz'], $_POST['ausbildungssemester'],$user))
+					{
+						// Message verschicken
+						$prestudent = new prestudent();
+						$prestudent->load($_POST['prestudent_id']);
+
+						$url =APP_ROOT.'index.ci.php/api/v1/system/Message/MessageVorlage';
+						$ch = curl_init();
+						curl_setopt($ch, CURLOPT_URL,$url);
+						curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+
+						$header=array();
+						$auth = base64_encode(FHC_REST_USER.':'.FHC_REST_PASSWORD);
+						$header[]="Authorization: Basic $auth";
+						$header[]='FHC-API-KEY:'.FHC_REST_API_KEY;
+
+						curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+						curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+						$studiengang = new studiengang();
+						$studiengang->load($prestudent->studiengang_kz);
+						$studiengang->getAllTypes();
+
+						$orgform='';
+						if($rolle->studienplan_id!='')
+						{
+							$studienplan = new studienplan();
+							$studienplan->loadStudienplan($rolle->studienplan_id);
+							$orgform = $studienplan->orgform_kurzbz;
+						}
+						else
+							$orgform = $rolle->orgform_kurzbz;
+						$curl_post_data = array(
+						"sender_id" => 1, // TODO
+						"receiver_id" => $prestudent->person_id,
+						"oe_kurzbz" => $studiengang->oe_kurzbz,
+						"vorlage_kurzbz" => 'MailStatConfirm'.$_POST['status_kurzbz'],
+						"data" => array(
+							'anrede'=>$prestudent->anrede,
+							'vorname'=>$prestudent->vorname,
+							'nachname'=>$prestudent->nachname,
+							'typ'=>$studiengang->studiengang_typ_arr[$studiengang->typ],
+							'studiengang'=>$studiengang->bezeichnung,
+							'orgform'=>$orgform,
+							'stgMail'=>$studiengang->email
+						 )
+						);
+
+						curl_setopt($ch, CURLOPT_POST, true);
+						curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($curl_post_data));
+
+						$result = curl_exec($ch);
+						$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+						curl_close($ch);
+
+						$jsonresult = json_decode($result);
+						if(isset($jsonresult->error) && $jsonresult->error==1)
+						{
+							$return = false;
+							$errormsg = $jsonresult->retval;
+						}
+						else
+						{
+							$return = true;
+						}
+					}
+					else
+					{
+						$return = false;
+						$errormsg = $rolle->errormsg;
+					}
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $rolle->errormsg;
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saverolle')
+	{
+		//Prestudentrolle speichern
+		if(!$error)
+		{
+			if(isset($_POST['prestudent_id']))
+			{
+				$rolle = new prestudent();
+				if(!$rolle->load($_POST['prestudent_id']))
+				{
+					$error = true;
+					$errormsg = 'Prestudent wurde nicht gefunden';
+				}
+				else
+				{
+					//Berechtigung pruefen
+					if(!$rechte->isBerechtigt('assistenz',$rolle->studiengang_kz,'suid') &&
+					   !$rechte->isBerechtigt('admin',$rolle->studiengang_kz, 'suid'))
+					{
+						$error = true;
+						$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+					}
+				}
+
+				$rolle = new prestudent();
+				$rolle->prestudent_id = $_POST['prestudent_id'];
+
+				if(!$error)
+				{
+					if(($_POST['studiensemester_old']=='') || (!$rolle->load_rolle($_POST['prestudent_id'], $_POST['status_kurzbz'], $_POST['studiensemester_old'], $_POST['ausbildungssemester_old'])))
+					{
+						$rolle->new = true;
+						$rolle->insertamum = date('Y-m-d H:i:s');
+						$rolle->insertvon = $user;
+						$rolle->status_kurzbz = $_POST['status_kurzbz'];
+						$rolle->bestaetigtam = date('Y-m-d');
+						$rolle->bestaetigtvon = $user;
+
+						if($_POST['status_kurzbz']=='Student')
+						{
+							//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
+							$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
+							if($result = $db->db_query($qry))
+							{
+								if($row = $db->db_fetch_object($result))
+								{
+									if($row->anzahl==0)
+									{
+										$error = true;
+										$errormsg = 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student".';
+										$return = false;
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						$rolle->ausbildungssemester_old = $_POST['ausbildungssemester_old'];
+						$rolle->studiensemester_old = $_POST['studiensemester_old'];
+						$rolle->updateamum = date('Y-m-d H:i:s');
+						$rolle->updatevon = $user;
+						$rolle->new = false;
+					}
+
+					if(!$error)
+					{
+						// Bei Studenten wird der Studentlehrverband Eintrag angelegt/korrigiert
+						$student = new student();
+						if($temp_uid = $student->getUid($rolle->prestudent_id))
+						{
+							if(in_array($rolle->status_kurzbz,array('Student','Diplomand','Absovlent','Incoming','Abbrecher','Unterbrecher')))
+							{
+								if($student->load($temp_uid))
+								{
+									$stdsem_new = filter_input(INPUT_POST, "studiensemester_kurzbz");
+									$semester = filter_input(INPUT_POST, "ausbildungssemester");
+
+									if($student->load_studentlehrverband($temp_uid, $stdsem_new))
+										$student->new=false;
+									else
+										$student->new=true;
+
+									$lehrverband = new lehrverband();
+									if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
+									{
+										$student->studiensemester_kurzbz = $stdsem_new;
+										$return = false;
+										$errormsg = $student->errormsg;
+									}
+									else
+									{
+										$student->studiensemester_kurzbz = $stdsem_new;
+										$student->semester = $semester;
+										$student->updatevon = $user;
+									}
+
+									$student->save_studentlehrverband();
+								}
+							}
+						}
+
+						$rolle->ausbildungssemester = $_POST['ausbildungssemester'];
+						$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
+						$rolle->datum = $_POST['datum'];
+						$rolle->bestaetigtam = $_POST['bestaetigtam'];
+						if($_POST['bestaetigtam']=='')
+							$rolle->bestaetigtvon = null;
+
+						$rolle->bewerbung_abgeschicktamum = $_POST['bewerbung_abgeschicktamum'];
+						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
+						$rolle->studienplan_id = $_POST['studienplan_id'];
+						$rolle->anmerkung_status = $_POST['anmerkung'];
+						$rolle->rt_stufe = $_POST['rt_stufe'];
+						$rolle->statusgrund_id = $_POST['statusgrund_id'];
+
+						if($rolle->save_rolle())
+							$return = true;
+						else
+						{
+							$return = false;
+							$errormsg = $rolle->errormsg;
+						}
+					}
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Prestudent_id muss angegeben werden';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='rolleVorruecken')
+	{
+		$errormsg='';
+		//Prestudentrolle speichern
+		if(!$error)
+		{
+			if(isset($_POST['prestudent_id']))
+			{
+				$rolle = new prestudent();
+				if(!$rolle->load($_POST['prestudent_id']))
+				{
+					$error = true;
+					$errormsg = 'Prestudent wurde nicht gefunden';
+				}
+				else
+				{
+					//Berechtigung pruefen
+					if(!$rechte->isBerechtigt('assistenz',$rolle->studiengang_kz,'suid') &&
+					   !$rechte->isBerechtigt('admin',$rolle->studiengang_kz, 'suid'))
+					{
+						$error = true;
+						$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+					}
+				}
+
+				$rolle = new prestudent();
+				$rolle->prestudent_id = $_POST['prestudent_id'];
+
+				if(!$error)
+				{
+					$studiensem = new studiensemester();
+					$stdsem = $studiensem->getNextFrom($_POST["studiensemester_kurzbz"]);
+//					$stdsem = ($stdesm==false ? $_POST["studiensemester_kurzbz"]:$stdsem);
+					$semester = $_POST["ausbildungssemester"];
+					$semester++;
+					if((!$rolle->load_rolle($_POST['prestudent_id'], $_POST['status_kurzbz'], $stdsem, $semester)))
+					{
+						$rolle->new = true;
+						$rolle->insertamum = date('Y-m-d H:i:s');
+						$rolle->insertvon = $user;
+						$rolle->status_kurzbz = $_POST['status_kurzbz'];
+						$rolle->bestaetigtam = date('Y-m-d');
+						$rolle->bestaetigtvon = $user;
+
+						if($_POST['status_kurzbz']=='Student')
+						{
+							//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
+							$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
+							if($result = $db->db_query($qry))
+							{
+								if($row = $db->db_fetch_object($result))
+								{
+									if($row->anzahl==0)
+									{
+										$error = true;
+										$errormsg = 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student".';
+										$return = false;
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						//Rolle existiert bereits
+						$error = true;
+						$errormsg = "Rolle existiert bereits.";
+						$return = false;
+					}
+
+					$student = new student();
+					$temp_uid = $student->getUid($rolle->prestudent_id);
+
+					if(!$error)
+					{
+						$student->load_studentlehrverband($temp_uid, $_POST["studiensemester_kurzbz"]);
+						$lehrverband = new lehrverband();
+						if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
+						{
+							$student->studiensemester_kurzbz = $stdsem;
+							$return = false;
+							$errormsg = $student->errormsg;
+						}
+						else
+						{
+							$student->studiensemester_kurzbz = $stdsem;
+							$student->semester = $semester;
+						}
+
+						$student->save_studentlehrverband(true);
+						$rolle->ausbildungssemester = $semester;
+						$rolle->studiensemester_kurzbz = $stdsem;
+						$rolle->datum = date("Y-m-d");
+						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
+						$rolle->studienplan_id = $_POST['studienplan_id'];
+
+						if($rolle->save_rolle())
+						{
+							$return = true;
+						}
+						else
+						{
+							$return = false;
+							$errormsg = $rolle->errormsg;
+						}
+					}
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Prestudent_id muss angegeben werden';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='BewerberZuStudent')
+	{
+		// macht aus einem Bewerber einen Studenten
+		// Voraussetzungen:
+		// - ZGV muss ausgefuellt sein (bei Master beide)
+		// - Kaution muss bezahlt sein
+		// - Rolle Bewerber muss existieren
+		// Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
+		// und UID generiert und der Studentendatensatz angelegt.
+		$errormsg='';
+		if(!$error)
+		{
+			if(isset($_POST['prestudent_id']))
+			{
+				$prestudent_ids = explode(';', $_POST['prestudent_id']);
+				$anzahl_fehler=0;
+				foreach ($prestudent_ids as $prestudent_id)
+				{
+					$error = false;
+					if($prestudent_id!='')
+					{
+
+						$prestd = new prestudent();
+						if($prestd->load($prestudent_id))
+						{
+							//Berechtigung pruefen
+							if(!$rechte->isBerechtigt('assistenz',$prestd->studiengang_kz,'suid') &&
+							   !$rechte->isBerechtigt('admin',$prestd->studiengang_kz, 'suid'))
+							{
+								$error = true;
+								$errormsg .= "\n$prestd->vorname $prestd->nachname: Sie haben keine Schreibrechte fuer diesen Studiengang";
+								$anzahl_fehler++;
+							}
+
+							if(!$error)
+							{
+								if((!defined("ZGV_CHECK") && $prestd->zgv_code!='') || (defined("ZGV_CHECK") && ZGV_CHECK == false) || (defined("ZGV_CHECK") && ZGV_CHECK == true && $prestd->zgv_code!=''))
+								{
+									$stg = new studiengang();
+									$stg->load($prestd->studiengang_kz);
+
+									if((defined("ZGV_CHECK") && ZGV_CHECK == true && $stg->typ=='m' && $prestd->zgvmas_code=='') || (!defined("ZGV_CHECK") && $stg->typ=='m' && $prestd->zgvmas_code==''))
+									{
+										$return = false;
+										$errormsg .= "\n$prestd->vorname $prestd->nachname: ZGV Master muss eingegeben werden";
+										$anzahl_fehler++;
+									}
+									else
+									{
+										//Pruefen ob die Rolle Bewerber existiert
+										$hlp = new prestudent();
+										$hlp->getPrestudentRolle($prestudent_id, 'Bewerber',null,'datum DESC, insertamum DESC');
+
+										if(count($hlp->result)>0)
+										{
+											$aufgenommener = new prestudent();
+											$aufgenommener ->getPrestudentRolle($prestudent_id, 'Aufgenommener', null,'datum DESC, insertamum DESC');
+
+											if(count($aufgenommener->result)>0)
+											{
+												if($hlp->result[0]->studiensemester_kurzbz==$aufgenommener->result[0]->studiensemester_kurzbz
+												   && $hlp->result[0]->ausbildungssemester==$aufgenommener->result[0]->ausbildungssemester)
+												{
+													//pruefen ob schon eine Studentenrolle Existiert
+													$hlp1 = new prestudent();
+													$hlp1->getPrestudentRolle($prestudent_id, 'Student', $aufgenommener->result[0]->studiensemester_kurzbz);
+													if(count($hlp1->result)>0)
+													{
+														$return = false;
+														$errormsg .= "\n$prestd->vorname $prestd->nachname: Diese Person ist bereits Student";
+														$anzahl_fehler++;
+													}
+													else
+													{
+														$db->db_query('BEGIN;');
+
+														//Matrikelnummer und UID generieren
+														$matrikelnr = generateMatrikelnummer($prestd->studiengang_kz, $aufgenommener->result[0]->studiensemester_kurzbz);
+														$jahr = substr($matrikelnr,0, 2);
+														$stg = $prestd->studiengang_kz;
+														$stg_obj = new studiengang();
+														$stg_obj->load(ltrim($stg,'0'));
+														$uid = generateUID($stg_obj->kurzbz,$jahr,$stg_obj->typ,$matrikelnr);
+														$matrikelnummer = generateMatrikelnr($stg_obj->oe_kurzbz);
+
+														if($matrikelnummer != null)
+														{
+															$qry = "UPDATE public.tbl_person SET matr_nr=".$db->db_add_param($matrikelnummer)." WHERE person_id=".$db->db_add_param($prestd->person_id, FHC_INTEGER).' AND matr_nr is null';
+															$db->db_query($qry);
+														}
+
+														if(defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN)
+														{
+															$matrikelnr = $uid;
+														}
+
+														if(defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER)
+														{
+															$qry = "UPDATE public.tbl_person SET matr_nr=".$db->db_add_param($uid)." WHERE person_id=".$db->db_add_param($prestd->person_id, FHC_INTEGER).' AND matr_nr is null';
+															$db->db_query($qry);
+														}
+														//Benutzerdatensatz anlegen
+														$benutzer = new benutzer();
+														$benutzer->uid = $uid;
+														$benutzer->person_id = $prestd->person_id;
+														$benutzer->aktiv = true;
+														$benutzer->aktivierungscode = generateActivationKey();
+
+														$nachname_clean = mb_strtolower(convertProblemChars($prestd->nachname));
+														$vorname_clean = mb_strtolower(convertProblemChars($prestd->vorname));
+														$nachname_clean = str_replace(' ','_', $nachname_clean);
+														$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+														if(!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT===true)
+														{
+															$qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER(".$db->db_add_param($vorname_clean.".".$nachname_clean).")";
+															$result_alias = $db->db_query($qry_alias);
+															if($db->db_num_rows($result_alias)==0)
+																$benutzer->alias = $vorname_clean.'.'.$nachname_clean;
+															else
+																$benutzer->alias = '';
+														}
+														else
+															$benutzer->alias='';
+
+														$benutzer->insertamum = date('Y-m-d H:i:s');
+														$benutzer->insertvon = $user;
+
+														if($benutzer->save(true, false))
+														{
+															//Studentendatensatz anlegen
+															$student = new student();
+															$student->uid = $uid;
+															$student->matrikelnr = $matrikelnr;
+															$student->prestudent_id = $prestd->prestudent_id;
+															$student->studiengang_kz = $prestd->studiengang_kz;
+															$student->semester = $aufgenommener->result[0]->ausbildungssemester;
+															$student->verband = ' ';
+															$student->gruppe = ' ';
+															$student->insertamum = date('Y-m-d H:i:s');
+															$student->insertvon = $user;
+
+															//Pruefen ob der Lehrverband exisitert, falls nicht dann anlegen
+															$lehrverband = new lehrverband();
+															if(!$lehrverband->load($student->studiengang_kz, $student->semester, $student->verband, $student->gruppe))
+															{
+																$lehrverband->studiengang_kz = $student->studiengang_kz;
+																$lehrverband->semester = $student->semester;
+																$lehrverband->verband = $student->verband;
+																$lehrverband->gruppe = $student->gruppe;
+																$lehrverband->aktiv = true;
+																if(!$lehrverband->save(true))
+																{
+																	$error = true;
+																	$errormsg = 'Fehler beim Speichern des Lehrverbandes';
+																	$return = false;
+																}
+															}
+
+															if(!$error)
+															{
+																if($student->save(true, false))
+																{
+																	//Prestudentrolle hinzugfuegen
+																	$rolle = new prestudent();
+																	$rolle->prestudent_id = $prestd->prestudent_id;
+																	$rolle->status_kurzbz = 'Student';
+																	$rolle->studiensemester_kurzbz = $aufgenommener->result[0]->studiensemester_kurzbz;
+																	$rolle->ausbildungssemester = $aufgenommener->result[0]->ausbildungssemester;
+																	$rolle->orgform_kurzbz = $aufgenommener->result[0]->orgform_kurzbz;
+																	$rolle->studienplan_id = $aufgenommener->result[0]->studienplan_id;
+																	$rolle->datum = date('Y-m-d');
+																	$rolle->insertamum = date('Y-m-d H:i:s');
+																	$rolle->insertvon = $user;
+																	$rolle->bestaetigtam = date('Y-m-d');
+																	$rolle->bestaetigtvon = $user;
+																	if(isset($_POST['statusgrund_id']))
+																		$rolle->statusgrund_id = $_POST['statusgrund_id'];
+																	$rolle->new = true;
+
+																	if($rolle->save_rolle())
+																	{
+																		//StudentLehrverband anlegen
+																		$studentlehrverband = new student();
+																		$studentlehrverband->uid = $uid;
+																		$studentlehrverband->studiensemester_kurzbz = $aufgenommener->result[0]->studiensemester_kurzbz;
+																		$studentlehrverband->studiengang_kz = $prestd->studiengang_kz;
+																		$studentlehrverband->semester = $aufgenommener->result[0]->ausbildungssemester;
+																		$studentlehrverband->verband = ' ';
+																		$studentlehrverband->gruppe = ' ';
+																		$studentlehrverband->insertamum = date('Y-m-d H:i:s');
+																		$studentlehrverband->insertvon = $user;
+
+																		if($studentlehrverband->save_studentlehrverband(true))
+																		{
+																			$return = true;
+																			$db->db_query('COMMIT;');
+																		}
+																		else
+																		{
+																			$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Studentlehrverbandes: ".$studentlehrverband->errormsg;
+																			$return = false;
+																			$anzahl_fehler++;
+																			$db->db_query('ROLLBACK;');
+																		}
+																	}
+																	else
+																	{
+																		$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Rolle: ".$rolle->errormsg;
+																		$return = false;
+																		$anzahl_fehler++;
+																		$db->db_query('ROLLBACK;');
+																	}
+																}
+																else
+																{
+																	$errormsg .= "\n$prestd->vorname $prestd->nachname: Fehler beim Speichern des Studenten: ".$student->errormsg;
+																	$return = false;
+																	$anzahl_fehler++;
+																	$db->db_query('ROLLBACK;');
+																}
+															}
+														}
+														else
+														{
+															$errormsg .= "\n$prestd->vorname $prestd->nachname $matrikelnr: Fehler beim Speichern des Benutzers: ".$benutzer->errormsg;
+															$return = false;
+															$anzahl_fehler++;
+															$db->db_query('ROLLBACK;');
+														}
+													}
+												}
+												else
+												{
+													$return = false;
+													$errormsg .= "\n$prestd->vorname $prestd->nachname: Das Studiensemester oder Ausbildungsemester des Berwerberstatus und des Aufgenommenenstatus passen nicht überein";
+													$anzahl_fehler++;
+												}
+											}
+											else
+											{
+												$return = false;
+												$errormsg .= "\n$prestd->vorname $prestd->nachname: Die Person muss zuerst Aufgenommener sein bevor Sie zum Studenten gemacht werden kann";
+												$anzahl_fehler++;
+											}
+										}
+										else
+										{
+											$return = false;
+											$errormsg .= "\n$prestd->vorname $prestd->nachname: Die Person muss zuerst Bewerber sein bevor Sie zum Studenten gemacht werden kann";
+											$anzahl_fehler++;
+										}
+									}
+								}
+								else
+								{
+									$return = false;
+									$errormsg .= "\n$prestd->vorname $prestd->nachname: ZGV muss eingegeben werden";
+									$anzahl_fehler++;
+								}
+							}
+						}
+						else
+						{
+							$return = false;
+							$errormsg .= "\nPrestudent wurde nicht gefunden zu $prestudent_id";
+						}
+					}
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Prestudent_id muss angegeben werden';
+			}
+
+			if($anzahl_fehler>0)
+			{
+				$return = false;
+				$errormsg = "Es sind $anzahl_fehler Fehler aufgetreten: ".$errormsg;
+			}
+			else
+			{
+				$return = true;
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='gruppenzuteilung')
+	{
+		if(isset($_POST['uid']) && isset($_POST['gruppe_kurzbz']))
+		{
+			$gruppe = new gruppe();
+			if(!$gruppe->load($_POST['gruppe_kurzbz']))
+			{
+				$error = true;
+				$errormsg='Gruppe wurde nicht gefunden';
+			}
+			else
+			{
+				//Berechtigung pruefen
+				if(!$rechte->isBerechtigt('assistenz',$gruppe->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$gruppe->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$errormsg = 'Sie haben keine Schreibrechte fuer diese Gruppe';
+				}
+			}
+			$benutzergruppe = new benutzergruppe();
+
+			$uids = explode(';',$_POST['uid']);
+			$errormsg = '';
+			foreach ($uids as $uid)
+			{
+				if($uid!='')
+				{
+					if($_POST['gruppe_kurzbz']!='')
+					{
+						//Zuteilung zu einer Spezialgruppe
+
+						if(!$benutzergruppe->load($uid, $_POST['gruppe_kurzbz']))
+						{
+							$benutzergruppe->uid = $uid;
+							$benutzergruppe->gruppe_kurzbz = $_POST['gruppe_kurzbz'];
+							$benutzergruppe->studiensemester_kurzbz = $semester_aktuell;
+							$benutzergruppe->insertamum = date('Y-m-d H:i:s');
+							$benutzergruppe->insertvon = $user;
+							$benutzergruppe->new = true;
+
+							if(!$benutzergruppe->save())
+							{
+								$errormsg .= "$uid konnte nicht hinzugefuegt werden\n";
+							}
+						}
+						else
+							$errormsg .= "Der Student $uid ist bereits im $benutzergruppe->studiensemester_kurzbz dieser Gruppe zugeteilt. Entfernen Sie vorher diese Zuteilung.\n";
+					}
+					else
+					{
+						//Zuteilung zu einer Lehrverbandsgruppe
+						$error = false;
+						$stsem = new studiensemester();
+						$stsem_kurzbz = $stsem->getaktorNext();
+
+						//Schauen ob die Lehrverbandsgruppe existiert
+						$lehrverband = new lehrverband();
+						if(!$lehrverband->exists($_POST['stg_kz'],$_POST['semester'],$_POST['verband'], $_POST['gruppe']))
+						{
+							$errormsg .= 'Die angegebene Lehrverbandsgruppe existiert nicht!';
+							$return = false;
+							$error = true;
+						}
+
+						//Wenn das ausgewaehlte Semester das aktuelle ist, dann wird auch in der
+						//Tabelle Student der Stg/Semester/Verband/Gruppe geaendert.
+						//Sonst nur in der Tabelle Studentlehrverband
+						if($semester_aktuell == $stsem_kurzbz)
+						{
+							//Eintrag in der Tabelle Student aendern
+							$student = new student();
+
+							if(!$student->load($uid))
+							{
+								$errormsg .= 'Fehler beim Laden des Studenten';
+								$error = true;
+								$return = false;
+							}
+
+							if($student->studiengang_kz!=$_POST['stg_kz'])
+							{
+								$errormsg.='Ein Student kann nicht in eine Lehrverbandsgruppe eines anderen Studienganges verschoben werden';
+								$return = false;
+								$error = true;
+							}
+
+							if(!$error)
+							{
+								$student->studiengang_kz = $_POST['stg_kz'];
+								$student->semester = $_POST['semester'];
+								$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+								$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+								$student->new=false;
+
+								if(!$student->save())
+								{
+									$errormsg .= 'Fehler beim Speichern des Studenteneintrages';
+									$return = false;
+									$error = true;
+								}
+							}
+						}
+
+						if(!$error)
+						{
+							//Eintrag in der Tabelle Student aendern
+							$student = new student();
+
+							if(!$student->load($uid))
+							{
+								$errormsg .= 'Fehler beim Laden des Studenten';
+								$error = true;
+								$return = false;
+							}
+
+							if($student->studiengang_kz!=$_POST['stg_kz'])
+							{
+								$errormsg.='Ein Student kann nicht in eine Lehrverbandsgruppe eines anderen Studienganges verschoben werden';
+								$return = false;
+								$error = true;
+							}
+
+							if(!$error)
+							{
+								//Eintrag in der Tabelle Studentlehrverband aendern
+								$student_lvb = new student();
+
+								if($student_lvb->studentlehrverband_exists($uid, $semester_aktuell))
+									$student_lvb->new = false;
+								else
+									$student_lvb->new = true;
+
+								$student_lvb->uid = $uid;
+								$student_lvb->studiensemester_kurzbz = $semester_aktuell;
+								$student_lvb->studiengang_kz = $_POST['stg_kz'];
+								$student_lvb->semester = $_POST['semester'];
+								$student_lvb->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+								$student_lvb->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+								$student_lvb->updateamum = date('Y-m-d H:i:s');
+								$student_lvb->updatevon = $user;
+
+								if($student_lvb->save_studentlehrverband())
+								{
+									$return = true;
+									$error=false;
+								}
+								else
+								{
+									$error = true;
+									$errormsg .= $student_lvb->errormsg;
+									$return = false;
+								}
+							}
+						}
+					}
+				}
+			}
+			if($errormsg=='')
+				$return = true;
+			else
+				$return = false;
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteGruppenzuteilung')
+	{
+		if(isset($_POST['uid']) && isset($_POST['gruppe_kurzbz']))
+		{
+			$gruppe = new gruppe();
+			if($gruppe->load($_POST['gruppe_kurzbz']))
+			{
+				$uids = explode(';',$_POST['uid']);
+				$errormsg = '';
+				foreach ($uids as $uid)
+				{
+					if($uid!='')
+					{
+						$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($uid);
+						if($result = $db->db_query($qry))
+						{
+							if($row = $db->db_fetch_object($result))
+							{
+								//Berechtigung pruefen
+								if(!$rechte->isBerechtigt('assistenz',$gruppe->studiengang_kz,'suid') &&
+								   !$rechte->isBerechtigt('admin',$gruppe->studiengang_kz, 'suid') &&
+								   !$rechte->isBerechtigt('admin',$row->studiengang_kz, 'suid') &&
+								   !$rechte->isBerechtigt('assistenz',$row->studiengang_kz, 'suid'))
+								{
+									$error = true;
+									$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+								}
+
+								if(!$error)
+								{
+									$benutzergruppe = new benutzergruppe();
+
+									if(!$benutzergruppe->delete($uid, $_POST['gruppe_kurzbz']))
+									{
+										$errormsg .= "$uid konnte nicht aus der Gruppe geloescht werden\n";
+									}
+								}
+							}
+							else
+								$errormsg .= "Studiengang von $uid konnte nicht ermittelt werden\n";
+						}
+						else
+							$errormsg .= "Studiengang von $uid konnte nicht ermittelt werden\n";
+					}
+				}
+				if($errormsg=='')
+					$return = true;
+				else
+					$return = false;
+			}
+			else
+			{
+				$return = false;
+				$errormsg = "Gruppe wurde nicht gefunden";
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteAkte')
+	{
+		if(isset($_POST['akte_id']) && is_numeric($_POST['akte_id']))
+		{
+			//Berechtigung pruefen
+			if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+			   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+			{
+				$error = true;
+				$return = false;
+				$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+			}
+			if(!$error)
+			{
+				$akte = new akte();
+
+				if($akte->delete($_POST['akte_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $akte->errormsg;
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe'.$_POST['akte_id'];
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savebuchung') // ***** KONTO *****
+	{
+		//Speichert eine Buchung
+		if(isset($_POST['buchungsnr']) && is_numeric($_POST['buchungsnr']))
+		{
+			$buchung = new konto();
+
+			if($buchung->load($_POST['buchungsnr']))
+			{
+				if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+				}
+				else
+				{
+					$buchung->betrag = $_POST['betrag'];
+					$buchung->buchungsdatum = $_POST['buchungsdatum'];
+					$buchung->buchungstext = $_POST['buchungstext'];
+					$buchung->mahnspanne = $_POST['mahnspanne'];
+					$buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz'];
+					$buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
+					$buchung->studiengang_kz = $_POST['studiengang_kz'];
+					$buchung->credit_points = $_POST['credit_points'];
+					$buchung->new = false;
+					$buchung->updateamum = date('Y-m-d H:i:s');
+					$buchung->updatevon = $user;
+					$buchung->anmerkung = $_POST['anmerkung'];
+
+					if($buchung->save())
+					{
+						$return = true;
+					}
+					else
+					{
+						$return = false;
+						$errormsg = 'Fehler beim Speichern:'.$buchung->errormsg;
+					}
+				}
+			}
+			else
+			{
+				$errormsg = 'Buchung wurde nicht gefunden:'.$_POST['buchungsnr'];
+				$return = false;
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe'.$_POST['buchungsnr'];
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savegegenbuchung')
+	{
+		//Speichert eine Buchung
+		if(isset($_POST['buchungsnr']))
+		{
+			$bnr_arr = explode(';',$_POST['buchungsnr']);
+			$gegenbuchungsdatum = filter_input(INPUT_POST, "gegenbuchungsdatum");
+			if(strlen($gegenbuchungsdatum) != 0)
+			{
+				$gegenbuchungsdatum = date("Y-m-d", strtotime($gegenbuchungsdatum));
+			}
+			else
+			{
+				$gegenbuchungsdatum = date('Y-m-d');
+			}
+
+			$errormsg='';
+			foreach ($bnr_arr as $buchungsnr)
+			{
+				if(is_numeric($buchungsnr))
+				{
+					$buchung = new konto();
+
+					if($buchung->load($buchungsnr))
+					{
+						//Berechtigung pruefen
+						if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
+						   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
+						{
+							$error = true;
+							$return = false;
+							$errormsg = "\nSie haben keine Schreibrechte fuer diese Buchung";
+						}
+						else
+						{
+							if($buchung->buchungsnr_verweis=='')
+							{
+								$kto = new konto();
+								//$buchung->betrag*(-1);
+								$buchung->betrag = $kto->getDifferenz($buchungsnr);
+								$buchung->buchungsdatum = $gegenbuchungsdatum;
+								$buchung->mahnspanne = '0';
+								$buchung->buchungsnr_verweis = $buchung->buchungsnr;
+								$buchung->new = true;
+								$buchung->insertamum = date('Y-m-d H:i:s');
+								$buchung->insertvon = $user;
+								$buchung->anmerkung = '';
+
+								if($buchung->save())
+								{
+									//$data = $buchung->buchungsnr;
+									$return = true;
+								}
+								else
+								{
+									$return = false;
+									$errormsg .= "\n".'Fehler beim Speichern:'.$buchung->errormsg;
+								}
+							}
+							else
+							{
+								$return = false;
+								$errormsg .= "\n".'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden';
+							}
+						}
+					}
+					else
+					{
+						$errormsg .= "\n".'Buchung wurde nicht gefunden';
+						$return = false;
+					}
+				}
+				if($errormsg!='')
+				{
+					$return = false;
+				}
+				else
+				{
+					$return = true;
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletebuchung')
+	{
+		//Loescht eine Buchung
+		if(isset($_POST['buchungsnr']) && is_numeric($_POST['buchungsnr']))
+		{
+			$buchung = new konto();
+
+			if($buchung->load($_POST['buchungsnr']))
+			{
+				if(!$rechte->isBerechtigt('assistenz',$buchung->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$buchung->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+				}
+				else
+				{
+					if($buchung->delete($_POST['buchungsnr']))
+					{
+						$return = true;
+					}
+					else
+					{
+						$errormsg = $buchung->errormsg;
+						$return = false;
+					}
+				}
+			}
+			else
+			{
+				$errormsg = 'Buchung wurde nicht gefunden';
+				$return = false;
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='neuebuchung')
+	{
+		//Speichert eine neue Buchung
+		//Gleichzeitiges speichern mehrerer Personen ist moeglich
+		//Personen werden durch ';' getrennt
+		$person_ids = explode(';',$_POST['person_ids']);
+		$errormsg = '';
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+		else
+		{
+			foreach ($person_ids as $person_id)
+			{
+				if($person_id!='')
+				{
+					$buchung = new konto();
+					$buchung->person_id = $person_id;
+					$buchung->studiengang_kz = $_POST['studiengang_kz'];
+					$buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
+					$buchung->buchungsnr_verweis='';
+					$buchung->betrag = $_POST['betrag'];
+					$buchung->buchungsdatum = $_POST['buchungsdatum'];
+					$buchung->buchungstext = $_POST['buchungstext'];
+					$buchung->mahnspanne = $_POST['mahnspanne'];
+					$buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz'];
+					$buchung->credit_points = $_POST["credit_points"];
+					$buchung->insertamum = date('Y-m-d H:i:s');
+					$buchung->insertvon = $user;
+					$buchung->anmerkung = $_POST['anmerkung'];
+					$buchung->new = true;
+
+					if($buchung->save())
+					{
+						$data = $buchung->buchungsnr;
+					}
+					else
+					{
+						$errormsg .= "Fehler beim Speichern: $buchung->errormsg\n";
+					}
+				}
+			}
+		}
+		if($errormsg=='')
+			$return = true;
+		else
+			$return = false;
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentadd')
+	{
+		//Speichert die Zuordnung von Dokumenten zu einem Prestudent
+		//Gleichzeitiges zuteilen mehrerer Dokumente auf einmal ist moeglich
+		//Dokumente werden durch ';' getrennt uebergeben
+
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+		else
+		{
+			$dokumente = explode(';',$_POST['dokumente']);
+			$errormsg = '';
+			foreach ($dokumente as $dokument_kurzbz)
+			{
+				if($dokument_kurzbz!='')
+				{
+					$dok = new dokument();
+					$dok->dokument_kurzbz = $dokument_kurzbz;
+					$dok->prestudent_id = $_POST['prestudent_id'];
+					$dok->mitarbeiter_uid = $user;
+					$dok->datum = date('Y-m-d');
+					$dok->insertamum = date('Y-m-d H:i:s');
+					$dok->insertvon = $user;
+					$dok->new = true;
+
+					if(!$dok->save())
+					{
+						$errormsg .= "Fehler bei $dokument_kurzbz: $dok->errormsg\n";
+					}
+				}
+			}
+			if($errormsg=='')
+				$return = true;
+			else
+				$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentDetailSave')
+	{
+		//Speichert die Zuordnung von Dokumenten zu einem Prestudent
+		//Gleichzeitiges zuteilen mehrerer Dokumente auf einmal ist moeglich
+		//Dokumente werden durch ';' getrennt uebergeben
+
+		if(!$rechte->isBerechtigt('assistenz',null,'suid') &&
+		   !$rechte->isBerechtigt('admin',null, 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+		else
+		{
+			$akte_id = $_POST['akte_id'];
+			$errormsg = '';
+			$akte = new akte();
+			if($akte->load($akte_id))
+			{
+				$akte->new=false;
+				$akte->anmerkung_intern = $_POST['anmerkung_intern'];
+				$akte->titel_intern = $_POST['titel_intern'];
+				$akte->dokument_kurzbz = $_POST['dokument_kurzbz'];
+				$akte->nachgereicht_am = $_POST['nachgereicht_am'];
+				$akte->updateamum = date('Y-m-d H:i:s');
+				$akte->updatevon = $user;
+
+				if(!$akte->save())
+				{
+					$errormsg='Speichern fehlgeschlagen:'.$akte->errormsg;
+				}
+			}
+
+			if($errormsg=='')
+				$return = true;
+			else
+				$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentDeleteDokument')
+	{
+		$prestudent_id = $_POST['prestudent_id'];
+		$prestudent = new prestudent();
+		if($prestudent->load($prestudent_id))
+		{
+			$studiengang = new studiengang();
+			$studiengang->load($prestudent->studiengang_kz);
+
+			if(!$rechte->isBerechtigt('assistenz',$studiengang->oe_kurzbz,'suid') &&
+			   !$rechte->isBerechtigt('admin',$studiengang->oe_kurzbz, 'suid'))
+			{
+				$error = true;
+				$return = false;
+				$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+			}
+			else
+			{
+
+				$akte_id = $_POST['akte_id'];
+				$errormsg = '';
+				$akte = new akte();
+				if($akte->load($akte_id))
+				{
+					if($akte->person_id==$prestudent->person_id)
+					{
+						if($akte->dms_id!='')
+						{
+							$dms = new dms();
+							if($dms->load($akte->dms_id))
+							{
+								if($akte->delete($akte_id))
+								{
+									// Eintrag im DMS loeschen
+									if(!$dms->deleteDms($akte->dms_id))
+									{
+										$error=true;
+										$errormsg='Fehler beim Loeschen des Dokuments';
+									}
+									else
+									{
+										// Log schreiben
+										$logdata_dms = (array)$dms;
+										$logdata = var_export($logdata_dms, true);
+										$log = new log();
+										$log->executetime = date('Y-m-d H:i:s');
+										$log->mitarbeiter_uid = $user;
+										$log->beschreibung = "Löschen der DMS_ID ".$akte->dms_id;
+										$log->sql = 'LogData:'.$logdata;
+										$log->sqlundo = '';
+										$log->save(true);
+									}
+									// Log schreiben
+									$logdata_akte = (array)$akte;
+									$logdata = var_export($logdata_akte, true);
+									$log = new log();
+									$log->executetime = date('Y-m-d H:i:s');
+									$log->mitarbeiter_uid = $user;
+									$log->beschreibung = "Löschen der Akte '".$akte->dokument_kurzbz."' ID '".$akte_id."'";
+									$log->sql = 'DELETE FROM public.tbl_akte WHERE akte_id='.$db->db_add_param($akte_id, FHC_INTEGER).'; LogData:'.$logdata;
+									$log->sqlundo = '';
+									$log->save(true);
+								}
+								else
+								{
+									$error=true;
+									$errormsg='Fehler beim Loeschen der Akte';
+								}
+							}
+							else
+							{
+								$error=true;
+								$errormsg='Fehler beim Laden des Dokuments';
+							}
+						}
+						// Wenn kein Dokument im DMS vorhanden ist, aber die akte auf "wird nachgereicht" gesetzt ist
+						// darf das Dokument auch gelöscht werden
+						elseif($akte->nachgereicht === true && $akte->inhalt == '')
+						{
+							if($akte->delete($akte_id))
+							{
+								// Log schreiben
+								$logdata_akte = (array)$akte;
+								$logdata = var_export($logdata_akte, true);
+								$log = new log();
+								$log->executetime = date('Y-m-d H:i:s');
+								$log->mitarbeiter_uid = $user;
+								$log->beschreibung = "Löschen der Nachreichung der Akte '".$akte->dokument_kurzbz."' ID '".$akte_id."'";
+								$log->sql = 'DELETE FROM public.tbl_akte WHERE akte_id='.$db->db_add_param($akte_id, FHC_INTEGER).'; LogData:'.$logdata;
+								$log->sqlundo = '';
+								$log->save(true);
+							}
+							else
+							{
+								$error=true;
+								$errormsg='Fehler beim Loeschen der Akte';
+							}
+						}
+						else
+						{
+							$error=true;
+							$errormsg='Dieses Dokument darf hier nicht geloescht werden';
+						}
+					}
+					else
+					{
+						$error=true;
+						$errormsg='Akte und Prestudent passen nicht zusammen';
+					}
+				}
+
+				if($errormsg=='')
+					$return = true;
+				else
+					$return = false;
+			}
+		}
+		else
+		{
+			$errormsg='Prestudent konnte nicht geladen werden';
+			$error=true;
+			$return=false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='dokumentprestudentdel')
+	{
+		//Loescht die Zuordnung von Dokumenten zu einem Prestudent
+		//Gleichzeitiges loeschen mehrerer Dokumente auf einmal ist moeglich
+		//Dokumente werden durch ';' getrennt uebergeben
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
+		}
+		else
+		{
+			$dokumente = explode(';',$_POST['dokumente']);
+			$errormsg = '';
+			foreach ($dokumente as $dokument_kurzbz)
+			{
+				if($dokument_kurzbz!='')
+				{
+					$dok = new dokument();
+					if($dok->load($dokument_kurzbz, $_POST['prestudent_id']))
+					{
+						if($dok->mitarbeiter_uid==$user || $rechte->isBerechtigt('student/dokumente',$_POST['studiengang_kz'], 'suid'))
+						{
+							if(!$dok->delete($dokument_kurzbz, $_POST['prestudent_id']))
+							{
+								$errormsg .= "Fehler bei $dokument_kurzbz: $dok->errormsg\n";
+							}
+						}
+						else
+						{
+							$errormsg.="Fehler bei $dokument_kurzbz: Loeschen nur durch $dok->mitarbeiter_uid moeglich\n";
+						}
+					}
+					else
+					{
+						$errormsg.="Dokumentenzuteilung existiert nicht: $dokument_kurzbz\n";
+					}
+				}
+			}
+			if($errormsg=='')
+				$return = true;
+			else
+				$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletebetriebsmittel')
+	{
+		//Loescht ein Betriebsmittel
+		//Wenn studiengang_kz uebergeben wird, dann handelt es sich um die Betriebsmittel eines Studenten
+		//Wenn studiengang_kz='' dann werden Mitarbeiterrechte benoetigt
+		//ToDo: hier sollte nicht der Studiengang uebergeben werden sonder aus der DB ermittelt werden ob es
+		//ein Student oder Mitarbeiter ist
+		if(($_POST['studiengang_kz']!='' &&
+			!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+			!$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid') &&
+			!$rechte->isBerechtigt('basis/betriebsmittel',$_POST['studiengang_kz'], 'suid')
+		   ) ||
+		   ($_POST['studiengang_kz']=='' &&
+			!$rechte->isBerechtigt('admin', null, 'suid') &&
+			!$rechte->isBerechtigt('mitarbeiter', null, 'suid') &&
+			!$rechte->isBerechtigt('basis/betriebsmittel', null, 'suid')
+		   ))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			if(isset($_POST['betriebsmittelperson_id']) && is_numeric($_POST['betriebsmittelperson_id']))
+			{
+				$btm = new betriebsmittelperson();
+
+				if($btm->delete($_POST['betriebsmittelperson_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $btm->errormsg;
+					$return = false;
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg  = 'Fehlerhafte Parameteruebergabe';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savebetriebsmittel')
+	{
+		//Speichert eine Betriebsmittelzuordnung
+		//Wenn studiengang_kz uebergeben wird, dann handelt es sich um die Betriebsmittel eines Studenten
+		//Wenn studiengang_kz='' dann werden Mitarbeiterrechte benoetigt
+		//ToDo: hier sollte nicht der Studiengang uebergeben werden sonder aus der DB ermittelt werden ob es
+		//ein Student oder Mitarbeiter ist
+		if(($_POST['studiengang_kz']!='' &&
+			!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+			!$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid') &&
+			!$rechte->isBerechtigt('basis/betriebsmittel',$_POST['studiengang_kz'], 'suid')
+		   ) ||
+		   ($_POST['studiengang_kz']=='' &&
+			!$rechte->isBerechtigt('admin', null, 'suid') &&
+			!$rechte->isBerechtigt('mitarbeiter', null, 'suid') &&
+			!$rechte->isBerechtigt('basis/betriebsmittel', null, 'suid')
+		   ))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$betriebsmittel_id = $_POST['betriebsmittel_id'];
+			$bm = new betriebsmittel();
+
+			// Wenn es kein vorhandenes Inventar ist, dann neu anlegen
+			if($_POST['betriebsmitteltyp']!='Inventar')
+			{
+				if($_POST['betriebsmitteltyp']=='Zutrittskarte')
+					$_POST['nummer']=$bm->transform_kartennummer($_POST['nummer']);
+
+				//Das speichern von Zutrittskarten ohne Nummern verhindern
+				if($_POST['betriebsmitteltyp']=='Zutrittskarte' && $_POST['nummer']=='')
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz';
+				}
+				else
+				{
+					//Nachschauen ob dieses Betriebsmittel schon existiert
+					if($bm->getBetriebsmittel($_POST['betriebsmitteltyp'],$_POST['nummer']))
+					{
+						if(count($bm->result)>0)
+						{
+							//Wenn die Nummer gleich bleibt dann die alte ID verwenden da es
+							//unterschiedliche Schluessel gibt die die gleiche nummer haben ?!?
+							if($_POST['nummer']==$_POST['nummerold'])
+							{
+								$betriebsmittel_id = $_POST['betriebsmittel_id'];
+							}
+							else
+								$betriebsmittel_id = $bm->result[0]->betriebsmittel_id;
+							//Wenn ein Eintrag gefunden wurde, dann wird die Beschreibung aktualisiert
+							if($bm->load($betriebsmittel_id))
+							{
+								$bm->beschreibung = $_POST['beschreibung'];
+								$bm->nummer = $_POST['nummer'];
+								$bm->nummer2 = $_POST['nummer2'];
+								if(!$bm->save(false))
+								{
+									$return = false;
+									$error = true;
+									$errormsg = 'Fehler beim Speichern des Betriebsmittels';
+								}
+							}
+							else
+							{
+								$return = false;
+								$error = true;
+								$errormsg = 'Gefundener Eintrag konnte nicht geladen werden!?!?';
+							}
+						}
+						else
+						{
+							//Wenn kein Eintrag gefunden wurde, dann wird ein neuer Eintrag angelegt
+							$bm->betriebsmitteltyp = $_POST['betriebsmitteltyp'];
+							$bm->nummer = $_POST['nummer'];
+							$bm->nummer2 = $_POST['nummer2'];
+							$bm->beschreibung = $_POST['beschreibung'];
+							$bm->reservieren = false;
+							$bm->ort_kurzbz = null;
+							$bm->insertamum = date('Y-m-d H:i:s');
+							$bm->insertvon = $user;
+
+							if($bm->save(true))
+							{
+								$betriebsmittel_id = $bm->betriebsmittel_id;
+							}
+							else
+							{
+								$error = true;
+								$return = false;
+								$errormsg = 'Fehler beim Anlegen des Betriebsmittels';
+							}
+						}
+
+						if($_POST['betriebsmitteltyp']=='Zutrittskarte')
+						{
+							//Bei Zutrittskarten schauen ob diese schon vergeben sind
+							$qry = "SELECT vorname, nachname, uid
+									FROM public.vw_betriebsmittelperson
+									WHERE betriebsmitteltyp='Zutrittskarte' AND
+										nummer='".$db->db_escape($_POST['nummer'])."'::varchar AND
+										person_id<>".$db->db_add_param($_POST['person_id'], FHC_INTEGER)." AND
+										retouram is null";
+							if($result_bmp = $db->db_query($qry))
+							{
+								if($db->db_num_rows($result_bmp)>0)
+								{
+									$row_bmp = $db->db_fetch_object($result_bmp);
+									$error = true;
+									$return = false;
+									$errormsg = "Diese Zutrittskarte ist bereits ausgegeben an: $row_bmp->vorname $row_bmp->nachname ($row_bmp->uid)";
+								}
+							}
+							else
+							{
+								$error = true;
+								$return = false;
+								$errormsg = 'Fehler beim Laden der Zutrittskarte';
+							}
+						}
+					}
+				}
+			}
+
+			if(!$error)
+			{
+				//Zuordnung Betriebsmittel-Person anlegen
+				$bmp = new betriebsmittelperson();
+				if($_POST['neu']!='true')
+				{
+					if($bmp->load($_POST['betriebsmittelperson_id']))
+					{
+						$bmp->updateamum = date('Y-m-d H:i:s');
+						$bmp->updatevon = $user;
+						$bmp->betriebsmittelperson_id = $_POST['betriebsmittelperson_id'];
+						$bmp->new = false;
+					}
+					else
+					{
+						$error = true;
+						$errormsg = "Zuordnung unbekannt:".$_POST['betriebsmittelperson_id'];
+						$return = false;
+					}
+				}
+				else
+				{
+					$bmp->insertamum = date('Y-m-d H:i:s');
+					$bmp->insertvon = $user;
+					$bmp->new = true;
+				}
+
+				if(!$error)
+				{
+					$bmp->person_id = $_POST['person_id'];
+					$bmp->betriebsmittel_id=$betriebsmittel_id;
+					$bmp->anmerkung = $_POST['anmerkung'];
+					$bmp->kaution = trim(str_replace(',','.',$_POST['kaution']));
+					$bmp->ausgegebenam = $_POST['ausgegebenam'];
+					$bmp->retouram = $_POST['retouram'];
+					if($bmp->new)
+						$bmp->uid = $_POST['uid'];
+
+					if($bmp->save())
+					{
+						$return = true;
+						$data = $bmp->betriebsmittelperson_id;
+					}
+					else
+					{
+						$return = false;
+						$errormsg = $bmp->errormsg;
+					}
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletebisio')
+	{
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			//Loescht einen BisIO Eintrag
+			if(isset($_POST['bisio_id']) && is_numeric($_POST['bisio_id']))
+			{
+				$bisio = new bisio();
+
+				if($bisio->delete($_POST['bisio_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $bisio->errormsg;
+					$return = false;
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg  = 'Fehlerhafte Parameteruebergabe';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savebisio')
+	{
+		//Speichert einen BisIO Eintrag
+		if(!$rechte->isBerechtigt('assistenz',$_POST['studiengang_kz'],'suid') &&
+		   !$rechte->isBerechtigt('admin',$_POST['studiengang_kz'], 'suid'))
+		{
+			$error = true;
+			$return = false;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+
+			$bisio = new bisio();
+
+			if($_POST['neu']=='true')
+			{
+				$bisio->insertamum = date('Y-m-d H:i:s');
+				$bisio->insertvon = $user;
+				$bisio->new = true;
+			}
+			else
+			{
+				if($bisio->load($_POST['bisio_id']))
+					$bisio->new = false;
+				else
+				{
+					$error = true;
+					$errormsg = $bisio->errormsg;
+					$return = false;
+				}
+			}
+
+			$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
+			$bisio->mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
+			$bisio->nation_code = $_POST['nation_code'];
+			$bisio->von = $_POST['von'];
+			$bisio->bis = $_POST['bis'];
+			$bisio->student_uid = $_POST['student_uid'];
+			$bisio->lehreinheit_id = $_POST['lehreinheit_id'];
+			$bisio->ort = $_POST['ort'];
+			$bisio->universitaet = $_POST['universitaet'];
+			$bisio->ects_erworben = $_POST['ects_erworben'];
+			$bisio->ects_angerechnet = $_POST['ects_angerechnet'];
+			$bisio->updateamum = date('Y-m-d H:i:s');
+			$bisio->updatevon = $user;
+
+			if(!$error)
+			{
+				if($bisio->save())
+				{
+					$return = true;
+					$data = $bisio->bisio_id;
+				}
+				else
+				{
+					$errormsg = $bisio->errormsg;
+					$return = false;
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savebisiozweck')
+	{
+		$bisio = new bisio();
+		if($bisio->load($_POST['bisio_id']))
+		{
+			$student = new student();
+			if($student->load($bisio->student_uid))
+			{
+
+				//Speichert einen BisIO Eintrag
+				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+
+					$bisio = new bisio();
+
+					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
+					$bisio->zweck_code = $_POST['zweck_code'];
+
+					if(!$error)
+					{
+						if($bisio->saveZweck())
+						{
+							$return = true;
+							$data = $bisio->bisio_id;
+						}
+						else
+						{
+							$errormsg = $bisio->errormsg;
+							$return = false;
+						}
+					}
+				}
+			}
+			else
+			{
+				$errormsg = $student->errormsg;
+				$return = false;
+			}
+		}
+		else
+		{
+			$errormsg = $bisio->errormsg;
+			$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletebisiozweck')
+	{
+		$bisio = new bisio();
+		if($bisio->load($_POST['bisio_id']))
+		{
+			$student = new student();
+			if($student->load($bisio->student_uid))
+			{
+				//Speichert einen BisIO Eintrag
+				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+
+					$bisio = new bisio();
+
+					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
+					$bisio->zweck_code = $_POST['zweck_code'];
+
+					if(!$error)
+					{
+						if($bisio->deleteZweck())
+						{
+							$return = true;
+						}
+						else
+						{
+							$errormsg = $bisio->errormsg;
+							$return = false;
+						}
+					}
+				}
+			}
+			else
+			{
+				$errormsg = $student->errormsg;
+				$return = false;
+			}
+		}
+		else
+		{
+			$errormsg = $bisio->errormsg;
+			$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savebisioaufenthaltfoerderung')
+	{
+		$bisio = new bisio();
+		if($bisio->load($_POST['bisio_id']))
+		{
+			$student = new student();
+			if($student->load($bisio->student_uid))
+			{
+
+				//Speichert einen BisIO Eintrag
+				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+
+					$bisio = new bisio();
+
+					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
+					$bisio->aufenthaltfoerderung_code = $_POST['aufenthaltfoerderung_code'];
+
+					if(!$error)
+					{
+						if($bisio->saveAufenthaltFoerderung())
+						{
+							$return = true;
+							$data = $bisio->bisio_id;
+						}
+						else
+						{
+							$errormsg = $bisio->errormsg;
+							$return = false;
+						}
+					}
+				}
+			}
+			else
+			{
+				$errormsg = $student->errormsg;
+				$return = false;
+			}
+		}
+		else
+		{
+			$errormsg = $bisio->errormsg;
+			$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletebisioaufenthaltfoerderung')
+	{
+		$bisio = new bisio();
+		if($bisio->load($_POST['bisio_id']))
+		{
+			$student = new student();
+			if($student->load($bisio->student_uid))
+			{
+				//Speichert einen BisIO Eintrag
+				if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
+				   !$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+
+					$bisio = new bisio();
+
+					$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
+					$bisio->aufenthaltfoerderung_code = $_POST['aufenthaltfoerderung_code'];
+
+					if(!$error)
+					{
+						if($bisio->deleteAufenthaltFoerderung())
+						{
+							$return = true;
+						}
+						else
+						{
+							$errormsg = $bisio->errormsg;
+							$return = false;
+						}
+					}
+				}
+			}
+			else
+			{
+				$errormsg = $student->errormsg;
+				$return = false;
+			}
+		}
+		else
+		{
+			$errormsg = $bisio->errormsg;
+			$return = false;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='getnotenotenschluessel')
+	{
+		if(!$rechte->isBerechtigt('admin', null, 's') && !$rechte->isBerechtigt('assistenz', null, 's') &&
+		   !$rechte->isBerechtigt('student/noten', null, 's'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$punkte=$_POST['punkte'];
+			if(is_numeric($punkte))
+			{
+				$lehrveranstaltung_id=$_POST['lehrveranstaltung_id'];
+				$studiensemester_kurzbz=$semester_aktuell;
+
+				$notenschluessel = new notenschluessel();
+				if(($note = $notenschluessel->getNote($punkte, $lehrveranstaltung_id, $studiensemester_kurzbz))!==false)
+				{
+					$return = true;
+					$error = false;
+					$data = $note;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg=$notenschluessel->errormsg;
+				}
+			}
+			else
+			{
+				$return = true;
+				$error = false;
+				$data = '';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savenote')
+	{
+		//Speichert einen Noteneintrag
+
+		$noten = new zeugnisnote();
+		$lehrveranstaltung_id = filter_input(INPUT_POST, 'lehrveranstaltung_id');
+		$student_uid = filter_input(INPUT_POST, 'student_uid');
+		$studiensemester_kurzbz = filter_input(INPUT_POST, 'studiensemester_kurzbz');
+
+		if(!is_null($lehrveranstaltung_id) && !is_null($student_uid) && !is_null($studiensemester_kurzbz))
+		{
+			//Berechtigung pruefen
+			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($student_uid);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$stg_std = $row->studiengang_kz;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln des Studenten';
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln des Studenten';
+			}
+
+			if(!$error)
+			{
+				$lva = new lehrveranstaltung($lehrveranstaltung_id);
+
+				if(!$rechte->isBerechtigtMultipleOe('admin', $lva->getAllOe(), 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
+				   !$rechte->isBerechtigtMultipleOe('assistenz', $lva->getAllOe(), 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+
+					if($noten->load($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz))
+					{
+						$noten->new = false;
+						$noten->updateamum = date('Y-m-d H:i:s');
+						$noten->updatevon = $user;
+						$log = new log();
+						$log->executetime = date('Y-m-d H:i:s');
+						$log->mitarbeiter_uid = $user;
+						$log->beschreibung = "Ändern der Note ".$noten->note." bei ".$noten->student_uid;
+						$log->sql = 'UPDATE lehre.tbl_zeugnisnote SET '.
+								'note='.$db->db_add_param($noten->note).', '.
+								'punkte='.$db->db_add_param($noten->punkte).','.
+								'uebernahmedatum='.$db->db_add_param($noten->uebernahmedatum).', '.
+								'benotungsdatum='.$db->db_add_param($noten->benotungsdatum).', '.
+								'bemerkung='.$db->db_add_param($noten->bemerkung).', '.
+								'updateamum= '.$db->db_add_param($noten->updateamum).', '.
+								'updatevon='.$db->db_add_param($noten->updatevon).' '.
+								'WHERE lehrveranstaltung_id='.$db->db_add_param($noten->lehrveranstaltung_id, FHC_INTEGER).' '.
+								'AND student_uid='.$db->db_add_param($noten->student_uid).' '.
+								'AND studiensemester_kurzbz='.$db->db_add_param($noten->studiensemester_kurzbz).';';
+						$log->sqlundo = $noten->getUndo('update');
+						$log->save(true);
+					}
+					else
+					{
+						$noten->new = true;
+						$noten->insertamum = date('Y-m-d H:i:s');
+						$noten->insertvon = $user;
+					}
+
+					$noten->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
+					$noten->student_uid = $_POST['student_uid'];
+					$noten->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
+					$noten->benotungsdatum = date('Y-m-d H:i:s');
+					$noten->note = $_POST['note'];
+					if(isset($_POST['punkte']))
+						$noten->punkte=str_replace(',','.',$_POST['punkte']);
+
+					if($noten->save())
+					{
+						$return = true;
+					}
+					else
+					{
+						$errormsg = $noten->errormsg;
+						$return = false;
+					}
+
+					if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $return == true && $noten->new == true)
+					{
+						NotePruefungAnlegen($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $noten->note);
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='movenote')
+	{
+		//Speichert einen LVGesamtNoten Eintrag in die Tbl Zeugnisnote
+		//Die Daten werden per POST uebermittelt. Es wird ein Feld Anzahl mituebergeben
+		//mit der Anzahl der Felder. Die Felder sind durchnummeriert zB lehreinheit_id_0, lehreinheit_id_1, ...
+		$errormsg = '';
+		$ueberschreibbar=true;
+		$nueberschreibbarbez=array();
+
+		for($i=0;$i<$_POST['anzahl'];$i++)
+		{
+			$lvgesamtnote = new lvgesamtnote();
+			$zeugnisnote = new zeugnisnote();
+			$noten_ueberschreibbar = array();
+			$noten_bezeichnung = array();
+			$note_obj = new note();
+			$note_obj->getAll();
+			foreach($note_obj->result as $row)
+			{
+				$noten_ueberschreibbar[$row->note] = $row->lkt_ueberschreibbar;
+				$noten_bezeichnung[$row->note] = $row->bezeichnung;
+			}
+
+			//Berechtigung pruefen
+			$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($_POST['lehrveranstaltung_id_'.$i], FHC_INTEGER);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$stg_lva = $row->studiengang_kz;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln der LVA';
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln der LVA';
+			}
+
+			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($_POST['student_uid_'.$i]);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$stg_std = $row->studiengang_kz;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln des Studenten';
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln des Studenten';
+			}
+
+			if(!$error)
+			{
+				if(!$rechte->isBerechtigt('student/noten', $stg_lva, 'suid') && !$rechte->isBerechtigt('student/noten', $stg_std, 'suid'))
+				{
+					$return = false;
+					$error = true;
+					$errormsg .= 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+					if($lvgesamtnote->load($_POST['lehrveranstaltung_id_'.$i], $_POST['student_uid_'.$i], $_POST['studiensemester_kurzbz_'.$i]))
+					{
+						if($zeugnisnote->load($_POST['lehrveranstaltung_id_'.$i], $_POST['student_uid_'.$i], $_POST['studiensemester_kurzbz_'.$i]))
+						{
+							$zeugnisnote->new = false;
+							$zeugnisnote->updateamum = date('Y-m-d H:i:s');
+							$zeugnisnote->updatevon = $user;
+							// Noten wie "angerechnet", "nicht erforderlich" werden nicht ueberschrieben
+							if(isset($zeugnisnote->note) && array_key_exists($zeugnisnote->note, $noten_ueberschreibbar) && $noten_ueberschreibbar[$zeugnisnote->note] === false)
+							{
+								$notenbez = '"'.$noten_bezeichnung[$zeugnisnote->note].'"';
+								if (!in_array($notenbez, $nueberschreibbarbez))
+									$nueberschreibbarbez[] = $notenbez;
+								$ueberschreibbar = false;
+								continue;
+							}
+						}
+						else
+						{
+							$zeugnisnote->new = true;
+							$zeugnisnote->insertamum = date('Y-m-d H:i:s');
+							$zeugnisnote->insertvon = $user;
+							$zeugnisnote->lehrveranstaltung_id = $_POST['lehrveranstaltung_id_'.$i];
+							$zeugnisnote->student_uid = $_POST['student_uid_'.$i];
+							$zeugnisnote->studiensemester_kurzbz = $_POST['studiensemester_kurzbz_'.$i];
+						}
+
+						$zeugnisnote->note = $lvgesamtnote->note;
+						$zeugnisnote->punkte = $lvgesamtnote->punkte;
+						$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
+						$zeugnisnote->benotungsdatum = $lvgesamtnote->benotungsdatum;
+						$zeugnisnote->bemerkung = $lvgesamtnote->bemerkung;
+
+						if(!$zeugnisnote->save())
+						{
+							$errormsg .= "\n".$zeugnisnote->errormsg;
+						}
+						else
+						{
+							if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $zeugnisnote->new == true)
+							{
+								NotePruefungAnlegen($zeugnisnote->studiensemester_kurzbz, $zeugnisnote->student_uid, $zeugnisnote->lehrveranstaltung_id, $zeugnisnote->note);
+							}
+						}
+					}
+					else
+					{
+						$errormsg .= "\nLvGesamtNote wurde nicht gefunden";
+					}
+				}
+			}
+		}
+		if(!$ueberschreibbar)
+		{
+			$errormsg.="\nNote(n) ".implode(', ', $nueberschreibbarbez)." waren nicht ueberschreibbar";
+		}
+
+		if($errormsg=='')
+			$return = true;
+		else
+			$return = false;
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='importnoten')
+	{
+		//Importiert die Noten einer Lehrveranstaltung
+		//als Parameter wird die Matrikelnummer und die Note uebergeben
+		//Die Felder sind durchnummeriert zB matrikelnummer_0, matrikelnummer_1, ...
+		//Die Anzahl der Gesamten Daten wird auch als Parameter uebergeben
+		$errormsg = '';
+		$ueberschreibbar=true;
+		$nueberschreibbarbez=array();
+
+		$noten_anmerkung_arr=array();
+		$noten_ueberschreibbar = array();
+		$noten_bezeichnung = array();
+		$note_obj = new note();
+		$note_obj->getAll();
+		foreach($note_obj->result as $row)
+		{
+			$noten_ueberschreibbar[$row->note] = $row->lkt_ueberschreibbar;
+			$noten_bezeichnung[$row->note] = $row->bezeichnung;
+			$noten_anmerkung_arr[$row->anmerkung] = $row->note;
+		}
+
+		for($i=0;$i<$_POST['anzahl'];$i++)
+		{
+			if($_POST['matrikelnummer_'.$i]!='')
+			{
+				$zeugnisnote = new zeugnisnote();
+				$error = false;
+				if(!is_numeric(trim($_POST['matrikelnummer_'.$i])))
+				{
+					$error = true;
+					$errormsg = "\nMatrikelnummer ist ungueltig: ".$_POST['matrikelnummer_'.$i];
+				}
+				if((isset($_POST['note_'.$i]) && !is_numeric($_POST['note_'.$i]) && !isset($noten_anmerkung_arr[$_POST['note_'.$i]])))
+				{
+					$error = true;
+					$errormsg = "\nNote ist ungueltig: ".$_POST['note_'.$i];
+				}
+				if(!$error)
+				{
+					$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE trim(matrikelnr)=".$db->db_add_param(trim($_POST['matrikelnummer_'.$i]));
+					if($result = $db->db_query($qry))
+					{
+						if($row = $db->db_fetch_object($result))
+						{
+							$uid = $row->student_uid;
+							$stg_std = $row->studiengang_kz;
+						}
+						else
+						{
+							$error = true;
+							$errormsg.="\nMatrikelnummer ".$_POST['matrikelnummer_'.$i]." wurde nicht gefunden";
+						}
+					}
+					else
+					{
+						$error = true;
+						$errormsg.="\nFehler beim Ermitteln der UID";
+					}
+
+					//Berechtigung pruefen
+					$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($_POST['lehrveranstaltung_id'], FHC_INTEGER);
+					if($result = $db->db_query($qry))
+					{
+						if($row = $db->db_fetch_object($result))
+						{
+							$stg_lva = $row->studiengang_kz;
+						}
+						else
+						{
+							$return = false;
+							$error = true;
+							$errormsg = 'Fehler beim Ermitteln der LVA';
+						}
+					}
+					else
+					{
+						$return = false;
+						$error = true;
+						$errormsg = 'Fehler beim Ermitteln der LVA';
+					}
+
+					if(!$error)
+					{
+						if(!$rechte->isBerechtigt('admin', $stg_lva, 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
+						   !$rechte->isBerechtigt('assistenz', $stg_lva, 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
+						{
+							$return = false;
+							$error = true;
+							$errormsg .= 'Sie haben keine Berechtigung';
+						}
+						else
+						{
+							if($zeugnisnote->load($_POST['lehrveranstaltung_id'], $uid, $semester_aktuell))
+							{
+								$zeugnisnote->new = false;
+								$zeugnisnote->updateamum = date('Y-m-d H:i:s');
+								$zeugnisnote->updatevon = $user;
+								// Noten wie "angerechnet", "nicht erforderlich" werden nicht ueberschrieben
+								if(isset($zeugnisnote->note) && array_key_exists($zeugnisnote->note, $noten_ueberschreibbar) && $noten_ueberschreibbar[$zeugnisnote->note] === false)
+								{
+									$notenbez = '"'.$noten_bezeichnung[$zeugnisnote->note].'"';
+									if (!in_array($notenbez, $nueberschreibbarbez))
+										$nueberschreibbarbez[] = $notenbez;
+									$ueberschreibbar = false;
+									continue;
+								}
+							}
+							else
+							{
+								$zeugnisnote->new = true;
+								$zeugnisnote->insertamum = date('Y-m-d H:i:s');
+								$zeugnisnote->insertvon = $user;
+								$zeugnisnote->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
+								$zeugnisnote->student_uid = $uid;
+								$zeugnisnote->studiensemester_kurzbz = $semester_aktuell;
+							}
+
+							if(isset($_POST['note_'.$i]))
+							{
+								$zeugnisnote->note = $_POST['note_'.$i];
+								$zeugnisnote->punkte = null;
+								// Wenn es nicht numerisch ist, dann nachsehen ob es eine anmerkung gibt die so heisst
+								// zB fuer met, nb, ar, etc
+								if(!is_numeric($zeugnisnote->note) && isset($noten_anmerkung_arr[$zeugnisnote->note]))
+								{
+									$zeugnisnote->note = $noten_anmerkung_arr[$zeugnisnote->note];
+								}
+							}
+							elseif(isset($_POST['punkte_'.$i]))
+							{
+								$zeugnisnote->punkte=$_POST['punkte_'.$i];
+								$zeugnisnote->punkte = str_replace(',','.', $zeugnisnote->punkte);
+								$notenschluessel = new notenschluessel();
+								$note = $notenschluessel->getNote($zeugnisnote->punkte, $_POST['lehrveranstaltung_id'], $semester_aktuell);
+								$zeugnisnote->note = $note;
+							}
+							$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
+							$zeugnisnote->benotungsdatum = date('Y-m-d H:i:s');
+
+							if(!$zeugnisnote->save())
+							{
+								$errormsg .= "\n".$zeugnisnote->errormsg;
+							}
+							else
+							{
+								if(defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN && $zeugnisnote->new == true)
+								{
+									NotePruefungAnlegen($semester_aktuell, $uid, $_POST['lehrveranstaltung_id'], $zeugnisnote->note);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		if(!$ueberschreibbar)
+		{
+			$errormsg.="\nNote(n) ".implode(', ', $nueberschreibbarbez)." waren nicht ueberschreibbar";
+		}
+
+		if($errormsg=='')
+			$return = true;
+		else
+			$return = false;
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletenote')
+	{
+		//Loescht einen Noteneintrag
+
+		$noten = new zeugnisnote();
+		$lehrveranstaltung_id = filter_input(INPUT_POST, 'lehrveranstaltung_id');
+		$student_uid = filter_input(INPUT_POST, 'student_uid');
+		$studiensemester_kurzbz = filter_input(INPUT_POST, 'studiensemester_kurzbz');
+
+		if(!is_null($lehrveranstaltung_id) && !is_null($student_uid) && !is_null($studiensemester_kurzbz))
+		{
+			//Berechtigung pruefen
+			$qry = "SELECT studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$stg_lva = $row->studiengang_kz;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln der LVA';
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln der LVA';
+			}
+
+			$qry = "SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($student_uid);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$stg_std = $row->studiengang_kz;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Fehler beim Ermitteln des Studenten';
+				}
+			}
+			else
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln des Studenten';
+			}
+
+			if(!$error)
+			{
+				if(!$rechte->isBerechtigt('admin', $stg_lva, 'suid') && !$rechte->isBerechtigt('admin', $stg_std, 'suid') &&
+				   !$rechte->isBerechtigt('assistenz', $stg_lva, 'suid') && !$rechte->isBerechtigt('assistenz', $stg_std, 'suid'))
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+					$noten->load($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz);
+					if($noten->delete($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz))
+					{
+						$log = new log();
+						$log->executetime = date('Y-m-d H:i:s');
+						$log->mitarbeiter_uid = $user;
+						$log->beschreibung = "Löschen der Note ".$noten->note." bei ".$noten->student_uid;
+						$log->sql = "DELETE FROM lehre.tbl_zeugnisnote WHERE
+								lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER, false)." AND
+								student_uid=".$db->db_add_param($student_uid)." AND
+								studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz).";";
+						$log->sqlundo = $noten->getUndo('insert');
+						$log->save(true);
+						$return = true;
+					}
+					else
+					{
+						$return = false;
+						$errormsg = $noten->errormsg;
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletepruefung')  // **** PRUEFUNGEN **** //
+	{
+		//Loescht einen Pruefungs Eintrag
+		if(isset($_POST['pruefung_id']) && is_numeric($_POST['pruefung_id']))
+		{
+			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Sie haben keine Berechtigung';
+			}
+			else
+			{
+				$pruefung = new pruefung();
+
+				if($pruefung->delete($_POST['pruefung_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $pruefung->errormsg;
+					$return = false;
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savepruefung')  // **** PRUEFUNGEN **** //
+	{
+		$datum_obj = new datum();
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$pruefung = new pruefung();
+
+			if($_POST['neu']=='false')
+			{
+				if($pruefung->load($_POST['pruefung_id']))
+				{
+					$pruefung->new = false;
+				}
+				else
+				{
+					$error = true;
+					$return = false;
+					$errormsg = $pruefung->errormsg;
+				}
+			}
+			else
+			{
+				$pruefung->new = true;
+				$pruefung->insertamum = date('Y-m-d H:i:s');
+				$pruefung->insertvon = $user;
+			}
+
+			$db->db_query('BEGIN');
+
+			if($_POST['pruefungstyp_kurzbz']=='Termin2')
+			{
+				//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
+				//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
+				$qry = "SELECT * FROM lehre.tbl_pruefung WHERE
+						student_uid=".$db->db_add_param($_POST['student_uid'])." AND
+						lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER)." AND
+						pruefungstyp_kurzbz='Termin1'";
+				if($result = $db->db_query($qry))
+				{
+					if($db->db_num_rows($result)==0)
+					{
+						$qry = "SELECT note,punkte, benotungsdatum FROM lehre.tbl_zeugnisnote JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id) WHERE
+								student_uid=".$db->db_add_param($_POST['student_uid'])." AND
+								tbl_lehreinheit.lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER)." AND
+								tbl_lehreinheit.studiensemester_kurzbz = tbl_zeugnisnote.studiensemester_kurzbz";
+						if($result = $db->db_query($qry))
+						{
+							if($row = $db->db_fetch_object($result))
+							{
+								//Wenn kein Ersttermin existiert, dann wird einer angelegt
+								$ersttermin = new pruefung();
+								$ersttermin->new=true;
+								$ersttermin->insertamum = date('Y-m-d H:i:s');
+								$ersttermin->insertvon = $user;
+								$ersttermin->lehreinheit_id = $_POST['lehreinheit_id'];
+								$ersttermin->student_uid = $_POST['student_uid'];
+								$ersttermin->mitarbeiter_uid = $_POST['mitarbeiter_uid'];
+								$ersttermin->note = $row->note;
+								$ersttermin->punkte = $row->punkte;
+								$ersttermin->pruefungstyp_kurzbz = 'Termin1';
+								$ersttermin->datum = $row->benotungsdatum;
+								$ersttermin->anmerkung = '';
+
+								if(!$ersttermin->save())
+								{
+									$error = true;
+									$return = false;
+									$errormsg = 'Fehler beim Anlegen des 1.Termin:'.$ersttermin->errormsg;
+								}
+							}
+						}
+						//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
+						//1.Termin angelegt
+					}
+				}
+				else
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Fehler beim Ermitteln des Ersttermines';
+				}
+
+			}
+
+			if(!$error)
+			{
+				$pruefung->lehreinheit_id = $_POST['lehreinheit_id'];
+				$pruefung->student_uid = $_POST['student_uid'];
+				$pruefung->mitarbeiter_uid = $_POST['mitarbeiter_uid'];
+				$pruefung->note = $_POST['note'];
+				if(isset($_POST['punkte']))
+					$pruefung->punkte = str_replace(',','.',$_POST['punkte']);
+				$pruefung->pruefungstyp_kurzbz = $_POST['pruefungstyp_kurzbz'];
+				$pruefung->datum = $_POST['datum'];
+				$pruefung->anmerkung = $_POST['anmerkung'];
+				$pruefung->updateamum = date('Y-m-d H:i:s');
+				$pruefung->updatevon = $user;
+
+
+				if($pruefung->save())
+				{
+					$return = true;
+					$data = $pruefung->pruefung_id;
+					//Zeugnisnote aktualisieren
+					$qry = "SELECT lehrveranstaltung_id, studiensemester_kurzbz FROM lehre.tbl_lehreinheit
+							WHERE lehreinheit_id=".$db->db_add_param($_POST['lehreinheit_id'], FHC_INTEGER);
+					if($result_le = $db->db_query($qry))
+					{
+						if($row_le = $db->db_fetch_object($result_le))
+						{
+							$lehrveranstaltung_id = $row_le->lehrveranstaltung_id;
+							$studiensemester_kurzbz = $row_le->studiensemester_kurzbz;
+						}
+						else
+						{
+							$error = true;
+							$return = false;
+							$errormsg = 'Fehler beim Ermitteln der Lehrveranstaltung';
+						}
+					}
+					else
+					{
+						$error = true;
+						$return = false;
+						$errormsg = 'Fehler beim Ermitteln der Lehrveranstaltung';
+					}
+
+
+					if(!$error)
+					{
+						$zeugnisnote = new zeugnisnote();
+						if($zeugnisnote->load($lehrveranstaltung_id, $_POST['student_uid'], $studiensemester_kurzbz))
+						{
+							if($zeugnisnote->uebernahmedatum=='' ||
+								($datum_obj->mktime_fromtimestamp($zeugnisnote->benotungsdatum) >
+								 $datum_obj->mktime_fromtimestamp($zeugnisnote->uebernahmedatum)))
+								$checkdatum = $zeugnisnote->benotungsdatum;
+							else
+								$checkdatum = $zeugnisnote->uebernahmedatum;
+
+							if($datum_obj->mktime_fromtimestamp($checkdatum)>$datum_obj->mktime_fromdate($_POST['datum']))
+							{
+								if($zeugnisnote->note!=$_POST['note'])
+								{
+									$error = true;
+									$return = false;
+									$errormsg = 'ACHTUNG! Diese Pruefungsnote wurde nicht ins Zeugnis uebernommen da die Zeugnisnote nach dem Pruefungsdatum veraendert wurde';
+								}
+							}
+							else
+							{
+								$zeugnisnote->new = false;
+							}
+						}
+						else
+						{
+							$zeugnisnote->new = true;
+							$zeugnisnote->insertamum = date('Y-m-d H:i:s');
+							$zeugnisnote->insertvon = $user;
+						}
+
+						if(!$error)
+						{
+							$zeugnisnote->student_uid = $_POST['student_uid'];
+							$zeugnisnote->lehrveranstaltung_id = $lehrveranstaltung_id;
+							$zeugnisnote->studiensemester_kurzbz = $studiensemester_kurzbz;
+							$zeugnisnote->note = $_POST['note'];
+							if(isset($_POST['punkte']))
+								$zeugnisnote->punkte = str_replace(',','.',$_POST['punkte']);
+							else
+								$zeugnisnote->punkte='';
+							$zeugnisnote->uebernahmedatum = date('Y-m-d H:i:s');
+							$zeugnisnote->benotungsdatum = date('Y-m-d',$datum_obj->mktime_fromdate($_POST['datum']));
+							$zeugnisnote->updateamum = date('Y-m-d H:i:s');
+							$zeugnisnote->updatevon = $user;
+
+							if(!$zeugnisnote->save())
+							{
+								$return = false;
+								$error = true;
+								$errormsg = 'Fehler beim Speichern der Zeungisnote:'.$zeugnisnote->errormsg;
+								$db->db_query('ROLLBACK');
+							}
+							else
+							{
+								$db->db_query('COMMIT');
+							}
+						}
+						else
+						{
+							//Kein Rollback damit die Pruefung gespeichert wird
+							//returnwert ist aber false damit die Meldung angezeigt wird,
+							//dass die Note nicht ins Zeugnis uebernommen wird
+							$db->db_query('COMMIT');
+						}
+					}
+					else
+					{
+						$db->db_query('ROLLBACK');
+					}
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $pruefung->errormsg;
+					$db->db_query('ROLLBACK');
+				}
+			}
+			else
+			{
+				$db->db_query('ROLLBACK');
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveabschlusspruefung')  // **** ABSCHLUSSPRUEFUNGEN **** //
+	{
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$pruefung = new abschlusspruefung();
+
+			if($_POST['neu']=='false')
+			{
+				if($pruefung->load($_POST['abschlusspruefung_id']))
+				{
+					$pruefung->new = false;
+				}
+				else
+				{
+					$error = true;
+					$return = false;
+					$errormsg = $pruefung->errormsg;
+				}
+			}
+			else
+			{
+				$pruefung->new = true;
+				$pruefung->insertamum = date('Y-m-d H:i:s');
+				$pruefung->insertvon = $user;
+			}
+
+			$pruefung->student_uid = $_POST['student_uid'];
+			$pruefung->vorsitz = $_POST['vorsitz'];
+			$pruefung->pruefer1 = $_POST['pruefer1'];
+			$pruefung->pruefer2 = $_POST['pruefer2'];
+			$pruefung->pruefer3 = $_POST['pruefer3'];
+			$pruefung->abschlussbeurteilung_kurzbz = $_POST['abschlussbeurteilung_kurzbz'];
+			$pruefung->note = $_POST['notekommpruef'];
+			$pruefung->akadgrad_id = $_POST['akadgrad_id'];
+			$pruefung->pruefungstyp_kurzbz = $_POST['pruefungstyp_kurzbz'];
+			$pruefung->datum = $_POST['datum'];
+			$pruefung->uhrzeit = $_POST['uhrzeit'];
+			$pruefung->sponsion = $_POST['sponsion'];
+			$pruefung->anmerkung = $_POST['anmerkung'];
+			$pruefung->updateamum = date('Y-m-d H:i:s');
+			$pruefung->updatevon = $user;
+
+			if(!$error)
+			{
+				if($pruefung->save())
+				{
+					$return = true;
+					$data = $pruefung->abschlusspruefung_id;
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $pruefung->errormsg;
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteabschlusspruefung')
+	{
+		//Loescht einen Pruefungs Eintrag
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			if(isset($_POST['abschlusspruefung_id']) && is_numeric($_POST['abschlusspruefung_id']))
+			{
+				$pruefung = new abschlusspruefung();
+
+				if($pruefung->delete($_POST['abschlusspruefung_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $pruefung->errormsg;
+					$return = false;
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg  = 'Fehlerhafte Parameteruebergabe';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveprojektarbeit')  // **** Projektarbeit **** //
+	{
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$projektarbeit = new projektarbeit();
+
+			if($_POST['neu']=='false')
+			{
+				if($projektarbeit->load($_POST['projektarbeit_id']))
+				{
+					$projektarbeit->new = false;
+				}
+				else
+				{
+					$error = true;
+					$return = false;
+					$errormsg = $projektarbeit->errormsg;
+				}
+			}
+			else
+			{
+				$projektarbeit->new = true;
+				$projektarbeit->insertamum = date('Y-m-d H:i:s');
+				$projektarbeit->insertvon = $user;
+			}
+
+			$projektarbeit->projekttyp_kurzbz = $_POST['projekttyp_kurzbz'];
+			$projektarbeit->titel = $_POST['titel'];
+			$projektarbeit->titel_english = $_POST['titel_english'];
+			$projektarbeit->lehreinheit_id = $_POST['lehreinheit_id'];
+			$projektarbeit->student_uid = $_POST['student_uid'];
+			$projektarbeit->firma_id = $_POST['firma_id'];
+			$projektarbeit->note = $_POST['note'];
+			$projektarbeit->punkte = str_replace(',','.',$_POST['punkte']);
+			$projektarbeit->beginn = $_POST['beginn'];
+			$projektarbeit->ende = $_POST['ende'];
+			$projektarbeit->faktor = str_replace(',','.',$_POST['faktor']);
+			$projektarbeit->freigegeben = ($_POST['freigegeben']=='true'?true:false);
+			$projektarbeit->gesperrtbis = $_POST['gesperrtbis'];
+			$projektarbeit->stundensatz = str_replace(',','.',$_POST['stundensatz']);
+			$projektarbeit->gesamtstunden = $_POST['gesamtstunden'];
+			$projektarbeit->themenbereich = $_POST['themenbereich'];
+			$projektarbeit->anmerkung = $_POST['anmerkung'];
+			$projektarbeit->updateamum = date('Y-m-d H:i:s');
+			$projektarbeit->updatevon = $user;
+			$projektarbeit->final = ($_POST['final']=='true'?true:false);
+
+			if(!$error)
+			{
+				if($projektarbeit->save())
+				{
+					$return = true;
+					$data = $projektarbeit->projektarbeit_id;
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $projektarbeit->errormsg;
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteprojektarbeit')
+	{
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			//Loescht einen Projektarbeit Eintrag
+			if(isset($_POST['projektarbeit_id']) && is_numeric($_POST['projektarbeit_id']))
+			{
+				$projektarbeit = new projektarbeit();
+
+				$qry = "SELECT count(*) as anzahl FROM lehre.tbl_projektbetreuer
+					WHERE projektarbeit_id=".$db->db_add_param($_POST['projektarbeit_id'], FHC_INTEGER);
+
+				if($result = $db->db_query($qry))
+				{
+					if($row = $db->db_fetch_object($result))
+					{
+						if($row->anzahl>0)
+						{
+							$errormsg = 'Bitte zuerst alle BetreuerInnen loeschen';
+							$return = false;
+						}
+						else
+						{
+							$qry = "SELECT count(*) as anzahl FROM campus.tbl_paabgabe
+									WHERE projektarbeit_id=".$db->db_add_param($_POST['projektarbeit_id'], FHC_INTEGER).";";
+
+							if($result = $db->db_query($qry))
+							{
+								if($row = $db->db_fetch_object($result))
+								{
+									if($row->anzahl>0)
+									{
+										$errormsg = 'Diese Projektarbeit kann nicht gelöscht werden, da bereits AbgabeTermine bzw Abgaben vorhanden sind';
+										$return = false;
+									}
+									else
+									{
+										if($projektarbeit->delete($_POST['projektarbeit_id']))
+										{
+											$return = true;
+										}
+										else
+										{
+											$errormsg = $projektarbeit->errormsg;
+											$return = false;
+										}
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						$errormsg = 'Fehler beim Loeschen';
+						$return = false;
+					}
+				}
+				else
+				{
+					$errormsg = 'Fehler beim Loeschen';
+					$return = false;
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg  = 'Fehlerhafte Parameteruebergabe';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveprojektbetreuer')  // **** Projektbetreuer **** //
+	{
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$projektbetreuer = new projektbetreuer();
+
+			if($_POST['neu']=='false')
+			{
+				if($projektbetreuer->load($_POST['person_id_old'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz_old']))
+				{
+					$projektbetreuer->new = false;
+				}
+				else
+				{
+					$error = true;
+					$return = false;
+					$errormsg = $projektbetreuer->errormsg;
+				}
+			}
+			else
+			{
+				if($projektbetreuer->load($_POST['person_id'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz']))
+				{
+					$error = true;
+					$errormsg = 'Diese/r BetreuerIn ist bereits zugeteilt';
+				}
+				$projektbetreuer->new = true;
+				$projektbetreuer->insertamum = date('Y-m-d H:i:s');
+				$projektbetreuer->insertvon = $user;
+			}
+
+			$projektbetreuer->person_id = $_POST['person_id'];
+			$projektbetreuer->person_id_old = $_POST['person_id_old'];
+			$projektbetreuer->projektarbeit_id = $_POST['projektarbeit_id'];
+			$projektbetreuer->note = $_POST['note'];
+			$projektbetreuer->faktor = str_replace(',','.', $_POST['faktor']);
+			$projektbetreuer->name = $_POST['name'];
+			$projektbetreuer->punkte = str_replace(',','.', $_POST['punkte']);
+			$projektbetreuer->stunden = str_replace(',','.', $_POST['stunden']);
+			$projektbetreuer->stundensatz = str_replace(',','.', $_POST['stundensatz']);
+			$projektbetreuer->betreuerart_kurzbz = $_POST['betreuerart_kurzbz'];
+			$projektbetreuer->betreuerart_kurzbz_old = $_POST['betreuerart_kurzbz_old'];
+			$projektbetreuer->updateamum = date('Y-m-d H:i:s');
+			$projektbetreuer->updatevon = $user;
+
+			if(!$error)
+			{
+				if($projektbetreuer->save())
+				{
+					$return = true;
+				}
+				else
+				{
+					$return = false;
+					$errormsg = $projektbetreuer->errormsg;
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteprojektbetreuer')
+	{
+		if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			// Wenn der Projektbetreuer schon einen Vertrag hat, wird das Loeschen verhindert
+			if (isset($_POST['vertrag_id']) && is_numeric($_POST['vertrag_id']) &&
+				(defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN') && FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN))
+			{
+				$return = false;
+				$errormsg = 'Löschen nur nach Stornierung des Vertrags möglich.';
+			}
+			else
+			{
+				//Loescht einen Projektbetreuer Eintrag
+				if (isset($_POST['person_id']) && is_numeric($_POST['person_id'])) {
+					$projektbetreuer = new projektbetreuer();
+					if ($projektbetreuer->delete($_POST['person_id'], $_POST['projektarbeit_id'], $_POST['betreuerart_kurzbz'])) {
+						$return = true;
+					} else {
+						$errormsg = $projektbetreuer->errormsg;
+						$return = false;
+					}
+				} else {
+					$return = false;
+					$errormsg = 'Fehlerhafte Parameteruebergabe';
+				}
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='getprivatemailadress')
+	{
+		if(isset($_POST['person_ids']))
+		{
+			$pers_arr = explode(';',$_POST['person_ids']);
+			$data='';
+			$anz_error=0;
+
+			foreach ($pers_arr as $person_id)
+			{
+				if(is_numeric($person_id))
+				{
+					$qry = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email'
+						AND person_id=".$db->db_add_param($person_id, FHC_INTEGER)." AND zustellung=true LIMIT 1";
+					if($result = $db->db_query($qry))
+					{
+						if($row = $db->db_fetch_object($result))
+						{
+							if($data!='')
+								$data.=$emailadressentrennzeichen.$row->kontakt;
+							else
+								$data = $row->kontakt;
+						}
+						else
+						{
+							$anz_error++;
+						}
+					}
+				}
+			}
+			if($data!='')
+			{
+				if($anz_error==0)
+					$return = true;
+				else
+				{
+					$return = false;
+					$errormsg = "Bei $anz_error Personen wurde keine Emailadresse gefunden!";
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Es wurde keine Privatadresse gefunden';
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='getReihungstestPunkte')
+	{
+		//Liefert die Reihungstestpunkte eines Prestudenten
+		if(isset($_POST['person_id']) && isset($_POST['reihungstest_id']) && isset($_POST['studienplan_studiengang_kz']))
+		{
+			$pruefling = new pruefling();
+			if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
+				$data = $pruefling->getReihungstestErgebnisPerson($_POST['person_id'], true, $_POST['reihungstest_id'], false, null, $_POST['studienplan_studiengang_kz']);
+			else
+				$data = $pruefling->getReihungstestErgebnisPerson($_POST['person_id'], false, $_POST['reihungstest_id'], false, null, $_POST['studienplan_studiengang_kz']);
+
+			// Runden auf 4 Nachkommastellen
+			$data = number_format($data, 4, '.','');
+			$return = true;
+		}
+		else
+		{
+			$return = false;
+			$errormsg = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='getstundensatz')
+	{
+		if(isset($_POST['person_id']))
+		{
+			$qry = "SELECT stundensatz FROM public.tbl_mitarbeiter JOIN public.tbl_benutzer ON(uid=mitarbeiter_uid)
+					WHERE person_id=".$db->db_add_param($_POST['person_id'], FHC_INTEGER);
+			if($result = $db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object($result))
+				{
+					$data = $row->stundensatz;
+					$return = true;
+				}
+				else
+				{
+					$data = '80.00';
+					$return = true;
+				}
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Unbekannter Fehler';
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveanrechnung')
+	{
+		$anrechnung = new anrechnung();
+
+		$anrechnung->new = $_POST['neu'];
+		$anrechnung->anrechnung_id = $_POST['anrechnung_id'];
+		$anrechnung->prestudent_id = $_POST['prestudent_id'];
+		$anrechnung->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
+		$anrechnung->begruendung_id = $_POST['begruendung_id'];
+		isset($_POST['lehrveranstaltung_id_kompatibel']) ? $anrechnung->lehrveranstaltung_id_kompatibel = $_POST['lehrveranstaltung_id_kompatibel'] : $anrechnung->lehrveranstaltung_id_kompatibel = null;
+		isset($_POST['notiz_id']) ? $anrechnung->notiz_id = $_POST['notiz_id'] : $anrechnung->notiz_id = null;
+		$anrechnung->genehmigt_von = $_POST['genehmigt_von'];
+		$anrechnung->insertvon = $user;
+		$anrechnung->updatevon = $user;
+
+		if($anrechnung->save())
+		{
+			$return = true;
+		}
+		else
+		{
+			$return = false;
+			$errormsg = $anrechnung->errormsg;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deleteanrechnung')
+	{
+		//Loescht eine Anrechunng
+		if(isset($_POST['anrechnung_id']) && is_numeric($_POST['anrechnung_id']))
+		{
+			if(!$rechte->isBerechtigt('admin', $_POST['studiengang_kz'], 'suid') && !$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid'))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = 'Sie haben keine Berechtigung';
+			}
+			else
+			{
+				$anrechnung = new anrechnung();
+
+				if($anrechnung->delete($_POST['anrechnung_id']))
+				{
+					$return = true;
+				}
+				else
+				{
+					$errormsg = $anrechnung->errormsg;
+					$return = false;
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+
+    //******** AUFNAHMETERMINE *****
+	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineSave')  // **** AufnahmeTermine **** //
+	{
+		//Speichert einen Aufnahmetermin einer Person
+		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
+		{
+			$prestudent = new prestudent();
+			if(!$prestudent->load($_POST['prestudent_id']))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = $prestudent->errormsg;
+			}
+			else
+			{
+				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+					$rt_person_id = $_POST['rt_person_id'];
+					$rt_id = $_POST['rt_id'];
+					$person_id = $_POST['person_id'];
+					if($person_id=='')
+						$person_id=$prestudent->person_id;
+					$punkte = str_replace(',','.',$_POST['punkte']);
+					$teilgenommen = ($_POST['teilgenommen']=='true'?true:false);
+					$anmeldedatum = $_POST['anmeldedatum'];
+					$studienplan_id = $_POST['studienplan_id'];
+
+					$reihungstest = new reihungstest();
+
+					if($rt_person_id!='')
+					{
+						$reihungstest->loadReihungstestPerson($rt_person_id);
+					}
+					else
+					{
+						$reihungstest->new=true;
+					}
+
+					$warnung_zu_viele_teilnehmer = false;
+					$warnung_raumzuordnungentfernt = false;
+					if($reihungstest->reihungstest_id != $rt_id)
+					{
+						// Wenn ein neuer Reihungstesttermin ausgewählt wird, dann wird geprueft ob
+						// noch genuegend Platz vorhanden ist.
+						$rt_help = new reihungstest();
+						$aktuelle_anzahl = $rt_help->getTeilnehmerAnzahl($rt_id);
+						$rt_help->load($rt_id);
+						$max_teilnehmer = $rt_help->max_teilnehmer;
+						if($max_teilnehmer == '')
+						{
+							// Wenn keine Teilnehmer eingetragen sind, dann schauen welche Raeume zugeteilt
+							// sind und wie viel Platz dort ist
+							$max_teilnehmer = $rt_help->getPlatzAnzahlRaum($rt_id);
+						}
+						if($max_teilnehmer!='' && $aktuelle_anzahl >= $max_teilnehmer)
+							$warnung_zu_viele_teilnehmer = true;
+
+						if ($reihungstest->ort_kurzbz != '')
+						{
+							$reihungstest->ort_kurzbz = '';
+							$warnung_raumzuordnungentfernt = true;
+						}
+					}
+					$reihungstest->reihungstest_id = $rt_id;
+					$reihungstest->person_id = $person_id;
+					$reihungstest->punkte = $punkte;
+					$reihungstest->teilgenommen = $teilgenommen;
+					$reihungstest->anmeldedatum = $anmeldedatum;
+					$reihungstest->studienplan_id = $studienplan_id;
+                    ($reihungstest->new) ? $reihungstest->insertamum = date('Y-m-d H:i:s'): $reihungstest->updateamum = date('Y-m-d H:i:s');
+                    ($reihungstest->new) ? $reihungstest->insertvon = $user : $reihungstest->updatevon = $user;
+
+					if($reihungstest->savePersonReihungstest())
+					{
+						$return = true;
+						$error = false;
+						$errormsg = 'Erfolgreich gespeichert';
+						$data = $reihungstest->rt_person_id;
+						if($warnung_zu_viele_teilnehmer)
+						{
+							$return = false;
+							$error = true;
+							$errormsg .= ' - Achtung - die Maximalanzahl der Teilnehmer wurde überschritten;'.
+							' Prüfen Sie ob genug Platz zur Verfügung steht';
+						}
+						if ($warnung_raumzuordnungentfernt)
+						{
+							$return = false;
+							$error = true;
+							$errormsg .= ' - Achtung - Die Person war bereits einem Raum für den Reihungstest zugeordnet.'.
+							'Die Raumzuordnung wurde entfernt.';
+						}
+					}
+					else
+					{
+						$return = false;
+						$error = true;
+						$errormsg = $reihungstest->errormsg;
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineDelete')
+	{
+		//Loescht einen Aufnahmetermin einer Person
+		if(isset($_POST['rt_person_id']) && is_numeric($_POST['rt_person_id']))
+		{
+			$rt_person_id = $_POST['rt_person_id'];
+			$reihungstest = new reihungstest();
+			if(!$reihungstest->loadReihungstestPerson($rt_person_id))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = $reihungstest->errormsg;
+			}
+			else
+			{
+				$prestudent = new prestudent();
+				if(!$prestudent->getPrestudenten($reihungstest->person_id))
+				{
+					$return = false;
+					$error = true;
+					$errormsg = $prestudent->errormsg;
+				}
+				else
+				{
+					$berechtigt = false;
+					foreach($prestudent->result as $row_prest)
+					{
+						if($rechte->isBerechtigt('admin', $row_prest->studiengang_kz, 'suid') || $rechte->isBerechtigt('assistenz', $row_prest->studiengang_kz, 'suid'))
+						{
+							$berechtigt = true;
+							break;
+						}
+					}
+
+					if(!$berechtigt)
+					{
+						$return = false;
+						$error = true;
+						$errormsg = 'Sie haben keine Berechtigung';
+					}
+					else
+					{
+						$reihungstest = new reihungstest();
+
+						if($reihungstest->deletePersonReihungstest($rt_person_id))
+						{
+							$return = true;
+							$error = false;
+							$errormsg = 'Erfolgreich geloescht';
+						}
+						else
+						{
+							$return = false;
+							$error = true;
+							$errormsg = $reihungstest->errormsg;
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineSaveGesamtpunkte')
+	{
+		//Speichert einen Aufnahmetermin einer Person
+		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
+		{
+			$prestudent = new prestudent();
+			if(!$prestudent->load($_POST['prestudent_id']))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = $prestudent->errormsg;
+			}
+			else
+			{
+				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
+				{
+					$return = false;
+					$error = true;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+					$punkte = str_replace(',','.',$_POST['punkte']);
+					$reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
+					$prestudent->punkte = $punkte;
+					$prestudent->reihungstestangetreten = $reihungstestangetreten;
+					$prestudent->aufnahmegruppe_kurzbz = $_POST['aufnahmegruppe_kurzbz'];
+					$prestudent->new=false;
+
+					if($prestudent->save())
+					{
+						$return = true;
+						$error = false;
+						$errormsg = 'Erfolgreich gespeichert';
+					}
+					else
+					{
+						$return = false;
+						$error = true;
+						$errormsg = $reihungstest->errormsg;
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='AufnahmeTermineBerechneGesamtpunkte')
+	{
+		//Speichert einen Aufnahmetermin einer Person
+		if(isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']))
+		{
+			$prestudent = new prestudent();
+			if(!$prestudent->load($_POST['prestudent_id']))
+			{
+				$return = false;
+				$error = true;
+				$errormsg = $prestudent->errormsg;
+			}
+			else
+			{
+				if(!$rechte->isBerechtigt('admin', $prestudent->studiengang_kz, 'suid') && !$rechte->isBerechtigt('assistenz', $prestudent->studiengang_kz, 'suid'))
+				{
+					$return = false;
+					$error = true;
+				}
+				else
+				{
+					$gesamtpunkte_arr = array();
+					$reihungstest = new reihungstest();
+					if($reihungstest->getReihungstestPerson($prestudent->person_id))
+					{
+						foreach($reihungstest->result as $row)
+						{
+							$studienplan = new studienplan();
+							if($studienplan->loadStudienplan($row->studienplan_id))
+							{
+								$studienordnung = new studienordnung();
+								if($studienordnung->loadStudienordnung($studienplan->studienordnung_id))
+								{
+									if($studienordnung->studiengang_kz == $prestudent->studiengang_kz)
+									{
+										$rt_obj = new reihungstest();
+										$rt_obj->load($row->reihungstest_id);
+										if(!isset($gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz]))
+											$gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz]=0;
+										$gesamtpunkte_arr[$rt_obj->studiensemester_kurzbz] += $row->punkte;
+									}
+								}
+								else
+								{
+									$return = false;
+									$errormsg = $studienordnung->errormsg;
+									$error = true;
+								}
+							}
+							else
+							{
+								$return = false;
+								$errormsg = $studienplan->errormsg;
+								$error = true;
+							}
+						}
+
+						if(!$error)
+						{
+							if(count(array_keys($gesamtpunkte_arr))>0)
+							{
+								$studiensemester = new studiensemester();
+								$stsem = $studiensemester->getYoungestFromArray(array_keys($gesamtpunkte_arr));
+								$gesamtpunkte = $gesamtpunkte_arr[$stsem];
+							}
+							else
+								$gesamtpunkte = '0';
+							$return = true;
+							$error = false;
+							$data = $gesamtpunkte;
+							$errormsg = 'Erfolgreich gespeichert';
+						}
+					}
+					else
+					{
+						$return = false;
+						$error = true;
+						$errormsg = $reihungstest->errormsg;
+					}
+				}
+			}
+		}
+		else
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Falsche Parameteruebergabe';
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='savemobilitaet')
+	{
+		// Speichert Mobilitaet/Gemeinsames Studium
+		$prestudent_id = $_POST['prestudent_id'];
+		$prestudent_obj = new prestudent();
+		$prestudent_obj->load($prestudent_id);
+
+		if(!$rechte->isBerechtigt('student/stammdaten', $prestudent_obj->studiengang_kz, 'suid'))
+		{
+			$return = false;
+			$error = true;
+			$errormsg = 'Sie haben keine Berechtigung';
+		}
+		else
+		{
+			$mob = new mobilitaet();
+
+			$error = false;
+			if(isset($_POST['mobilitaet_id']))
+			{
+				$mobilitaet_id = $_POST['mobilitaet_id'];
+				if(!$mob->load($mobilitaet_id))
+				{
+					$error=true;
+					$errormsg = $mob->errormsg;
+				}
+			}
+			else
+			{
+				$mob->new = true;
+				$mob->inservon = $user;
+			}
+
+			if(isset($_POST['studiensemester_kurzbz'])
+			&& isset($_POST['mobilitaetsprogramm_code'])
+			&& isset($_POST['gsprogramm_id'])
+			&& isset($_POST['mobilitaetstyp_kurzbz'])
+			&& isset($_POST['firma_id'])
+			&& isset($_POST['status_kurzbz'])
+			&& isset($_POST['ausbildungssemester']))
+			{
+				$studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
+				$mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
+				$gsprogramm_id = $_POST['gsprogramm_id'];
+				$mobilitaetstyp_kurzbz = $_POST['mobilitaetstyp_kurzbz'];
+				$firma_id = $_POST['firma_id'];
+				$status_kurzbz = $_POST['status_kurzbz'];
+				$ausbildungssemester = $_POST['ausbildungssemester'];
+			}
+			else
+			{
+				$error = true;
+				$errormsg = 'Fehlerhafte Parameteruebergabe';
+				$return = false;
+			}
+
+			if(!$error)
+			{
+				$mob->prestudent_id = $prestudent_id;
+				$mob->studiensemester_kurzbz = $studiensemester_kurzbz;
+				$mob->mobilitaetsprogramm_code = $mobilitaetsprogramm_code;
+				$mob->gsprogramm_id = $gsprogramm_id;
+				$mob->mobilitaetstyp_kurzbz = $mobilitaetstyp_kurzbz;
+				$mob->firma_id = $firma_id;
+				$mob->status_kurzbz = $status_kurzbz;
+				$mob->ausbildungssemester = $ausbildungssemester;
+				$mob->updatevon = $user;
+
+				if($mob->save())
+				{
+					$return = true;
+					$data = $mob->mobilitaet_id;
+				}
+				else
+				{
+					$return = false;
+					$error = true;
+					$errormsg = $mob->errormsg;
+				}
+			}
+			else
+			{
+				$return = false;
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='deletemobilitaet')
+	{
+		$mobilitaet_id = $_POST['mobilitaet_id'];
+		$mob = new mobilitaet();
+		if($mob->load($mobilitaet_id))
+		{
+			$prestudent = new prestudent();
+			if($prestudent->load($mob->prestudent_id))
+			{
+				if(!$rechte->isBerechtigt('student/stammdaten',$prestudent->studiengang_kz,'suid'))
+				{
+					$error = true;
+					$return = false;
+					$errormsg = 'Sie haben keine Berechtigung';
+				}
+				else
+				{
+					if($mob->delete($mobilitaet_id))
+					{
+						$return = true;
+					}
+					else
+					{
+						$errormsg = $mob->errormsg;
+						$return = false;
+					}
+				}
+			}
+			else
+			{
+				$error = true;
+				$return = false;
+				$errormsg = $prestudent->errormsg;
+			}
+		}
+		else
+		{
+			$return = false;
+			$errormsg  = 'Fehlerhafte Parameteruebergabe';
+			$errormsg  = $mob->errormsg;
+		}
+	}
+	else
+	{
+		$return = false;
+		$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
+		$data = '';
+	}
+}
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:NC="http://home.netscape.com/NC-rdf#"
+	xmlns:DBDML="http://www.technikum-wien.at/dbdml/rdf#"
+>
+  <RDF:Seq RDF:about="http://www.technikum-wien.at/dbdml/msg">
+	<RDF:li>
+		<RDF:Description RDF:about="http://www.technikum-wien.at/dbdml/0" >
+			<DBDML:return>'.($return?'true':'false').'</DBDML:return>
+			<DBDML:errormsg><![CDATA['.$errormsg.']]></DBDML:errormsg>
+			<DBDML:warning><![CDATA['.$warning.']]></DBDML:warning>
+			<DBDML:data><![CDATA['.$data.']]></DBDML:data>
+		</RDF:Description>
+	</RDF:li>
+  </RDF:Seq>
+</RDF:RDF>';
+?>
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index a38d195a5..7f45342dc 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -69,6 +69,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						<row>
 							<label value="Person ID" control="student-detail-textbox-person_id"/>
 							<hbox><textbox id="student-detail-textbox-person_id" readonly="true" maxlength="16" size="16"/></hbox>
+							<label value="Zugangscode" control="student-detail-zugangscode"/>
+							<label id="label-student-detail-link_bewerbungstool" hidden="true" value=""></label>
+							<label class="text-link" href="#" id="label-student-detail-zugangscode" value="" onclick="window.open(document.getElementById('label-student-detail-link_bewerbungstool').value)"/>
+
 						</row>
 						<row>
 							<label value="Anrede" control="student-detail-textbox-anrede"/>
@@ -145,12 +149,16 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						</row>
 						<row>
 							<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
-							<menulist id="student-detail-menulist-geschlecht" disabled="true">
-								<menupopup>
-										<menuitem value="m" label="maennlich"/>
-										<menuitem value="w" label="weiblich"/>
-										<menuitem value="u" label="unbekannt"/>
-								</menupopup>
+							<menulist id="student-detail-menulist-geschlecht" disabled="true"
+								datasources="<?php echo APP_ROOT ?>rdf/geschlecht.rdf.php"
+								ref="http://www.technikum-wien.at/geschlecht">
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/geschlecht/rdf#geschlecht"
+											label="rdf:http://www.technikum-wien.at/geschlecht/rdf#bezeichnung"
+											uri="rdf:*"/>
+										</menupopup>
+								</template>
 							</menulist>
 							<label value="Familienstand" control="student-detail-menulist-familienstand"/>
 							<menulist id="student-detail-menulist-familienstand" disabled="true">
@@ -475,7 +483,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</hbox>
 							<hbox>
 								<label value="Priorität" control="student-prestudent-textbox-priorisierung"/>
-								<?php 
+								<?php
 									$readonly = 'readonly="true"';
 									$rechte = new benutzerberechtigung();
 									$rechte->getBerechtigungen($user);
@@ -492,105 +500,176 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					</rows>
 				</grid>
 			</groupbox>
-			<groupbox id="student-detail-groupbox-rollen">
-			<caption label="Status" />
-					<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
-							datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
-							style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="200px" enableColumnDrag="true"
-							flags="dont-build-content"
-							context="student-prestudent-rolle-tree-popup"
-							ondblclick="StudentRolleBearbeiten()"
-					>
-						<treecols>
-							<treecol id="student-prestudent-tree-rolle-status_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="3" hidden="false" persist="hidden, width, ordinal"
-							 class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"
-								sorthints="integer"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-lehrverband" label="Lehrverband" flex="1" hidden="false" persist="hidden, width, ordinal"
-									 class="sortDirectionIndicator"
-									 sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-orgform_kurzbz" label="Organisationsform" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-prestudent_id" label="PrestudentInID" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studienplan_id" label="StudienplanID" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-anmerkung" label="Anmerkung" flex="2" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="1" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bewerbung_abgeschicktamum" label="AbgeschicktAm" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-statusgrund" label="Statusgrund" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund" />
-							<splitter class="tree-splitter"/>
-						</treecols>
-
-						<template>
-							<rule>
-								<treechildren flex="1" >
-				 					<treeitem uri="rdf:*">
-										<treerow>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
-										</treerow>
-									</treeitem>
-								</treechildren>
-							</rule>
-						</template>
-					</tree>
-			</groupbox>
 			<hbox>
 				<spacer flex="1" />
 				<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="true"/>
 			</hbox>
+			<hbox flex="1">
+				<groupbox id="student-detail-groupbox-rollen" flex="3">
+				<caption label="Status" />
+						<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
+								datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
+								style="margin-left:10px;margin-right:10px;margin-bottom:5px;min-height: 200px" height="200px" enableColumnDrag="true"
+								flags="dont-build-content"
+								context="student-prestudent-rolle-tree-popup"
+								ondblclick="StudentRolleBearbeiten()"
+						>
+							<treecols>
+								<treecol id="student-prestudent-tree-rolle-status_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="2" hidden="false" persist="hidden, width, ordinal"
+								 class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Sem" flex="1" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"
+									sorthints="integer"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-lehrverband" label="Lehrverband" flex="1" hidden="false" persist="hidden, width, ordinal"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-orgform_kurzbz" label="Organisationsform" flex="2" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-prestudent_id" label="PrestudentInID" flex="2" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-studienplan_id" label="StudienplanID" flex="2" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-anmerkung" label="Anmerkung" flex="2" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="1" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="1" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-bewerbung_abgeschicktamum" label="AbgeschicktAm" flex="1" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum" />
+								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-statusgrund" label="Statusgrund" flex="1" hidden="false" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund" />
+								<splitter class="tree-splitter"/>
+							</treecols>
+
+							<template>
+								<rule>
+									<treechildren flex="1" >
+										<treeitem uri="rdf:*">
+											<treerow>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
+												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
+											</treerow>
+										</treeitem>
+									</treechildren>
+								</rule>
+							</template>
+						</tree>
+				</groupbox>
+				<groupbox id="student-detail-groupbox-historie" flex="2">
+					<caption label="Gesamthistorie" />
+					<vbox flex="1">
+						<tree id="historie-tree" seltype="single" hidecolumnpicker="true" flex="1"
+							  datasources="rdf:null" ref="http://www.technikum-wien.at/prestudenthistorie/liste"
+							  style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px"
+							  persist="hidden, height"
+							  context="historie-tree-popup"
+						>
+							<treecols>
+								<treecol id="historie-treecol-studiensemester_kurzbz" label="StSem" flex="1" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studiensemester_kurzbz" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-prioritaet" label="Prio" flex="1" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#prioritaet" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-studiengang" label="Stg" flex="1" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studiengang" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-orgform_kurzbz" label="Orgform" flex="1" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#orgform_kurzbz" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-studienplan_bezeichnung" label="Studienplan" flex="3" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studienplan_bezeichnung" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<!--<treecol id="historie-treecol-reihung_absolviert" label="Reihung absolviert" flex="2" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#reihung_absolviert" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>-->
+								<treecol id="historie-treecol-uid" label="UID" flex="2" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#uid" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-status" label="Status" flex="4" hidden="false"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#status" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+								<treecol id="historie-treecol-prestudent_id" label="PrestudentID" flex="1" hidden="true"
+										 class="sortDirectionIndicator"
+										 sort="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#prestudent_id" onclick="historieTreeSort()"/>
+								<splitter class="tree-splitter"/>
+							</treecols>
+
+							<template>
+								<rule>
+									<treechildren>
+										<treeitem uri="rdf:*">
+											<treerow>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studiensemester_kurzbz" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#prioritaet" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studiengang" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#orgform_kurzbz" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#studienplan_bezeichnung" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#uid" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#status" />
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#aktiv rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#bold" label="rdf:http://www.technikum-wien.at/prestudenthistorie/rdf#prestudent_id" />
+											</treerow>
+										</treeitem>
+									</treechildren>
+								</rule>
+							</template>
+						</tree>
+					</vbox>
+				</groupbox>
+			</hbox>
 </vbox>
 
 </overlay>
diff --git a/content/student/studentnotenoverlay.xul.php b/content/student/studentnotenoverlay.xul.php
index 5747c97aa..498651581 100644
--- a/content/student/studentnotenoverlay.xul.php
+++ b/content/student/studentnotenoverlay.xul.php
@@ -1,281 +1,286 @@
-<?php
-/* Copyright (C) 2006 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: Christian Paminger <christian.paminger@technikum-wien.at>,
- *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
- */
-
-header("Cache-Control: no-cache");
-header("Cache-Control: post-check=0, pre-check=0",false);
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Pragma: no-cache");
-header("Content-type: application/vnd.mozilla.xul+xml");
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../config/global.config.inc.php');
-echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
-
-if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
-	$punktehidden = 'false';
-else
-	$punktehidden = 'true';
-
-echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css\" ?>";
-?>
-
-<overlay id="StudentKonto"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-<!-- Zeugnis Overlay -->
-<vbox id="student-noten" style="overflow:auto;margin:0px;" flex="1">
-<popupset>
-	<menupopup id="student-noten-tree-popup">
-		<menuitem label="Entfernen" oncommand="StudentNotenDelete();" id="student-noten-tree-popup-delete" hidden="false"/>
-		<menuitem label="Zertifikat erstellen" oncommand="StudentFFZertifikatPrint(event);" id="student-noten-tree-popup-ffzertifikat" hidden="false"/>
-		<menuitem label="Lehrveranstaltungszeugnis erstellen" oncommand="StudentLVZeugnisPrint(event, 'German');" id="student-noten-tree-popup-lvzeugnis" hidden="false"/>
-		<menuitem label="Lehrveranstaltungszeugnis Englisch erstellen" oncommand="StudentLVZeugnisPrint(event, 'English');" id="student-noten-tree-popup-lvzeugnis_eng" hidden="false"/>
-	</menupopup>
-</popupset>
-<hbox flex="1" style="margin-top: 10px;">
-	<vbox flex="1">
-	<label value='Zeugnis' />
-	<tree id="student-noten-tree" seltype="single" hidecolumnpicker="false" flex="1"
-		datasources="rdf:null" ref="http://www.technikum-wien.at/zeugnisnote/liste"
-		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
-		context="student-noten-tree-popup"
-		flags="dont-build-content"
-	>
-		<treecols>
-			<treecol id="student-noten-tree-zeugnis" label="Zeugnis" hidden="false" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator" tooltiptext="Zeugnisoption deaktiviert"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#Zeugnis"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-lehrveranstaltung_bezeichnung" label="Lehrveranstaltung" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sortActive="true"
-				sortDirection="ascending"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-note_bezeichnung" label="Note" flex="5" hidden="false" persist="hidden, width, ordinal"
-			   class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note_bezeichnung"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-uebernahmedatum" label="Uebernahmedatum" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#uebernahmedatum_iso" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-benotungsdatum" label="Benotungsdatum" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-benotungsdatum-iso" label="BenotungsdatumISO" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-studiensemester_kurzbz" label="Studiensemester" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiensemester_kurzbz" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-note" label="Note" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-student_uid" label="Uid" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_uid" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-studiengang" label="Studiengang" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-studiengang_kz" label="Studiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-studiengang_lv" label="StudiengangLV" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_lv" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-semester_lv" label="SemesterLV" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#semester_lv" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-ects_lv" label="ECTS" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#ects_lv" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-lehrform" label="Lehrform" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_lehrform" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-kurzbz" label="Kurzbz" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-punkte" label="Punkte" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte" />
-			<splitter class="tree-splitter"/>
-			<treecol id="student-noten-tree-lehrveranstaltung_bezeichnung_english" label="Englisch" flex="2" hidden="true" persist="hidden, width, ordinal"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#NOTE:lehrveranstaltung_bezeichnung_english" />
-			<splitter class="tree-splitter"/>
-		</treecols>
-
-		<template>
-			<treechildren flex="1" >
-					<treeitem uri="rdf:*">
-					<treerow>
-						<treecell src="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#zeugnis"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note_bezeichnung"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#uebernahmedatum"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiensemester_kurzbz"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_uid"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_lv"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#semester_lv"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#ects_lv"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_lehrform"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
-						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung_english"/>
-					</treerow>
-				</treeitem>
-			</treechildren>
-		</template>
-	</tree>
-	</vbox>
-	<vbox>
-		<spacer flex="1"/>
-		<button id="student-note-copy" label="&lt;=" style="font-weight: bold;" oncommand="StudentNotenMove();"/>
-		<spacer flex="1"/>
-	</vbox>
-
-	<vbox flex="1">
-	<label value='LektorIn' />
-	<tree id="student-lvgesamtnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
-		datasources="rdf:null" ref="http://www.technikum-wien.at/lvgesamtnote/liste"
-		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
-		flags="dont-build-content"
-	>
-
-		<treecols>
-			<treecol id="student-lvgesamtnoten-tree-lehrveranstaltung_bezeichnung" label="Lehrveranstaltung" flex="2" hidden="false" primary="true"
-				class="sortDirectionIndicator"
-				sortActive="true"
-				sortDirection="ascending"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_bezeichnung"
-				onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-note_bezeichnung" label="Note" flex="5" hidden="false"
-			   class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note_bezeichnung" onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-mitarbeiter_uid" label="MitarbeiterInUID" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#mitarbeiter_uid"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-benotungsdatum" label="Benotungsdatum" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-benotungsdatum-iso" label="BenotungsdatumISO" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-freigabedatum" label="Freigabedatum" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#freigabedatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-studiensemester_kurzbz" label="Studiensemester" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#studiensemester_kurzbz"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-note" label="Note" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-student_uid" label="StudentInUID" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-			<treecol id="student-lvgesamtnoten-tree-punkte" label="Punkte" flex="2" hidden="true"
-				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"  onclick="StudentLVGesamtNotenTreeSort()"/>
-			<splitter class="tree-splitter"/>
-		</treecols>
-
-		<template>
-			<treechildren flex="1" >
-					<treeitem uri="rdf:*">
-					<treerow>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_bezeichnung"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note_bezeichnung"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#mitarbeiter_uid"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#freigabedatum"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#studiensemester_kurzbz"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"/>
-						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"/>
-					</treerow>
-				</treeitem>
-			</treechildren>
-		</template>
-	</tree>
-	</vbox>
-</hbox>
-<hbox>
-	<label value="Note" control="student-noten-menulist-note"/>
-	<menulist id="student-noten-menulist-note" disabled="true"
-	          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
-	          ref="http://www.technikum-wien.at/note/liste"
-	          oncommand="StudentNoteSpeichern()">
-		<template>
-			<menupopup>
-				<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-	        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-				  		  uri="rdf:*"/>
-				</menupopup>
-		</template>
-	</menulist>
-	<label value="Punkte" control="student-noten-textbox-punkte" hidden="<?php echo $punktehidden; ?>"/>
-	<textbox id="student-noten-textbox-punkte" oninput="StudentNotenPunkteChange()" disabled="true" hidden="<?php echo $punktehidden; ?>"/>
-
-	<button id="student-noten-button-speichern" oncommand="StudentNoteSpeichern()" label="Speichern" disabled="true" hidden="<?php echo $punktehidden; ?>"/>
-
-	<spacer flex="1" />
-</hbox>
-</vbox>
-</overlay>
+<?php
+/* Copyright (C) 2006 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: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../config/global.config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
+
+if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+	$punktehidden = 'false';
+else
+	$punktehidden = 'true';
+
+echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css\" ?>";
+?>
+
+<overlay id="StudentKonto"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+<!-- Zeugnis Overlay -->
+<vbox id="student-noten" style="overflow:auto;margin:0px;" flex="1">
+<popupset>
+	<menupopup id="student-noten-tree-popup">
+		<menuitem label="Entfernen" oncommand="StudentNotenDelete();" id="student-noten-tree-popup-delete" hidden="false"/>
+		<menuitem label="Zertifikat erstellen" oncommand="StudentFFZertifikatPrint(event);" id="student-noten-tree-popup-ffzertifikat" hidden="false"/>
+		<menuitem label="Lehrveranstaltungszeugnis erstellen" oncommand="StudentLVZeugnisPrint(event, 'German');" id="student-noten-tree-popup-lvzeugnis" hidden="false"/>
+		<menuitem label="Lehrveranstaltungszeugnis Englisch erstellen" oncommand="StudentLVZeugnisPrint(event, 'English');" id="student-noten-tree-popup-lvzeugnis_eng" hidden="false"/>
+	</menupopup>
+</popupset>
+<hbox flex="1" style="margin-top: 10px;">
+	<vbox flex="1">
+	<label value='Zeugnis' />
+	<tree id="student-noten-tree" seltype="single" hidecolumnpicker="false" flex="1"
+		datasources="rdf:null" ref="http://www.technikum-wien.at/zeugnisnote/liste"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
+		context="student-noten-tree-popup"
+		flags="dont-build-content"
+	>
+		<treecols>
+			<treecol id="student-noten-tree-zeugnis" label="Zeugnis" hidden="false" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator" tooltiptext="Zeugnisoption deaktiviert"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#Zeugnis"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-lehrveranstaltung_bezeichnung" label="Lehrveranstaltung" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sortActive="true"
+				sortDirection="ascending"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-note_bezeichnung" label="Note" flex="5" hidden="false" persist="hidden, width, ordinal"
+			   class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note_bezeichnung"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-uebernahmedatum" label="Uebernahmedatum" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#uebernahmedatum_iso" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-benotungsdatum" label="Benotungsdatum" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-benotungsdatum-iso" label="BenotungsdatumISO" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-studiensemester_kurzbz" label="Studiensemester" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiensemester_kurzbz" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-note" label="Note" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-student_uid" label="Uid" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_uid" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-studiengang" label="Studiengang" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-studiengang_kz" label="Studiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-studiengang_lv" label="StudiengangLV" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_lv" />
+            <splitter class="tree-splitter"/>
+            <treecol id="student-noten-tree-studiengang_kz_lv" label="Studiengang_kzLV" flex="1" hidden="true" persist="hidden, width, ordinal"
+                     class="sortDirectionIndicator"
+                     sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-semester_lv" label="SemesterLV" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#semester_lv" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-ects_lv" label="ECTS" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#ects_lv" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-lehrform" label="Lehrform" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_lehrform" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-kurzbz" label="Kurzbz" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-punkte" label="Punkte" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte" />
+			<splitter class="tree-splitter"/>
+			<treecol id="student-noten-tree-lehrveranstaltung_bezeichnung_english" label="Englisch" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#NOTE:lehrveranstaltung_bezeichnung_english" />
+			<splitter class="tree-splitter"/>
+		</treecols>
+
+		<template>
+			<treechildren flex="1" >
+					<treeitem uri="rdf:*">
+					<treerow>
+						<treecell src="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#zeugnis"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#uebernahmedatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#benotungsdatum_iso"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiensemester_kurzbz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#note"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_uid"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_lv"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#semester_lv"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#ects_lv"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_lehrform"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_kurzbz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_bezeichnung_english"/>
+					</treerow>
+				</treeitem>
+			</treechildren>
+		</template>
+	</tree>
+	</vbox>
+	<vbox>
+		<spacer flex="1"/>
+		<button id="student-note-copy" label="&lt;=" style="font-weight: bold;" oncommand="StudentNotenMove();"/>
+		<spacer flex="1"/>
+	</vbox>
+
+	<vbox flex="1">
+	<label value='LektorIn' />
+	<tree id="student-lvgesamtnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
+		datasources="rdf:null" ref="http://www.technikum-wien.at/lvgesamtnote/liste"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
+		flags="dont-build-content"
+	>
+
+		<treecols>
+			<treecol id="student-lvgesamtnoten-tree-lehrveranstaltung_bezeichnung" label="Lehrveranstaltung" flex="2" hidden="false" primary="true"
+				class="sortDirectionIndicator"
+				sortActive="true"
+				sortDirection="ascending"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_bezeichnung"
+				onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-note_bezeichnung" label="Note" flex="5" hidden="false"
+			   class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note_bezeichnung" onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-mitarbeiter_uid" label="MitarbeiterInUID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#mitarbeiter_uid"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-benotungsdatum" label="Benotungsdatum" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-benotungsdatum-iso" label="BenotungsdatumISO" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-freigabedatum" label="Freigabedatum" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#freigabedatum_iso"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-studiensemester_kurzbz" label="Studiensemester" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#studiensemester_kurzbz"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-note" label="Note" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-student_uid" label="StudentInUID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-lvgesamtnoten-tree-punkte" label="Punkte" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"  onclick="StudentLVGesamtNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+		</treecols>
+
+		<template>
+			<treechildren flex="1" >
+					<treeitem uri="rdf:*">
+					<treerow>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#mitarbeiter_uid"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#benotungsdatum_iso"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#freigabedatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#studiensemester_kurzbz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#note"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#student_uid"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#lehrveranstaltung_id"/>
+						<treecell label="rdf:http://www.technikum-wien.at/lvgesamtnote/rdf#punkte"/>
+					</treerow>
+				</treeitem>
+			</treechildren>
+		</template>
+	</tree>
+	</vbox>
+</hbox>
+<hbox>
+	<label value="Note" control="student-noten-menulist-note"/>
+	<menulist id="student-noten-menulist-note" disabled="true"
+	          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
+	          ref="http://www.technikum-wien.at/note/liste"
+	          oncommand="StudentNoteSpeichern()">
+		<template>
+			<menupopup>
+				<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+	        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+				  		  uri="rdf:*"/>
+				</menupopup>
+		</template>
+	</menulist>
+	<label value="Punkte" control="student-noten-textbox-punkte" hidden="<?php echo $punktehidden; ?>"/>
+	<textbox id="student-noten-textbox-punkte" oninput="StudentNotenPunkteChange()" disabled="true" hidden="<?php echo $punktehidden; ?>"/>
+
+	<button id="student-noten-button-speichern" oncommand="StudentNoteSpeichern()" label="Speichern" disabled="true" hidden="<?php echo $punktehidden; ?>"/>
+
+	<spacer flex="1" />
+</hbox>
+</vbox>
+</overlay>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index b40105988..6dbaa55e8 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -476,7 +476,7 @@ function StudentFFZertifikatPrint(event)
 	col = tree.columns ? tree.columns["student-noten-tree-studiensemester_kurzbz"] : "student-noten-tree-studiensemester_kurzbz";
 	stsem = tree.view.getCellText(tree.currentIndex,col);
 
-	col = tree.columns ? tree.columns["student-noten-tree-studiengang_kz"] : "student-noten-tree-studiengang_kz";
+	col = tree.columns ? tree.columns["student-noten-tree-studiengang_kz_lv"] : "student-noten-tree-studiengang_kz_lv";
 	stg_kz = tree.view.getCellText(tree.currentIndex,col);
 
 	if (event.shiftKey)
@@ -1055,6 +1055,8 @@ function StudentAuswahl()
 	status=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#status" ));
 	alias=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#alias" ));
 	matr_nr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#matr_nr" ));
+	zugangscode=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zugangscode" ));
+	link_bewerbungstool=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#link_bewerbungstool" ));
 
 	//Bei Incoming wird das Menue zur Statusaenderung deaktiviert
 	if(status=='Incoming')
@@ -1099,6 +1101,8 @@ function StudentAuswahl()
 	document.getElementById('student-detail-textbox-person_id').value = person_id;
 	document.getElementById('student-detail-textbox-alias').value=alias;
 	document.getElementById('student-detail-textbox-matr_nr').value=matr_nr;
+	document.getElementById('label-student-detail-zugangscode').value=zugangscode;
+	document.getElementById('label-student-detail-link_bewerbungstool').value=link_bewerbungstool;
 
 	//PreStudent Daten holen
 
@@ -1187,6 +1191,22 @@ function StudentAuswahl()
 	rollentree.database.AddDataSource(StudentDetailRolleTreeDatasource);
 	StudentDetailRolleTreeDatasource.addXMLSinkObserver(StudentDetailRolleTreeSinkObserver);
 
+	var historietree = document.getElementById('historie-tree');
+	url_historie='<?php echo APP_ROOT;?>rdf/prestudenthistorie.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
+
+	//Alte DS entfernen
+	var oldDatasourcesHistorie = historietree.database.GetDataSources();
+	while(oldDatasourcesHistorie.hasMoreElements())
+	{
+		historietree.database.RemoveDataSource(oldDatasourcesHistorie.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	historietree.builder.rebuild();
+
+	var HistorieTreeDatasource = rdfService.GetDataSource(url_historie);
+	HistorieTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+	historietree.database.AddDataSource(HistorieTreeDatasource);
+
 	if(uid=='')
 	{
 		//PRESTUDENT
diff --git a/content/student/studentprojektarbeitoverlay.xul.php b/content/student/studentprojektarbeitoverlay.xul.php
index 39dcaed20..fe4b8b2b9 100644
--- a/content/student/studentprojektarbeitoverlay.xul.php
+++ b/content/student/studentprojektarbeitoverlay.xul.php
@@ -247,6 +247,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							<label value="Lehreinheit" control="student-projektarbeit-menulist-lehreinheit"/>
 							<menulist id="student-projektarbeit-menulist-lehreinheit" disabled="true"
 							          datasources="rdf:null" flex="1"
+									  style="max-width: 600px"
 							          ref="http://www.technikum-wien.at/lehreinheit/liste" >
 								<template>
 									<menupopup>
diff --git a/include/bankverbindung.class.php b/include/bankverbindung.class.php
index b9056f3b8..44139375e 100644
--- a/include/bankverbindung.class.php
+++ b/include/bankverbindung.class.php
@@ -16,8 +16,8 @@
  * 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>.
+ *		  Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *		  Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
  */
 /**
  * Klasse bankverbindung
@@ -47,6 +47,7 @@ class bankverbindung extends basis_db
 	public $updateamum;			// timestamp
 	public $updatevon;			// bigint
 	public $oe_kurzbz;			// string
+	public $orgform_kurzbz;		// string
 
 	/**
 	 * Konstruktor
@@ -95,6 +96,7 @@ class bankverbindung extends basis_db
 				$this->insertvon = $row->insertvon;
 				$this->ext_id = $row->ext_id;
 				$this->oe_kurzbz = $row->oe_kurzbz;
+				$this->orgform_kurzbz = $row->orgform_kurzbz;
 				return true;
 			}
 			else
@@ -176,19 +178,20 @@ class bankverbindung extends basis_db
 			//Neuen Datensatz einfuegen
 
 			$qry = 'BEGIN;INSERT INTO public.tbl_bankverbindung  (person_id, name, anschrift, blz, bic,
-			       kontonr, iban, typ, oe_kurzbz, verrechnung, insertamum, insertvon, updateamum, updatevon) VALUES('.
-			       $this->db_add_param($this->person_id, FHC_INTEGER).', '.
-			       $this->db_add_param($this->name).', '.
-			       $this->db_add_param($this->anschrift).', '.
-			       $this->db_add_param($this->blz).', '.
-			       $this->db_add_param($this->bic).', '.
-			       $this->db_add_param($this->kontonr).', '.
-			       $this->db_add_param($this->iban).', '.
-			       $this->db_add_param($this->typ).', '.
-			       $this->db_add_param($this->oe_kurzbz).', '.
-                   $this->db_add_param($this->verrechnung, FHC_BOOLEAN).',  now(), '.
-			       $this->db_add_param($this->insertvon).', now(), '.
-			       $this->db_add_param($this->updatevon).');';
+					kontonr, iban, typ, oe_kurzbz, orgform_kurzbz, verrechnung, insertamum, insertvon, updateamum, updatevon) VALUES('.
+					$this->db_add_param($this->person_id, FHC_INTEGER).', '.
+					$this->db_add_param($this->name).', '.
+					$this->db_add_param($this->anschrift).', '.
+					$this->db_add_param($this->blz).', '.
+					$this->db_add_param($this->bic).', '.
+					$this->db_add_param($this->kontonr).', '.
+					$this->db_add_param($this->iban).', '.
+					$this->db_add_param($this->typ).', '.
+					$this->db_add_param($this->oe_kurzbz).', '.
+					$this->db_add_param($this->orgform_kurzbz).', '.
+					$this->db_add_param($this->verrechnung, FHC_BOOLEAN).',  now(), '.
+					$this->db_add_param($this->insertvon).', now(), '.
+					$this->db_add_param($this->updatevon).');';
 		}
 		else
 		{
@@ -212,6 +215,7 @@ class bankverbindung extends basis_db
  			'typ='.$this->db_add_param($this->typ).', '.
  			'verrechnung='.$this->db_add_param($this->verrechnung,FHC_BOOLEAN).', '.
  			'oe_kurzbz='.$this->db_add_param($this->oe_kurzbz).', '.
+			'orgform_kurzbz='.$this->db_add_param($this->orgform_kurzbz).', '.
  			'updateamum='.$this->db_add_param($this->updateamum).','.
  			'updatevon='.$this->db_add_param($this->updatevon).' '.
  			'WHERE bankverbindung_id='.$this->db_add_param($this->bankverbindung_id).';';
@@ -315,6 +319,7 @@ class bankverbindung extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
+				$obj->orgform_kurzbz = $row->orgform_kurzbz;
 
 				$this->result[] = $obj;
 			}
@@ -328,11 +333,12 @@ class bankverbindung extends basis_db
 	}
 
 	/**
-	 * Laedt die Bankverbindung einer Organisationseinheit
-	 * @param  $person_id
+	 * Laedt die Bankverbindung einer Organisationseinheit und optional einer OrgForm
+	 * @param string $oe_kurzbz
+	 * @param string $orgform_kurzbz
 	 * @return true wenn ok, false im Fehlerfall
 	 */
-	public function load_oe($oe_kurzbz)
+	public function load_oe($oe_kurzbz, $orgform_kurzbz = null)
 	{
 		if($oe_kurzbz==null || $oe_kurzbz=='')
 		{
@@ -342,6 +348,11 @@ class bankverbindung extends basis_db
 
 		$qry = "SELECT * FROM public.tbl_bankverbindung WHERE oe_kurzbz=".$this->db_add_param($oe_kurzbz);
 
+		if($orgform_kurzbz != '')
+		{
+			$qry .= " AND orgform_kurzbz=".$this->db_add_param($orgform_kurzbz);
+		}
+
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -364,6 +375,7 @@ class bankverbindung extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
+				$obj->orgform_kurzbz = $row->orgform_kurzbz;
 
 				$this->result[] = $obj;
 			}
@@ -412,6 +424,7 @@ class bankverbindung extends basis_db
 				$this->insertvon = $row->insertvon;
 				$this->ext_id = $row->ext_id;
 				$this->oe_kurzbz = $row->oe_kurzbz;
+				$this->orgform_kurzbz = $row->orgform_kurzbz;
 	
 				return true;
 			}
diff --git a/include/gebiet.class.php b/include/gebiet.class.php
index 2491259c4..a4df72338 100644
--- a/include/gebiet.class.php
+++ b/include/gebiet.class.php
@@ -1,889 +1,1096 @@
-<?php
-/* Copyright (C) 2009 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>,
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
- *			Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
- */
-/**
- * Klasse fuer die Gebiete des Testtools (Reihungstesttool)
- *
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-
-class gebiet extends basis_db
-{
-	//Tabellenspalten
-	public $gebiet_id;
-	public $kurzbz;
-	public $bezeichnung;
-	public $beschreibung;
-	public $zeit;
-	public $multipleresponse;
-	public $kategorien;
-	public $maxfragen;
-	public $zufallfrage;
-	public $zufallvorschlag;
-	public $level_start;
-	public $level_sprung_auf;
-	public $level_sprung_ab;
-	public $levelgleichverteilung;
-	public $maxpunkte;
-	public $insertamum;
-	public $insertvon;
-	public $updateamum;
-	public $updatevon;
-
-	// ErgebnisArray
-	public $result=array();
-	public $new;
-
-	/**
-	 * Konstruktor - Laedt optional ein Gebiet
-	 * @param $gebiet_id      Gebiet das geladen werden soll (default=null)
-	 */
-	public function __construct($gebiet_id=null)
-	{
-		parent::__construct();
-
-		if(!is_null($gebiet_id))
-			$this->load($gebiet_id);
-	}
-
-	/**
-	 * Laedt Gebiet mit der uebergebenen ID
-	 * @param $gebiet_id ID des Gebiets das geladen werden soll
-	 * @return true wenn ok, sonst false
-	 */
-	public function load($gebiet_id)
-	{
-		$sprache = new sprache();
-		$bezeichnung_mehrsprachig = $sprache->getSprachQuery('bezeichnung_mehrsprachig');
-		$qry = "SELECT *,$bezeichnung_mehrsprachig FROM testtool.tbl_gebiet WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$this->gebiet_id = $row->gebiet_id;
-				$this->kurzbz = $row->kurzbz;
-				$this->bezeichnung = $row->bezeichnung;
-				$this->bezeichnung_mehrsprachig = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
-				$this->beschreibung = $row->beschreibung;
-				$this->zeit = $row->zeit;
-				$this->multipleresponse = $this->db_parse_bool($row->multipleresponse);
-				$this->kategorien = $this->db_parse_bool($row->kategorien);
-				$this->maxfragen = $row->maxfragen;
-				$this->zufallfrage = $this->db_parse_bool($row->zufallfrage);
-				$this->zufallvorschlag = $this->db_parse_bool($row->zufallvorschlag);
-				$this->level_start = $row->level_start;
-				$this->level_sprung_auf = $row->level_sprung_auf;
-				$this->level_sprung_ab = $row->level_sprung_ab;
-				$this->levelgleichverteilung = $this->db_parse_bool($row->levelgleichverteilung);
-				$this->maxpunkte = $row->maxpunkte;
-				$this->insertamum = $row->insertamum;
-				$this->insertvon = $row->insertvon;
-				$this->updateamum = $row->updateamum;
-				$this->updatevon = $row->updatevon;
-				$this->antwortenprozeile = $row->antwortenprozeile;
-
-				return true;
-			}
-			else
-			{
-				$this->errormsg = "Gebiet nicht gefunden";
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = "Fehler beim Laden des Gebiets";
-			return false;
-		}
-	}
-
-	/**
-	 * Prueft die Variablen vor dem Speichern
-	 * auf Gueltigkeit.
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	private function validate()
-	{
-		if(mb_strlen($this->kurzbz)>10)
-		{
-			$this->errormsg = 'Kurzbz darf nicht laenger als 10 Zeichen sein';
-			return false;
-		}
-		if(mb_strlen($this->bezeichnung)>50)
-		{
-			$this->errormsg = 'Bezeichnung darf nicht laenger als 50 Zeichen sein';
-			return false;
-		}
-		if(!is_bool($this->multipleresponse))
-		{
-			$this->errormsg = 'Multipleresponse muss ein boolscher Wert sein';
-			return false;
-		}
-		if(!is_bool($this->kategorien))
-		{
-			$this->errormsg = 'Kategorien muss ein boolscher Wert sein';
-			return false;
-		}
-		if(!is_numeric($this->maxfragen) && $this->maxfragen!='')
-		{
-			$this->errormsg = 'maxfragen muss eine gueltige Zahl sein';
-			return false;
-		}
-		if(!is_bool($this->zufallfrage))
-		{
-			$this->errormsg = 'Zufallfrage muss ein boolscher Wert sein';
-			return false;
-		}
-		if(!is_bool($this->zufallvorschlag))
-		{
-			$this->errormsg = 'Zufallvorschlag muss ein boolscher Wert sein';
-			return false;
-		}
-		if(!is_bool($this->levelgleichverteilung) && !is_null($this->levelgleichverteilung))
-		{
-			$this->errormsg = 'Levelgleichverteilung ist ungueltig';
-			return false;
-		}
-		if(!is_numeric($this->maxpunkte) && $this->maxpunkte!='')
-		{
-			$this->errormsg = 'Maxpunkte muss eine gueltige Zahl sein';
-			return false;
-		}
-		if(!is_numeric($this->antwortenprozeile) || $this->antwortenprozeile<=0)
-		{
-			$this->errormsg = 'AntortenProZeile muss eine gueltige Zahl und groesser als 0 sein';
-		}
-
-		return true;
-	}
-
-	/**
-	 * Speichert das Gebiet in die Datenbank
-	 * Wenn $new auf true gesetzt ist wird ein neuer Datensatz angelegt
-	 * ansonsten der Datensatz aktualisiert
-	 * @return true wenn erfolgreich, false im Fehlerfall
-	 */
-	public function save($new=null)
-	{
-		if(is_null($new))
-			$new = $this->new;
-
-		//Variablen auf Gueltigkeit pruefen
-		if(!$this->validate())
-			return false;
-
-		if($new)
-		{
-			$qry = 'BEGIN;INSERT INTO testtool.tbl_gebiet (kurzbz, bezeichnung, beschreibung, zeit, multipleresponse,
-					kategorien, maxfragen, zufallfrage, zufallvorschlag, level_start, level_sprung_auf, level_sprung_ab,
-					levelgleichverteilung, maxpunkte, antwortenprozeile, ';
-					
-					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
-					{
-						$idx = sprache::$index_arr[$key];
-						$qry.=" bezeichnung_mehrsprachig[$idx],";
-					}
-					
-					$qry.='insertamum, insertvon , updateamum, updatevon) VALUES('.
-
-					$this->db_add_param($this->kurzbz).','.
-					$this->db_add_param($this->bezeichnung).','.
-					$this->db_add_param($this->beschreibung).','.
-					$this->db_add_param($this->zeit).','.
-					$this->db_add_param($this->multipleresponse, FHC_BOOLEAN).','.
-					$this->db_add_param($this->kategorien, FHC_BOOLEAN).','.
-					$this->db_add_param($this->maxfragen).','.
-					$this->db_add_param($this->zufallfrage, FHC_BOOLEAN).','.
-					$this->db_add_param($this->zufallvorschlag, FHC_BOOLEAN).','.
-					$this->db_add_param($this->level_start).','.
-					$this->db_add_param($this->level_sprung_auf).','.
-					$this->db_add_param($this->level_sprung_ab).','.
-					$this->db_add_param($this->levelgleichverteilung, FHC_BOOLEAN).','.
-					$this->db_add_param($this->maxpunkte).','.
-					$this->db_add_param($this->antwortenprozeile).',';
-					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
-						$qry.=$this->db_add_param($value).',';
-					
-					$qry .= $this->db_add_param($this->insertamum).','.
-					$this->db_add_param($this->insertvon).
-					',null, null);';
-		}
-		else
-		{
-			$qry = 'UPDATE testtool.tbl_gebiet SET'.
-					' kurzbz='.$this->db_add_param($this->kurzbz).','.
-					' bezeichnung='.$this->db_add_param($this->bezeichnung).','.
-					' beschreibung='.$this->db_add_param($this->beschreibung).','.
-					' zeit='.$this->db_add_param($this->zeit).','.
-					' multipleresponse='.$this->db_add_param($this->multipleresponse, FHC_BOOLEAN).','.
-					' kategorien='.$this->db_add_param($this->kategorien, FHC_BOOLEAN).','.
-					' maxfragen='.$this->db_add_param($this->maxfragen).','.
-					' zufallfrage='.$this->db_add_param($this->zufallfrage, FHC_BOOLEAN).','.
-					' zufallvorschlag='.$this->db_add_param($this->zufallvorschlag, FHC_BOOLEAN).','.
-					' level_start='.$this->db_add_param($this->level_start).','.
-					' level_sprung_auf='.$this->db_add_param($this->level_sprung_auf).','.
-					' level_sprung_ab='.$this->db_add_param($this->level_sprung_ab).','.
-					' levelgleichverteilung='.$this->db_add_param($this->levelgleichverteilung, FHC_BOOLEAN).','.
-					' maxpunkte='.$this->db_add_param($this->maxpunkte).','.
-					' antwortenprozeile='.$this->db_add_param($this->antwortenprozeile).','.
-					' updateamum='.$this->db_add_param($this->updateamum).','.
-					' updatevon='.$this->db_add_param($this->updatevon).',';
-					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
-					{
-						$idx = sprache::$index_arr[$key];
-						$qry .= " bezeichnung_mehrsprachig[$idx]=".$this->db_add_param($value).",";
-					}
-					$qry = mb_substr($qry,0,-1);
-					$qry .=	' WHERE gebiet_id='.$this->db_add_param($this->gebiet_id, FHC_INTEGER, false).';';
-		}
-
-		if($this->db_query($qry))
-		{
-			//aktuelle ID aus der Sequence holen
-			if($new)
-			{
-				$qry="SELECT currval('testtool.tbl_gebiet_gebiet_id_seq') as id;";
-				if($this->db_query($qry))
-				{
-					if($row = $this->db_fetch_object())
-					{
-						$this->gebiet_id = $row->id;
-						$this->db_query('COMMIT');
-						return true;
-					}
-					else
-					{
-						$this->errormsg = 'Fehler beim Lesen der Sequence';
-						$this->db_query('ROLLBACK;');
-						return false;
-					}
-				}
-				else
-				{
-					$this->errormsg = 'Fehler beim Lesen der Sequence';
-					$this->db_query('ROLLBACK');
-					return false;
-				}
-			}
-			else
-				return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Frage';
-			return false;
-		}
-	}
-
-	/**
-	 * prueft das Gebiet auf Gueltigkeit
-	 * (diverse Plausichecks)
-	 *
-	 * @param $gebiet_id
-	 */
-	public function check_gebiet($gebiet_id)
-	{
-		$this->errormsg = '';
-		$this->warningmsg = '';
-		$this->load($gebiet_id);
-
-		//wenn levels verwendet werden muss maxfragen gesetzt sein
-		if($this->level_start!='' && $this->maxfragen=='')
-		{
-			$this->errormsg .= "Wenn Levels verwendet werden, muss die maximale Fragenanzahl gesetzt sein.\n";
-		}
-
-		//Levelgleichverteilung gibt es nur bei nicht geleveltem ablauf
-		if($this->level_start!='' && $this->levelgleichverteilung)
-		{
-			$this->errormsg .= "Levelgleichverteilung ist nur dann erlaubt, wenn der Ablauf nicht gelevelt ist.\n";
-		}
-
-		//Von jedem level muessen mindestens maxfragen vorhanden sein wenn levels aktiv ist
-		if($this->level_start!='')
-		{
-			$qry = "SELECT count(*) as anzahl, level FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER, false)." GROUP BY level";
-			if($this->db_query($qry))
-			{
-				while($row = $this->db_fetch_object())
-				{
-					if($row->anzahl<$this->maxfragen)
-					{
-						$this->errormsg .= "Es gibt nur $row->anzahl Fragen fuer das Level $row->level. Es muessen aber mindestens $this->maxfragen angelegt werden.\n";
-					}
-				}
-			}
-		}
-
-		//Pruefen ob jede Fragen mindestens 2 Vorschlaege hat
-		$qry = "SELECT frage_id, nummer FROM testtool.tbl_frage
-				WHERE (SELECT count(*) as anzahl FROM testtool.tbl_vorschlag WHERE frage_id=tbl_frage.frage_id)<2
-				AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND NOT demo;";
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$this->errormsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
-			}
-		}
-
-		//Wenn Levels verwendet werden, muessen mindestens 2 Verschiedene Level vorhanden sein
-		if($this->level_start!='')
-		{
-			$qry = "SELECT level FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND level is not null GROUP by level";
-			if($this->db_query($qry))
-			{
-				if($this->db_num_rows()<2)
-				{
-					$this->errormsg .= "Wenn Levels verwendet werden, muessen mindestens 2 verschiedene Level vorhanden sein.\n";
-				}
-			}
-		}
-
-		// Wenn Levelgleichverteilung true ist, muss maxfragen mindestens so gross wie die Anzahl der level sein
-		if($this->levelgleichverteilung)
-		{
-			if($this->maxfragen!='' && $this->maxfragen!=0)
-			{
-				$qry = "SELECT count(*) as anzahl FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND not demo AND level is not null GROUP BY level";
-				if($this->db_query($qry))
-				{
-					if($this->db_num_rows() > $this->maxfragen)
-					{
-						$this->errormsg .= "Wenn Levelgleichverteilung gesetzt ist, muss maxfragen groesser als die Anzahl der verwendeten Levels sein\n";
-					}
-				}
-			}
-		}
-
-		// Wenn zufallsfrage=true und level_start!='' oder levelgleichverteilung
-		// dann darf die punkteanzahl pro level/Frage sich nicht unterscheiden
-		if($this->zufallfrage && ($this->level_start!='' || $this->levelgleichverteilung))
-		{
-			$qry = "SELECT * FROM (
-						SELECT level, count(*) as anzahl FROM (
-							SELECT level, punkte, count(*) as anzahl FROM (
-								SELECT level, sum(punkte) as punkte
-								FROM testtool.tbl_frage JOIN testtool.tbl_vorschlag USING(frage_id)
-								WHERE punkte>0 AND not demo AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-								GROUP BY frage_id, level) as a
-							GROUP BY level, punkte ) as b
-						GROUP BY level) as c
-					WHERE c.anzahl>1";
-			if($this->db_query($qry))
-			{
-				while($row = $this->db_fetch_object())
-				{
-					$this->errormsg .= "Pro Level/Frage darf die positive Punkteanzahl nicht unterschiedlich sein wenn Zufallsfragen und Levels/Levelgleichverteilung verwendet wird. (Unterschiede in Level $row->level)\n";
-				}
-			}
-		}
-
-		// kein Multipleresponse bei gelevelten Gebieten
-		if($this->level_start!='' && $this->level_start!=0 && $this->multipleresponse)
-		{
-			$this->errormsg .= "Bei gelevelten Gebieten ist Multipleresponse nicht erlaubt\n";
-		}
-
-		// maxpunkte muss eingetragen sein
-		if($this->maxpunkte=='' || $this->maxpunkte==0)
-		{
-			$this->errormsg = "Es wurden keine Maximalpunkte fuer dieses Gebiet eingetragen\n";
-		}
-
-		// Pruefung, ob eine Frage mehrere gleiche Antworten oder gleiche Bilder hat
-		$qry = "SELECT text AS antwort, sprache, frage_id, tbl_frage.nummer, COUNT(text) AS Anz
-				FROM testtool.tbl_vorschlag_sprache
-				JOIN testtool.tbl_vorschlag USING (vorschlag_id)
-				JOIN testtool.tbl_frage USING (frage_id)
-				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-				AND (bild IS NULL AND audio IS NULL)
-				GROUP BY antwort,frage_id,tbl_frage.nummer,sprache
-				HAVING ( COUNT(text) > 1 )
-
-				UNION
-
-				SELECT bild AS antwort, sprache, frage_id, tbl_frage.nummer, COUNT(bild) AS Anz
-				FROM testtool.tbl_vorschlag_sprache
-				JOIN testtool.tbl_vorschlag USING (vorschlag_id)
-				JOIN testtool.tbl_frage USING (frage_id)
-				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-				AND ((text IS NULL OR text='' OR text=' ') AND audio IS NULL)
-				GROUP BY antwort,frage_id,tbl_frage.nummer,sprache
-				HAVING ( COUNT(bild) > 1 );";
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) Sprache $row->sprache hat mehrere gleiche Antworten.\n";
-			}
-		}
-
-		if($this->errormsg=='')
-			return true;
-		else
-			return false;
-	}
-
-	/**
-	 * Holt alle Gebiete aus der DB
-	 *
-	 * @return true wenn ok, false wenn Fehler
-	 */
-	public function getAll()
-	{
-		$qry = 'SELECT * FROM testtool.tbl_gebiet ORDER BY bezeichnung';
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$obj = new gebiet();
-
-				$obj->gebiet_id = $row->gebiet_id;
-				$obj->kurzbz = $row->kurzbz;
-				$obj->bezeichnung = $row->bezeichnung;
-				$obj->beschreibung = $row->beschreibung;
-				$obj->zeit = $row->zeit;
-				$obj->multipleresponse = $this->db_parse_bool($row->multipleresponse);
-				$obj->kategorien = $this->db_parse_bool($row->kategorien);
-				$obj->maxfragen = $row->maxfragen;
-				$obj->zufallfrage = $this->db_parse_bool($row->zufallfrage);
-				$obj->zufallvorschlag = $this->db_parse_bool($row->zufallvorschlag);
-				$obj->levelgleichverteilung = $this->db_parse_bool($row->levelgleichverteilung);
-				$obj->maxpunkte = $row->maxpunkte;
-				$obj->level_start = $row->level_start;
-				$obj->level_sprung_ab = $row->level_sprung_ab;
-				$obj->level_sprung_auf = $row->level_sprung_auf;
-				$obj->insertamum = $row->insertamum;
-				$obj->insertvon = $row->insertvon;
-				$obj->updateamum = $row->updateamum;
-				$obj->updatevon = $row->updatevon;
-				$obj->antwortenprozeile = $row->antwortenprozeile;
-
-				$this->result[] = $obj;
-			}
-
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler in Fkt getAll()';
-			return false;
-		}
-	}
-
-	/**
-	 * Berechnet die maxpunkte fuer das Gebiet
-	 *
-	 * @param $gebiet_id
-	 */
-	public function berechneMaximalpunkte($gebiet_id)
-	{
-		if(!$this->load($gebiet_id))
-			return false;
-
-		if(!$this->levelgleichverteilung && ($this->level_start=='' || $this->level_start==0))
-		{
-			$qry = "SELECT sum(punkte) as max
-					FROM testtool.tbl_vorschlag JOIN testtool.tbl_frage USING(frage_id)
-					WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND punkte>0 AND NOT demo";
-			if($this->maxfragen!='' && $this->maxfragen>0)
-				$qry.=" LIMIT $this->maxfragen";
-		}
-		elseif($this->levelgleichverteilung && !$this->multipleresponse)
-		{
-			//Levelgleichverteilung mit singleresponse
-			$qry = "SELECT sum(punkteprolevel) as max FROM
-					(
-						SELECT round((anz::decimal/fragengesamt::decimal)*$this->maxfragen*punkte) as punkteprolevel
-						FROM
-						(
-						SELECT
-							level, punkte, count(*) as anz,
-							(SELECT count(*) FROM testtool.tbl_frage
-							WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER).") as fragengesamt
-						FROM
-							testtool.tbl_frage
-							JOIN testtool.tbl_vorschlag USING(frage_id)
-						WHERE
-							gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-							AND NOT demo
-						GROUP BY level, punkte
-						) a
-					) b";
-		}
-		elseif($this->levelgleichverteilung && $this->multipleresponse)
-		{
-			//Levelgleichverteilung mit multipleresponse
-			$qry = "SELECT sum(punkteprolevel) as max FROM
-					(
-						SELECT round((anz::decimal/fragengesamt::decimal)*$this->maxfragen*punkte) as punkteprolevel
-						FROM
-						(
-						SELECT
-							level, punkte, count(*) as anz,
-							(SELECT count(*) FROM testtool.tbl_frage
-							WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER).") as fragengesamt
-						FROM
-							testtool.tbl_frage
-							JOIN testtool.tbl_vorschlag USING(frage_id)
-						WHERE
-							gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-							AND NOT demo
-						GROUP BY level, punkte
-						) a
-					) b";
-		}
-		elseif($this->level_start!='')
-		{
-			//Maximalpunkte fuer geleveltes Gebiet ermitteln
-
-			//Punkte pro Level holen
-			$qry = "
-			SELECT level, punkte
-			FROM
-				(
-				SELECT level, frage_id, sum(punkte) as punkte
-				FROM testtool.tbl_frage JOIN testtool.tbl_vorschlag USING(frage_id)
-				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND punkte>0 AND level>=".$this->db_add_param($this->level_start)." AND NOT demo
-				GROUP BY level, frage_id
-				) as a
-			GROUP by level, punkte ORDER BY level";
-
-			if($this->db_query($qry))
-			{
-				$maxfragen = $this->maxfragen;
-				$maxpunkte = 0;
-				$lastpunkte=0;
-				//Punkte mit der Anzahl der Mindestfragen fuer dieses Level multiplizieren
-				while($row = $this->db_fetch_object())
-				{
-					if($maxfragen>0)
-					{
-						$maxpunkte += $row->punkte*$this->level_sprung_auf;
-						$lastpunkte = $row->punkte;
-						$maxfragen -=$this->level_sprung_auf;
-					}
-				}
-				// zuletzt die verbleibenden Fragen mit der Punkteanzahl der letzten (schwersten) Fragen multiplizieren
-				$maxpunkte += $lastpunkte*$maxfragen;
-				return $maxpunkte;
-			}
-		}
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				return $row->max;
-			}
-			else
-			{
-				$this->errormsg = 'Fehler beim Ermitteln der Maximalpunkte';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Ermitteln der Maximalpunkte';
-			return false;
-		}
-	}
-
-	/**
-	 * Prueft ob das Gebiet bereits gestartet wurde.  Wahlweise pruefling_id oder prestudent_id
-	 *
-	 * @param $pruefling_id Wahlweise pruefling_id oder
-	 * @param $prestudent_id prestudent_id des Prueflings.
-	 * @param $gebiet_id Gebiet_id des Gebiets, dessen Start gefprueft werden soll
-	 * @return true wenn das Gebiet bereits gestartet wurde, false wenn nicht.
-	 */
-	public function isGestartet($gebiet_id, $pruefling_id=null, $prestudent_id=null)
-	{
-		$this->errormsg='';
-
-		if(!is_numeric($gebiet_id) || $gebiet_id=='')
-		{
-			$this->errormsg = 'Gebiet_id muss eine gueltige Zahl sein';
-			return false;
-		}
-		if(!is_null($pruefling_id) && (!is_numeric($pruefling_id) || $pruefling_id==''))
-		{
-			$this->errormsg = 'Pruefling_id muss eine gueltige Zahl sein';
-			return false;
-		}
-		if(!is_null($prestudent_id) && (!is_numeric($prestudent_id) || $prestudent_id==''))
-		{
-			$this->errormsg = 'Prestudent_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		$qry = '	SELECT
-						begintime
-					FROM
-						testtool.tbl_pruefling_frage
-					JOIN
-						testtool.tbl_pruefling USING (pruefling_id)
-					JOIN
-						testtool.tbl_frage USING (frage_id)
-					WHERE ';
-		if (!is_null($pruefling_id))
-			$qry.='		pruefling_id='.$this->db_add_param($pruefling_id, FHC_INTEGER);
-		else
-			$qry.='		prestudent_id='.$this->db_add_param($prestudent_id, FHC_INTEGER);
-
-			$qry.='	AND
-						gebiet_id='.$this->db_add_param($gebiet_id, FHC_INTEGER).'
-					AND
-						begintime IS NOT NULL';
-
-	 	if($result = $this->db_query($qry))
-        {
-            if($this->db_fetch_object($result))
-                return true;
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
-            return false;
-        }
-	}
-
-	/**
-	 * Laedt die Ablaufe die zu einem Gebiet zugeordnet sind
-	 * @param $gebiet_id
-	 * @return boolean true wenn ok, false im Fehlerfall
-	 */
-	public function loadAblaufGebiet($gebiet_id)
-	{
-		$qry = "SELECT * FROM testtool.tbl_ablauf WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new stdClass();
-				$obj->ablauf_id = $row->ablauf_id;
-				$obj->studiengang_kz = $row->studiengang_kz;
-				$obj->gebiet_id = $row->gebiet_id;
-				$obj->reihung = $row->reihung;
-				$obj->gewicht = $row->gewicht;
-				$obj->semester = $row->semester;
-				$obj->ablauf_vorgaben_id = $row->ablauf_vorgaben_id;
-				$obj->insertamum = $row->insertamum;
-				$obj->insertvon = $row->insertvon;
-				$obj->updateamum = $row->updateamum;
-				$obj->updatevon = $row->updatevon;
-
-				$this->result[] = $obj;
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Loescht ein Gebiet und den zugeordneten Ablauf
-	 * @param $gebiet_id
-	 * @return boolean true wenn ok, false im Fehlerfall
-	 */
-	public function delete($gebiet_id)
-	{
-		$qry = "SELECT * FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
-
-		if($result = $this->db_query($qry))
-		{
-			if($this->db_num_rows($result)>0)
-			{
-				$this->errormsg = 'Bitte entfernen Sie zuerst alle Fragen aus dem Gebiet';
-				return false;
-			}
-		}
-
-		$qry = "
-			DELETE FROM testtool.tbl_ablauf WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
-			DELETE FROM testtool.tbl_gebiet WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Loeschen des Gebiets';
-			return false;
-		}
-	}
-
-	/**
-	 * Loescht einen Ablauf
-	 * @param $ablauf_id
-	 * @return boolean true wenn ok, false im Fehlerfall
-	 */
-	public function deleteAblaufZuordnung($ablauf_id)
-	{
-		$qry = "DELETE FROM testtool.tbl_ablauf WHERE ablauf_id=".$this->db_add_param($ablauf_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Entfernen des Ablaufs';
-			return false;
-		}
-	}
-
-	/**
-	 * Laedt alle AblaufVorabe Eintraege
-	 * @return boolean true wenn ok, false im Fehlerfall
-	 */
-	public function getAblaufVorgaben()
-	{
-		$qry = "SELECT * FROM testtool.tbl_ablauf_vorgaben ORDER BY studiengang_kz";
-
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new stdClass();
-
-				$obj->ablauf_vorgaben_id = $row->ablauf_vorgaben_id;
-				$obj->studiengang_kz = $row->studiengang_kz;
-				$obj->sprache = $row->sprache;
-				$obj->sprachwahl = $this->db_parse_bool($row->sprachwahl);
-				$obj->content_id = $row->content_id;
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Speichert den Ablauf
-	 */
-	public function saveAblauf()
-	{
-		if($this->new)
-		{
-			$qry = "INSERT INTO testtool.tbl_ablauf (studiengang_kz, gebiet_id, reihung,gewicht,semester,ablauf_vorgaben_id, insertamum, insertvon) VALUES(".
-				$this->db_add_param($this->studiengang_kz, FHC_INTEGER).','.
-				$this->db_add_param($this->gebiet_id, FHC_INTEGER).','.
-				$this->db_add_param($this->reihung, FHC_INTEGER).','.
-				$this->db_add_param($this->gewicht, FHC_INTEGER).','.
-				$this->db_add_param($this->semester, FHC_INTEGER).','.
-				$this->db_add_param($this->ablauf_vorgaben_id, FHC_INTEGER).','.
-				$this->db_add_param($this->insertamum).','.
-				$this->db_add_param($this->insertvon).');';
-		}
-		else
-		{
-			$this->errormsg='not implemented';
-			return false;
-		}
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return true;
-		}
-	}
-
-	/**
-	 * Prueft, ob das Gebiet zumindest eine Frage oder einen Vorschlag im MathML Format hat.
-	 * @param $gebiet_id
-	 * return true, wenn Gebiet eine/n Frage/Vorschlag im MathML Format enthält.
-	 */
-	public function hasMathML($gebiet_id)
-	{
-		if (is_numeric($gebiet_id))
-		{
-			$qry = '
-            WITH 
-               fragen AS (
-                  SELECT DISTINCT
-                     frage_id
-                  FROM
-                     testtool.tbl_frage
-                  JOIN
-                     testtool.tbl_gebiet USING (gebiet_id)
-                  WHERE
-                     tbl_gebiet.gebiet_id = '. $this->db_add_param($gebiet_id, FHC_INTEGER). '
-               ),          
-               vorschlaege AS (
-                  SELECT DISTINCT
-                     vorschlag_id
-                  FROM
-                     testtool.tbl_vorschlag
-                  JOIN
-                     fragen USING (frage_id)
-               )
-               
-            SELECT
-               1
-            FROM
-               testtool.tbl_frage_sprache
-            JOIN
-               fragen USING (frage_id)
-            WHERE
-               SUBSTRING(text, \'MathML\') IS NOT NULL
-               
-            UNION
-            
-            SELECT
-               1
-            FROM
-               testtool.tbl_vorschlag_sprache
-            JOIN
-               vorschlaege USING (vorschlag_id)
-            WHERE
-               SUBSTRING(text, \'MathML\') IS NOT NULL
-         ';
-
-			if($result = $this->db_query($qry))
-			{
-				return ($this->db_num_rows($result) > 0);
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Eine numerische gebiet_id muss übergeben werden.';
-			return false;
-		}
-	}
-}
-?>
+<?php
+/* Copyright (C) 2009 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>,
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *			Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
+ */
+/**
+ * Klasse fuer die Gebiete des Testtools (Reihungstesttool)
+ *
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class gebiet extends basis_db
+{
+	//Tabellenspalten
+	public $gebiet_id;
+	public $kurzbz;
+	public $bezeichnung;
+	public $beschreibung;
+	public $zeit;
+	public $multipleresponse;
+	public $kategorien;
+	public $maxfragen;
+	public $zufallfrage;
+	public $zufallvorschlag;
+	public $level_start;
+	public $level_sprung_auf;
+	public $level_sprung_ab;
+	public $levelgleichverteilung;
+	public $maxpunkte;
+	public $offsetpunkte;
+	public $insertamum;
+	public $insertvon;
+	public $updateamum;
+	public $updatevon;
+
+	// ErgebnisArray
+	public $result=array();
+	public $new;
+
+	/**
+	 * Konstruktor - Laedt optional ein Gebiet
+	 * @param $gebiet_id      Gebiet das geladen werden soll (default=null)
+	 */
+	public function __construct($gebiet_id=null)
+	{
+		parent::__construct();
+
+		if(!is_null($gebiet_id))
+			$this->load($gebiet_id);
+	}
+
+	/**
+	 * Laedt Gebiet mit der uebergebenen ID
+	 * @param $gebiet_id ID des Gebiets das geladen werden soll
+	 * @return true wenn ok, sonst false
+	 */
+	public function load($gebiet_id)
+	{
+		$sprache = new sprache();
+		$bezeichnung_mehrsprachig = $sprache->getSprachQuery('bezeichnung_mehrsprachig');
+		$qry = "SELECT *,$bezeichnung_mehrsprachig FROM testtool.tbl_gebiet WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->gebiet_id = $row->gebiet_id;
+				$this->kurzbz = $row->kurzbz;
+				$this->bezeichnung = $row->bezeichnung;
+				$this->bezeichnung_mehrsprachig = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
+				$this->beschreibung = $row->beschreibung;
+				$this->zeit = $row->zeit;
+				$this->multipleresponse = $this->db_parse_bool($row->multipleresponse);
+				$this->kategorien = $this->db_parse_bool($row->kategorien);
+				$this->maxfragen = $row->maxfragen;
+				$this->zufallfrage = $this->db_parse_bool($row->zufallfrage);
+				$this->zufallvorschlag = $this->db_parse_bool($row->zufallvorschlag);
+				$this->level_start = $row->level_start;
+				$this->level_sprung_auf = $row->level_sprung_auf;
+				$this->level_sprung_ab = $row->level_sprung_ab;
+				$this->levelgleichverteilung = $this->db_parse_bool($row->levelgleichverteilung);
+				$this->maxpunkte = $row->maxpunkte;
+				$this->offsetpunkte = $row->offsetpunkte;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				$this->antwortenprozeile = $row->antwortenprozeile;
+
+				return true;
+			}
+			else
+			{
+				$this->errormsg = "Gebiet nicht gefunden";
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden des Gebiets";
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Variablen vor dem Speichern
+	 * auf Gueltigkeit.
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	private function validate()
+	{
+		if(mb_strlen($this->kurzbz)>10)
+		{
+			$this->errormsg = 'Kurzbz darf nicht laenger als 10 Zeichen sein';
+			return false;
+		}
+		if(mb_strlen($this->bezeichnung)>50)
+		{
+			$this->errormsg = 'Bezeichnung darf nicht laenger als 50 Zeichen sein';
+			return false;
+		}
+		if(!is_bool($this->multipleresponse))
+		{
+			$this->errormsg = 'Multipleresponse muss ein boolscher Wert sein';
+			return false;
+		}
+		if(!is_bool($this->kategorien))
+		{
+			$this->errormsg = 'Kategorien muss ein boolscher Wert sein';
+			return false;
+		}
+		if(!is_numeric($this->maxfragen) && $this->maxfragen!='')
+		{
+			$this->errormsg = 'maxfragen muss eine gueltige Zahl sein';
+			return false;
+		}
+		if(!is_bool($this->zufallfrage))
+		{
+			$this->errormsg = 'Zufallfrage muss ein boolscher Wert sein';
+			return false;
+		}
+		if(!is_bool($this->zufallvorschlag))
+		{
+			$this->errormsg = 'Zufallvorschlag muss ein boolscher Wert sein';
+			return false;
+		}
+		if(!is_bool($this->levelgleichverteilung) && !is_null($this->levelgleichverteilung))
+		{
+			$this->errormsg = 'Levelgleichverteilung ist ungueltig';
+			return false;
+		}
+		if(!is_numeric($this->maxpunkte) && $this->maxpunkte!='')
+		{
+			$this->errormsg = 'Maxpunkte muss eine gueltige Zahl sein';
+			return false;
+		}
+		if(!is_numeric($this->offsetpunkte) && $this->offsetpunkte!='')
+		{
+			$this->errormsg = 'Offsetpunkte muss eine gueltige Zahl sein';
+			return false;
+		}
+		if(!is_numeric($this->antwortenprozeile) || $this->antwortenprozeile<=0)
+		{
+			$this->errormsg = 'AntortenProZeile muss eine gueltige Zahl und groesser als 0 sein';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Speichert das Gebiet in die Datenbank
+	 * Wenn $new auf true gesetzt ist wird ein neuer Datensatz angelegt
+	 * ansonsten der Datensatz aktualisiert
+	 * @return true wenn erfolgreich, false im Fehlerfall
+	 */
+	public function save($new=null)
+	{
+		if(is_null($new))
+			$new = $this->new;
+
+		//Variablen auf Gueltigkeit pruefen
+		if(!$this->validate())
+			return false;
+
+		if($new)
+		{
+			$qry = 'BEGIN;INSERT INTO testtool.tbl_gebiet (kurzbz, bezeichnung, beschreibung, zeit, multipleresponse,
+					kategorien, maxfragen, zufallfrage, zufallvorschlag, level_start, level_sprung_auf, level_sprung_ab,
+					levelgleichverteilung, maxpunkte, offsetpunkte, antwortenprozeile, ';
+
+					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+					{
+						$idx = sprache::$index_arr[$key];
+						$qry.=" bezeichnung_mehrsprachig[$idx],";
+					}
+
+					$qry.='insertamum, insertvon , updateamum, updatevon) VALUES('.
+
+					$this->db_add_param($this->kurzbz).','.
+					$this->db_add_param($this->bezeichnung).','.
+					$this->db_add_param($this->beschreibung).','.
+					$this->db_add_param($this->zeit).','.
+					$this->db_add_param($this->multipleresponse, FHC_BOOLEAN).','.
+					$this->db_add_param($this->kategorien, FHC_BOOLEAN).','.
+					$this->db_add_param($this->maxfragen).','.
+					$this->db_add_param($this->zufallfrage, FHC_BOOLEAN).','.
+					$this->db_add_param($this->zufallvorschlag, FHC_BOOLEAN).','.
+					$this->db_add_param($this->level_start).','.
+					$this->db_add_param($this->level_sprung_auf).','.
+					$this->db_add_param($this->level_sprung_ab).','.
+					$this->db_add_param($this->levelgleichverteilung, FHC_BOOLEAN).','.
+					$this->db_add_param($this->maxpunkte).','.
+					$this->db_add_param($this->offsetpunkte).','.
+					$this->db_add_param($this->antwortenprozeile).',';
+					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+						$qry.=$this->db_add_param($value).',';
+
+					$qry .= $this->db_add_param($this->insertamum).','.
+					$this->db_add_param($this->insertvon).
+					',null, null);';
+		}
+		else
+		{
+			$qry = 'UPDATE testtool.tbl_gebiet SET'.
+					' kurzbz='.$this->db_add_param($this->kurzbz).','.
+					' bezeichnung='.$this->db_add_param($this->bezeichnung).','.
+					' beschreibung='.$this->db_add_param($this->beschreibung).','.
+					' zeit='.$this->db_add_param($this->zeit).','.
+					' multipleresponse='.$this->db_add_param($this->multipleresponse, FHC_BOOLEAN).','.
+					' kategorien='.$this->db_add_param($this->kategorien, FHC_BOOLEAN).','.
+					' maxfragen='.$this->db_add_param($this->maxfragen).','.
+					' zufallfrage='.$this->db_add_param($this->zufallfrage, FHC_BOOLEAN).','.
+					' zufallvorschlag='.$this->db_add_param($this->zufallvorschlag, FHC_BOOLEAN).','.
+					' level_start='.$this->db_add_param($this->level_start).','.
+					' level_sprung_auf='.$this->db_add_param($this->level_sprung_auf).','.
+					' level_sprung_ab='.$this->db_add_param($this->level_sprung_ab).','.
+					' levelgleichverteilung='.$this->db_add_param($this->levelgleichverteilung, FHC_BOOLEAN).','.
+					' maxpunkte='.$this->db_add_param($this->maxpunkte).','.
+					' offsetpunkte='.$this->db_add_param($this->offsetpunkte).','.
+					' antwortenprozeile='.$this->db_add_param($this->antwortenprozeile).','.
+					' updateamum='.$this->db_add_param($this->updateamum).','.
+					' updatevon='.$this->db_add_param($this->updatevon).',';
+					foreach($this->bezeichnung_mehrsprachig as $key=>$value)
+					{
+						$idx = sprache::$index_arr[$key];
+						$qry .= " bezeichnung_mehrsprachig[$idx]=".$this->db_add_param($value).",";
+					}
+					$qry = mb_substr($qry,0,-1);
+					$qry .=	' WHERE gebiet_id='.$this->db_add_param($this->gebiet_id, FHC_INTEGER, false).';';
+		}
+
+		if($this->db_query($qry))
+		{
+			//aktuelle ID aus der Sequence holen
+			if($new)
+			{
+				$qry="SELECT currval('testtool.tbl_gebiet_gebiet_id_seq') as id;";
+				if($this->db_query($qry))
+				{
+					if($row = $this->db_fetch_object())
+					{
+						$this->gebiet_id = $row->id;
+						$this->db_query('COMMIT');
+						return true;
+					}
+					else
+					{
+						$this->errormsg = 'Fehler beim Lesen der Sequence';
+						$this->db_query('ROLLBACK;');
+						return false;
+					}
+				}
+				else
+				{
+					$this->errormsg = 'Fehler beim Lesen der Sequence';
+					$this->db_query('ROLLBACK');
+					return false;
+				}
+			}
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Frage';
+			return false;
+		}
+	}
+
+	/**
+	 * prueft das Gebiet auf Gueltigkeit
+	 * (diverse Plausichecks)
+	 *
+	 * @param $gebiet_id
+	 */
+	public function check_gebiet($gebiet_id)
+	{
+		$this->errormsg = '';
+		$this->warningmsg = '';
+		$this->load($gebiet_id);
+
+		//wenn levels verwendet werden muss maxfragen gesetzt sein
+		if($this->level_start!='' && $this->maxfragen=='')
+		{
+			$this->errormsg .= "Wenn Levels verwendet werden, muss die maximale Fragenanzahl gesetzt sein.\n";
+		}
+
+		//Levelgleichverteilung gibt es nur bei nicht geleveltem ablauf
+		if($this->level_start!='' && $this->levelgleichverteilung)
+		{
+			$this->errormsg .= "Levelgleichverteilung ist nur dann erlaubt, wenn der Ablauf nicht gelevelt ist.\n";
+		}
+
+		//Von jedem level muessen mindestens maxfragen vorhanden sein wenn levels aktiv ist
+		if($this->level_start!='')
+		{
+			$qry = "SELECT count(*) as anzahl, level FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER, false)." GROUP BY level";
+			if($this->db_query($qry))
+			{
+				while($row = $this->db_fetch_object())
+				{
+					if($row->anzahl<$this->maxfragen)
+					{
+						$this->errormsg .= "Es gibt nur $row->anzahl Fragen fuer das Level $row->level. Es muessen aber mindestens $this->maxfragen angelegt werden.\n";
+					}
+				}
+			}
+		}
+
+		//Pruefen ob jede Fragen mindestens 2 Vorschlaege hat
+		$qry = "SELECT frage_id, nummer FROM testtool.tbl_frage
+				WHERE (SELECT count(*) as anzahl FROM testtool.tbl_vorschlag WHERE frage_id=tbl_frage.frage_id)<2
+				AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND NOT demo;";
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->errormsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
+			}
+		}
+
+		//Wenn Levels verwendet werden, muessen mindestens 2 Verschiedene Level vorhanden sein
+		if($this->level_start!='')
+		{
+			$qry = "SELECT level FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND level is not null GROUP by level";
+			if($this->db_query($qry))
+			{
+				if($this->db_num_rows()<2)
+				{
+					$this->errormsg .= "Wenn Levels verwendet werden, muessen mindestens 2 verschiedene Level vorhanden sein.\n";
+				}
+			}
+		}
+
+		// Wenn Levelgleichverteilung true ist, muss maxfragen mindestens so gross wie die Anzahl der level sein
+		if($this->levelgleichverteilung)
+		{
+			if($this->maxfragen!='' && $this->maxfragen!=0)
+			{
+				$qry = "SELECT count(*) as anzahl FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND not demo AND level is not null GROUP BY level";
+				if($this->db_query($qry))
+				{
+					if($this->db_num_rows() > $this->maxfragen)
+					{
+						$this->errormsg .= "Wenn Levelgleichverteilung gesetzt ist, muss maxfragen groesser als die Anzahl der verwendeten Levels sein\n";
+					}
+				}
+			}
+		}
+
+		// Wenn zufallsfrage=true und level_start!='' oder levelgleichverteilung
+		// dann darf die punkteanzahl pro level/Frage sich nicht unterscheiden
+		if($this->zufallfrage && ($this->level_start!='' || $this->levelgleichverteilung))
+		{
+			$qry = "SELECT * FROM (
+						SELECT level, count(*) as anzahl FROM (
+							SELECT level, punkte, count(*) as anzahl FROM (
+								SELECT level, round(sum(punkte)) as punkte
+								FROM testtool.tbl_frage JOIN testtool.tbl_vorschlag USING(frage_id)
+								WHERE punkte>0 AND not demo AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+								GROUP BY frage_id, level) as a
+							GROUP BY level, punkte ) as b
+						GROUP BY level) as c
+					WHERE c.anzahl>1";
+			if($this->db_query($qry))
+			{
+				while($row = $this->db_fetch_object())
+				{
+					$this->errormsg .= "Pro Level/Frage darf die positive Punkteanzahl nicht unterschiedlich sein wenn Zufallsfragen und Levels/Levelgleichverteilung verwendet wird. (Unterschiede in Level $row->level)\n";
+				}
+			}
+		}
+
+		// kein Multipleresponse bei gelevelten Gebieten
+		if($this->level_start!='' && $this->level_start!=0 && $this->multipleresponse)
+		{
+			$this->errormsg .= "Bei gelevelten Gebieten ist Multipleresponse nicht erlaubt\n";
+		}
+
+		// maxpunkte muss eingetragen sein
+		if($this->maxpunkte=='' || $this->maxpunkte==0)
+		{
+			$this->errormsg = "Es wurden keine Maximalpunkte fuer dieses Gebiet eingetragen\n";
+		}
+
+		// Pruefung, ob eine Frage mehrere gleiche Antworten oder gleiche Bilder hat
+		$qry = "SELECT text AS antwort, sprache, frage_id, tbl_frage.nummer, COUNT(text) AS Anz
+				FROM testtool.tbl_vorschlag_sprache
+				JOIN testtool.tbl_vorschlag USING (vorschlag_id)
+				JOIN testtool.tbl_frage USING (frage_id)
+				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+				AND (bild IS NULL AND audio IS NULL)
+				GROUP BY antwort,frage_id,tbl_frage.nummer,sprache
+				HAVING ( COUNT(text) > 1 )
+
+				UNION
+
+				SELECT bild AS antwort, sprache, frage_id, tbl_frage.nummer, COUNT(bild) AS Anz
+				FROM testtool.tbl_vorschlag_sprache
+				JOIN testtool.tbl_vorschlag USING (vorschlag_id)
+				JOIN testtool.tbl_frage USING (frage_id)
+				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+				AND ((text IS NULL OR text='' OR text=' ') AND audio IS NULL)
+				GROUP BY antwort,frage_id,tbl_frage.nummer,sprache
+				HAVING ( COUNT(bild) > 1 );";
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) Sprache $row->sprache hat mehrere gleiche Antworten.\n";
+			}
+		}
+
+		if($this->errormsg=='')
+			return true;
+		else
+			return false;
+	}
+
+	/**
+	 * Holt alle Gebiete aus der DB
+	 *
+	 * @return true wenn ok, false wenn Fehler
+	 */
+	public function getAll()
+	{
+		$qry = 'SELECT * FROM testtool.tbl_gebiet ORDER BY bezeichnung';
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new gebiet();
+
+				$obj->gebiet_id = $row->gebiet_id;
+				$obj->kurzbz = $row->kurzbz;
+				$obj->bezeichnung = $row->bezeichnung;
+				$obj->beschreibung = $row->beschreibung;
+				$obj->zeit = $row->zeit;
+				$obj->multipleresponse = $this->db_parse_bool($row->multipleresponse);
+				$obj->kategorien = $this->db_parse_bool($row->kategorien);
+				$obj->maxfragen = $row->maxfragen;
+				$obj->zufallfrage = $this->db_parse_bool($row->zufallfrage);
+				$obj->zufallvorschlag = $this->db_parse_bool($row->zufallvorschlag);
+				$obj->levelgleichverteilung = $this->db_parse_bool($row->levelgleichverteilung);
+				$obj->maxpunkte = $row->maxpunkte;
+				$obj->offsetpunkte = $row->offsetpunkte;
+				$obj->level_start = $row->level_start;
+				$obj->level_sprung_ab = $row->level_sprung_ab;
+				$obj->level_sprung_auf = $row->level_sprung_auf;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->antwortenprozeile = $row->antwortenprozeile;
+
+				$this->result[] = $obj;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler in Fkt getAll()';
+			return false;
+		}
+	}
+
+	/**
+	 * Berechnet die maxpunkte fuer das Gebiet
+	 *
+	 * @param $gebiet_id
+	 */
+	public function berechneMaximalpunkte($gebiet_id)
+	{
+		if(!$this->load($gebiet_id))
+			return false;
+
+		if(!$this->levelgleichverteilung && ($this->level_start=='' || $this->level_start==0))
+		{
+			$qry = "SELECT sum(punkte) as max
+					FROM testtool.tbl_vorschlag JOIN testtool.tbl_frage USING(frage_id)
+					WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND punkte>0 AND NOT demo";
+			if($this->maxfragen!='' && $this->maxfragen>0)
+				$qry.=" LIMIT $this->maxfragen";
+		}
+		elseif($this->levelgleichverteilung && !$this->multipleresponse)
+		{
+			//Levelgleichverteilung mit singleresponse
+			$qry = "SELECT sum(punkteprolevel) as max FROM
+					(
+						SELECT round((anz::decimal/fragengesamt::decimal)*$this->maxfragen*punkte) as punkteprolevel
+						FROM
+						(
+						SELECT
+							level, punkte, count(*) as anz,
+							(SELECT count(*) FROM testtool.tbl_frage
+							WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER).") as fragengesamt
+						FROM
+							testtool.tbl_frage
+							JOIN testtool.tbl_vorschlag USING(frage_id)
+						WHERE
+							gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+							AND NOT demo
+						GROUP BY level, punkte
+						) a
+					) b";
+		}
+		elseif($this->levelgleichverteilung && $this->multipleresponse)
+		{
+			//Levelgleichverteilung mit multipleresponse
+			$qry = "SELECT sum(punkteprolevel) as max FROM
+					(
+						SELECT round((anz::decimal/fragengesamt::decimal)*$this->maxfragen*punkte) as punkteprolevel
+						FROM
+						(
+						SELECT
+							level, punkte, count(*) as anz,
+							(SELECT count(*) FROM testtool.tbl_frage
+							WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER).") as fragengesamt
+						FROM
+							testtool.tbl_frage
+							JOIN testtool.tbl_vorschlag USING(frage_id)
+						WHERE
+							gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+							AND NOT demo
+						GROUP BY level, punkte
+						) a
+					) b";
+		}
+		elseif($this->level_start!='')
+		{
+			//Maximalpunkte fuer geleveltes Gebiet ermitteln
+
+			//Punkte pro Level holen
+			$qry = "
+			SELECT level, punkte
+			FROM
+				(
+				SELECT level, frage_id, sum(punkte) as punkte
+				FROM testtool.tbl_frage JOIN testtool.tbl_vorschlag USING(frage_id)
+				WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND punkte>0
+				AND level>=".$this->db_add_param($this->level_start)." AND NOT demo
+				GROUP BY level, frage_id
+				) as a
+			GROUP by level, punkte ORDER BY level";
+
+			if($this->db_query($qry))
+			{
+				$maxfragen = $this->maxfragen;
+				$maxpunkte = 0;
+				$lastpunkte=0;
+				//Punkte mit der Anzahl der Mindestfragen fuer dieses Level multiplizieren
+				while($row = $this->db_fetch_object())
+				{
+					if($maxfragen>0)
+					{
+						$maxpunkte += $row->punkte*$this->level_sprung_auf;
+						$lastpunkte = $row->punkte;
+						$maxfragen -=$this->level_sprung_auf;
+					}
+				}
+				// zuletzt die verbleibenden Fragen mit der Punkteanzahl der letzten (schwersten) Fragen multiplizieren
+				$maxpunkte += $lastpunkte*$maxfragen;
+				return $maxpunkte;
+			}
+		}
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				return $row->max;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Ermitteln der Maximalpunkte';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Ermitteln der Maximalpunkte';
+			return false;
+		}
+	}
+
+	/**
+	 * Berechnet die offsetpunkte fuer das Gebiet
+	 *
+	 * @param $gebiet_id
+	 */
+	public function berechneOffsetpunkte($gebiet_id)
+	{
+		if(!$this->load($gebiet_id))
+			return false;
+
+		$checkqry = "SELECT COUNT (uniquepoints) AS count_uniquepoints
+					FROM (
+							 SELECT gebiet_id,
+									level,
+									count(DISTINCT punkte),
+									CASE WHEN count(DISTINCT punkte) > 1 THEN FALSE ELSE TRUE END AS uniquepoints
+							 FROM (
+									  SELECT tbl_frage.gebiet_id,
+											 tbl_frage.level,
+											 CASE WHEN multipleresponse THEN sum(punkte) ELSE min(punkte) END AS punkte
+									  FROM testtool.tbl_frage
+											   JOIN testtool.tbl_vorschlag USING (frage_id)
+											   JOIN testtool.tbl_gebiet USING (gebiet_id)
+									  WHERE tbl_vorschlag.aktiv
+										AND tbl_vorschlag.punkte < 0
+										AND tbl_frage.demo = false
+										AND tbl_frage.aktiv
+										AND gebiet_id = ".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+									  GROUP BY tbl_frage.gebiet_id, multipleresponse, tbl_frage.level, tbl_frage.frage_id
+								  ) p
+							 GROUP BY gebiet_id, level
+						 ) pu
+					WHERE uniquepoints = FALSE";
+
+		if($this->db_query($checkqry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				if (!is_numeric($row->count_uniquepoints) || $row->count_uniquepoints > 0)
+					$this->errormsg = 'Negativpunkte sind nicht für alle Fragen gleich hoch!';
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Prüfen der Offsetpunkte';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Prüfen der Offsetpunkte';
+			return false;
+		}
+
+		$qry = "
+			WITH fragen AS (
+				SELECT tbl_frage.frage_id, tbl_frage.gebiet_id, tbl_frage.level, tbl_frage.nummer, punkte
+				FROM testtool.tbl_frage
+						 JOIN testtool.tbl_vorschlag USING (frage_id)
+				WHERE tbl_vorschlag.aktiv
+				  AND tbl_vorschlag.punkte < 0
+				  AND tbl_frage.demo = false
+				  AND tbl_frage.aktiv
+			),
+			fragenanzahl AS (
+				SELECT gebiet_id, level, levelgleichverteilung,
+					   CASE WHEN levelgleichverteilung
+								THEN
+								ROUND(COALESCE(maxfragen
+											 * ((SELECT count(*) FROM testtool.tbl_frage f WHERE f.level = tbl_frage.level AND f.gebiet_id = tbl_frage.gebiet_id)::decimal)
+											 / (SELECT count(*) FROM testtool.tbl_frage f WHERE f.gebiet_id = tbl_frage.gebiet_id)::decimal
+									, (SELECT count(*) FROM testtool.tbl_frage f WHERE f.level = tbl_frage.level AND f.gebiet_id = tbl_frage.gebiet_id)
+									))
+							ELSE
+								COALESCE(maxfragen, count(*))
+						   END
+						   AS anzahl
+				FROM testtool.tbl_frage
+						 JOIN testtool.tbl_gebiet USING (gebiet_id)
+				WHERE tbl_frage.aktiv
+				  AND tbl_frage.demo = false
+				GROUP BY gebiet_id, level, levelgleichverteilung, maxfragen
+			)
+			SELECT
+				tbl_gebiet.gebiet_id, tbl_gebiet.bezeichnung,
+				tbl_gebiet.multipleresponse,
+				tbl_gebiet.maxpunkte, tbl_gebiet.maxfragen,
+				tbl_gebiet.levelgleichverteilung,
+				tbl_gebiet.level_start,
+				(
+					CASE WHEN tbl_gebiet.levelgleichverteilung  THEN
+							 (CASE WHEN tbl_gebiet.multipleresponse=false THEN
+									   (SELECT sum(frprolevel) FROM
+										   (
+											   SELECT fragen.level, (SELECT sum(punkte) FROM (SELECT min(punkte) AS punkte FROM fragen lvlfr WHERE lvlfr.gebiet_id = fragen.gebiet_id and lvlfr.level = fragen.level
+																							  GROUP BY lvlfr.frage_id, lvlfr.nummer
+																							  ORDER BY lvlfr.nummer
+																							  LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = fragen.gebiet_id and fragenanzahl.level = fragen.level LIMIT 1)) fr)
+												   AS frprolevel
+											   FROM fragen
+											   WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+											   GROUP BY fragen.gebiet_id, level
+										   ) pkteprolevel)
+								   ELSE
+									   (SELECT sum(frprolevel) FROM
+										   (
+											   SELECT fragen.level,
+													  (SELECT sum(punkte) FROM (SELECT sum(punkte) AS punkte FROM fragen lvlfr WHERE lvlfr.gebiet_id = fragen.gebiet_id and lvlfr.level = fragen.level
+																				GROUP by lvlfr.frage_id, lvlfr.nummer
+																				ORDER BY lvlfr.nummer
+																				LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = fragen.gebiet_id and fragenanzahl.level = fragen.level LIMIT 1)) fr)
+														  AS frprolevel
+											   FROM fragen
+											   WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+											   GROUP BY fragen.gebiet_id, level
+										   ) pkteprolevel)
+								 END)
+					WHEN tbl_gebiet.level_start IS NOT NULL THEN
+							 (CASE WHEN tbl_gebiet.multipleresponse=false THEN
+									   (SELECT sum(pkte)
+										FROM (
+												 SELECT min(punkte) AS pkte
+												 FROM fragen
+												 WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+												   AND fragen.level = tbl_gebiet.level_start
+												 GROUP BY frage_id, nummer
+												 ORDER BY nummer
+												 LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = tbl_gebiet.gebiet_id AND fragenanzahl.level = tbl_gebiet.level_start LIMIT 1)
+											 ) minpkte
+									   )
+								   ELSE
+									   (
+										   SELECT sum(pkte)
+										   FROM (SELECT sum(punkte) AS pkte
+												 FROM fragen
+												 WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+												   AND fragen.level = tbl_gebiet.level_start
+												 GROUP BY frage_id, nummer
+												 ORDER BY nummer
+												 LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = tbl_gebiet.gebiet_id AND fragenanzahl.level = tbl_gebiet.level_start LIMIT 1)
+												) sumpkte
+									   )
+								 END)
+					ELSE
+							 (CASE WHEN tbl_gebiet.multipleresponse=false THEN
+									   (
+										   SELECT sum(pkte)
+										   FROM (SELECT min(punkte) AS pkte
+												 FROM fragen
+												 WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+												 GROUP BY frage_id, nummer
+												 ORDER BY nummer
+												 LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = tbl_gebiet.gebiet_id LIMIT 1)
+												) minpkte
+									   )
+								   ELSE
+									   (
+										   SELECT sum(pkte)
+										   FROM (SELECT sum(punkte) AS pkte
+												 FROM fragen
+												 WHERE fragen.gebiet_id = tbl_gebiet.gebiet_id
+												 GROUP BY frage_id, nummer
+												 ORDER BY nummer
+												 LIMIT (SELECT anzahl FROM fragenanzahl WHERE fragenanzahl.gebiet_id = tbl_gebiet.gebiet_id LIMIT 1)
+												) sumpkte
+									   )
+								 END)
+			
+					END) * (-1) AS offsetpunkte
+			FROM
+				testtool.tbl_gebiet
+			WHERE
+				EXISTS(
+						SELECT 1 FROM fragen WHERE fragen.gebiet_id=tbl_gebiet.gebiet_id
+					)
+			AND gebiet_id = ".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+		";
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				return $row->offsetpunkte;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Ermitteln der Offsetpunkte';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Ermitteln der Offsetpunkte';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft ob das Gebiet bereits gestartet wurde.  Wahlweise pruefling_id oder prestudent_id
+	 *
+	 * @param $pruefling_id Wahlweise pruefling_id oder
+	 * @param $prestudent_id prestudent_id des Prueflings.
+	 * @param $gebiet_id Gebiet_id des Gebiets, dessen Start gefprueft werden soll
+	 * @return true wenn das Gebiet bereits gestartet wurde, false wenn nicht.
+	 */
+	public function isGestartet($gebiet_id, $pruefling_id=null, $prestudent_id=null)
+	{
+		$this->errormsg='';
+
+		if(!is_numeric($gebiet_id) || $gebiet_id=='')
+		{
+			$this->errormsg = 'Gebiet_id muss eine gueltige Zahl sein';
+			return false;
+		}
+		if(!is_null($pruefling_id) && (!is_numeric($pruefling_id) || $pruefling_id==''))
+		{
+			$this->errormsg = 'Pruefling_id muss eine gueltige Zahl sein';
+			return false;
+		}
+		if(!is_null($prestudent_id) && (!is_numeric($prestudent_id) || $prestudent_id==''))
+		{
+			$this->errormsg = 'Prestudent_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		$qry = '	SELECT
+						begintime
+					FROM
+						testtool.tbl_pruefling_frage
+					JOIN
+						testtool.tbl_pruefling USING (pruefling_id)
+					JOIN
+						testtool.tbl_frage USING (frage_id)
+					WHERE ';
+		if (!is_null($pruefling_id))
+			$qry.='		pruefling_id='.$this->db_add_param($pruefling_id, FHC_INTEGER);
+		else
+			$qry.='		prestudent_id='.$this->db_add_param($prestudent_id, FHC_INTEGER);
+
+			$qry.='	AND
+						gebiet_id='.$this->db_add_param($gebiet_id, FHC_INTEGER).'
+					AND
+						begintime IS NOT NULL';
+
+	 	if($result = $this->db_query($qry))
+        {
+            if($this->db_fetch_object($result))
+                return true;
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
+        }
+	}
+
+	/**
+	 * Laedt die Ablaufe die zu einem Gebiet zugeordnet sind
+	 * @param $gebiet_id
+	 * @return boolean true wenn ok, false im Fehlerfall
+	 */
+	public function loadAblaufGebiet($gebiet_id)
+	{
+		$qry = "SELECT * FROM testtool.tbl_ablauf WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new stdClass();
+				$obj->ablauf_id = $row->ablauf_id;
+				$obj->studiengang_kz = $row->studiengang_kz;
+				$obj->gebiet_id = $row->gebiet_id;
+				$obj->reihung = $row->reihung;
+				$obj->gewicht = $row->gewicht;
+				$obj->semester = $row->semester;
+				$obj->ablauf_vorgaben_id = $row->ablauf_vorgaben_id;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+
+				$this->result[] = $obj;
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Loescht ein Gebiet und den zugeordneten Ablauf
+	 * @param $gebiet_id
+	 * @return boolean true wenn ok, false im Fehlerfall
+	 */
+	public function delete($gebiet_id)
+	{
+		$qry = "SELECT * FROM testtool.tbl_frage WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if($result = $this->db_query($qry))
+		{
+			if($this->db_num_rows($result)>0)
+			{
+				$this->errormsg = 'Bitte entfernen Sie zuerst alle Fragen aus dem Gebiet';
+				return false;
+			}
+		}
+
+		$qry = "
+			DELETE FROM testtool.tbl_ablauf WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)."
+			DELETE FROM testtool.tbl_gebiet WHERE gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Loeschen des Gebiets';
+			return false;
+		}
+	}
+
+	/**
+	 * Loescht einen Ablauf
+	 * @param $ablauf_id
+	 * @return boolean true wenn ok, false im Fehlerfall
+	 */
+	public function deleteAblaufZuordnung($ablauf_id)
+	{
+		$qry = "DELETE FROM testtool.tbl_ablauf WHERE ablauf_id=".$this->db_add_param($ablauf_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Entfernen des Ablaufs';
+			return false;
+		}
+	}
+
+	/**
+	 * Laedt alle AblaufVorabe Eintraege
+	 * @return boolean true wenn ok, false im Fehlerfall
+	 */
+	public function getAblaufVorgaben()
+	{
+		$qry = "SELECT * FROM testtool.tbl_ablauf_vorgaben ORDER BY studiengang_kz";
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new stdClass();
+
+				$obj->ablauf_vorgaben_id = $row->ablauf_vorgaben_id;
+				$obj->studiengang_kz = $row->studiengang_kz;
+				$obj->sprache = $row->sprache;
+				$obj->sprachwahl = $this->db_parse_bool($row->sprachwahl);
+				$obj->content_id = $row->content_id;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Speichert den Ablauf
+	 */
+	public function saveAblauf()
+	{
+		if($this->new)
+		{
+			$qry = "INSERT INTO testtool.tbl_ablauf (studiengang_kz, gebiet_id, reihung,gewicht,semester,ablauf_vorgaben_id, insertamum, insertvon) VALUES(".
+				$this->db_add_param($this->studiengang_kz, FHC_INTEGER).','.
+				$this->db_add_param($this->gebiet_id, FHC_INTEGER).','.
+				$this->db_add_param($this->reihung, FHC_INTEGER).','.
+				$this->db_add_param($this->gewicht, FHC_INTEGER).','.
+				$this->db_add_param($this->semester, FHC_INTEGER).','.
+				$this->db_add_param($this->ablauf_vorgaben_id, FHC_INTEGER).','.
+				$this->db_add_param($this->insertamum).','.
+				$this->db_add_param($this->insertvon).');';
+		}
+		else
+		{
+			$this->errormsg='not implemented';
+			return false;
+		}
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return true;
+		}
+	}
+
+	/**
+	 * Prueft, ob das Gebiet zumindest eine Frage oder einen Vorschlag im MathML Format hat.
+	 * @param $gebiet_id
+	 * return true, wenn Gebiet eine/n Frage/Vorschlag im MathML Format enthält.
+	 */
+	public function hasMathML($gebiet_id)
+	{
+		if (is_numeric($gebiet_id))
+		{
+			$qry = '
+            WITH
+               fragen AS (
+                  SELECT DISTINCT
+                     frage_id
+                  FROM
+                     testtool.tbl_frage
+                  JOIN
+                     testtool.tbl_gebiet USING (gebiet_id)
+                  WHERE
+                     tbl_gebiet.gebiet_id = '. $this->db_add_param($gebiet_id, FHC_INTEGER). '
+               ),
+               vorschlaege AS (
+                  SELECT DISTINCT
+                     vorschlag_id
+                  FROM
+                     testtool.tbl_vorschlag
+                  JOIN
+                     fragen USING (frage_id)
+               )
+
+            SELECT
+               1
+            FROM
+               testtool.tbl_frage_sprache
+            JOIN
+               fragen USING (frage_id)
+            WHERE
+               SUBSTRING(text, \'MathML\') IS NOT NULL
+
+            UNION
+
+            SELECT
+               1
+            FROM
+               testtool.tbl_vorschlag_sprache
+            JOIN
+               vorschlaege USING (vorschlag_id)
+            WHERE
+               SUBSTRING(text, \'MathML\') IS NOT NULL
+         ';
+
+			if($result = $this->db_query($qry))
+			{
+				return ($this->db_num_rows($result) > 0);
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Eine numerische gebiet_id muss übergeben werden.';
+			return false;
+		}
+	}
+}
+?>
diff --git a/include/geschlecht.class.php b/include/geschlecht.class.php
new file mode 100644
index 000000000..002103546
--- /dev/null
+++ b/include/geschlecht.class.php
@@ -0,0 +1,116 @@
+<?php
+/* Copyright (C) 2019 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>,
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/sprache.class.php');
+
+class geschlecht extends basis_db
+{
+	public $new;				// boolean
+	public $result = array();
+
+	//Tabellenspalten
+	public $geschlecht; //  character(1)
+	public $bezeichnung_mehrsprachig; //  varchar(255)[]
+	public $bezeichnung_mehrsprachig_arr = array();
+
+	/**
+	 * Konstruktor
+	 * @param $geschlecht ID des Geschlechts das geladen werden soll (Default=null)
+	 */
+	public function __construct($geschlecht=null)
+	{
+		parent::__construct();
+
+		if(!is_null($geschlecht))
+			$this->load($geschlecht);
+	}
+
+	/**
+	 * Laedt ein geschlecht
+	 * @param  $geschlecht das zu ladende Geschlecht
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function load($geschlecht)
+	{
+		$sprache = new sprache();
+
+		$qry = "
+			SELECT
+				*,".$sprache->getSprachQuery('bezeichnung_mehrsprachig')."
+			FROM
+				public.tbl_geschlecht
+			WHERE
+				geschlecht=".$this->db_add_param($geschlecht);
+
+		if(!$this->db_query($qry))
+		{
+			$this->errormsg = 'Fehler bei einer Datenbankabfrage';
+			return false;
+		}
+
+		if($row = $this->db_fetch_object())
+		{
+			$this->geschlecht = $row->geschlecht;
+			$this->bezeichnung_mehrsprachig_arr = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
+		}
+		else
+		{
+			$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Laedt alle Geschlechter
+	 * @return boolean true wenn erfolgreich, false im Fehlerfall
+	 */
+	public function getAll()
+	{
+		$sprache = new sprache();
+
+		$qry = "
+			SELECT
+				*,".$sprache->getSprachQuery('bezeichnung_mehrsprachig')."
+			FROM
+				public.tbl_geschlecht
+			ORDER BY sort, geschlecht";
+
+		if (!$this->db_query($qry))
+		{
+			$this->errormsg = 'Fehler bei einer Datenbankabfrage';
+			return false;
+		}
+
+		while ($row = $this->db_fetch_object())
+		{
+			$obj = new stdClass();
+
+			$obj->geschlecht = $row->geschlecht;
+			$obj->bezeichnung_mehrsprachig_arr = $sprache->parseSprachResult('bezeichnung_mehrsprachig', $row);
+
+			$this->result[] = $obj;
+		}
+
+		return true;
+	}
+}
+?>
diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
index c6c1c0228..3d754d7ec 100644
--- a/include/lehreinheit.class.php
+++ b/include/lehreinheit.class.php
@@ -532,20 +532,34 @@ class lehreinheit extends basis_db
 
 			for($anz=0;$anz<count($this->studiengang_kz);$anz++)
 			{
-				$sql_query.=" OR ((studiengang_kz=".$this->db_add_param($this->studiengang_kz[$anz])." AND semester=".$this->db_add_param($this->semester[$anz]).")";
+				// Direkte Gruppen kollidieren nicht
+				$direktgruppe = false;
+				if($this->gruppe_kurzbz[$anz]!=null && $this->gruppe_kurzbz[$anz]!='' && $this->gruppe_kurzbz[$anz]!=' ')
+				{
+					$grp_obj = new gruppe();
+					$grp_obj->load($this->gruppe_kurzbz[$anz]);
+					if($grp_obj->direktinskription)
+					{
+						$direktgruppe = true;
+					}
+				}
+				if(!$direktgruppe)
+				{
+					$sql_query.=" OR ((studiengang_kz=".$this->db_add_param($this->studiengang_kz[$anz])." AND semester=".$this->db_add_param($this->semester[$anz]).")";
 
-				if ($this->gruppe_kurzbz[$anz]!=null && $this->gruppe_kurzbz[$anz]!='' && $this->gruppe_kurzbz[$anz]!=' ')
-				{
-					$sql_query.=" OR (gruppe_kurzbz=".$this->db_add_param($this->gruppe_kurzbz[$anz]).")";
+					if ($this->gruppe_kurzbz[$anz]!=null && $this->gruppe_kurzbz[$anz]!='' && $this->gruppe_kurzbz[$anz]!=' ')
+					{
+						$sql_query.=" OR (gruppe_kurzbz=".$this->db_add_param($this->gruppe_kurzbz[$anz]).")";
+					}
+					else
+					{
+						if ($this->verband[$anz]!=null && $this->verband[$anz]!='' && $this->verband[$anz]!=' ')
+							$sql_query.=" AND (verband=".$this->db_add_param($this->verband[$anz])." OR verband IS NULL OR verband='' OR verband=' ')";
+						if ($this->gruppe[$anz]!=null && $this->gruppe[$anz]!='' && $this->gruppe[$anz]!=' ')
+							$sql_query.=" AND (gruppe=".$this->db_add_param($this->gruppe[$anz])." OR gruppe IS NULL OR gruppe='' OR gruppe=' ')";
+					}
+					$sql_query.=')';
 				}
-				else
-				{
-					if ($this->verband[$anz]!=null && $this->verband[$anz]!='' && $this->verband[$anz]!=' ')
-						$sql_query.=" AND (verband=".$this->db_add_param($this->verband[$anz])." OR verband IS NULL OR verband='' OR verband=' ')";
-					if ($this->gruppe[$anz]!=null && $this->gruppe[$anz]!='' && $this->gruppe[$anz]!=' ')
-						$sql_query.=" AND (gruppe=".$this->db_add_param($this->gruppe[$anz])." OR gruppe IS NULL OR gruppe='' OR gruppe=' ')";
-				}
-				$sql_query.=')';
 			}
 			$sql_query.=")";
 
diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
index 26043bae6..87e6ca569 100644
--- a/include/lehrstunde.class.php
+++ b/include/lehrstunde.class.php
@@ -291,6 +291,11 @@ class lehrstunde extends basis_db
 			$this->errormsg='Fehler: LVA-ID ist nicht gesetzt';
 			return -1;
 		}
+		if ($type=='lva' && !is_numeric($lva))
+		{
+			$this->errormsg='Fehler: LVA-ID ist ungueltig';
+			return -1;
+		}
 		// Type
 		if ($type==null)
 		{
@@ -362,7 +367,7 @@ class lehrstunde extends basis_db
 			}
 			else
 			{
-				$this->errormsg=$this->db_last_error();
+				$this->errormsg = 'Fehler beim Laden der Verbaende';
 				return -2;
 			}
 			// Spezialgruppen ermitteln zu denen die Person zugeteilt ist
@@ -394,7 +399,7 @@ class lehrstunde extends basis_db
 
 			if (!$result_einheit=$this->db_query($sql_query))
 			{
-				$this->errormsg=$this->db_last_error($this->conn);
+				$this->errormsg= 'Fehler beim Laden der Gruppen';
 				return false;
 			}
 			else
@@ -424,7 +429,7 @@ class lehrstunde extends basis_db
 
 			if (!$result_einheit=$this->db_query($sql_query))
 			{
-				$this->errormsg=$this->db_last_error($this->conn);
+				$this->errormsg='Fehler beim Laden der Gruppen';
 				return false;
 			}
 			else
@@ -565,7 +570,7 @@ class lehrstunde extends basis_db
 		//Datenbankabfrage
 		if (!$this->db_query($sql_query_stdplan))
 		{
-			$this->errormsg = $this->db_last_error();
+			$this->errormsg = 'Fehler beim Laden der Stundenplandaten';
 			return -2;
 		}
 		$stpl_tbl = $this->db_result;
@@ -619,7 +624,7 @@ class lehrstunde extends basis_db
 			//Datenbankabfrage
 			if (!$this->db_query($sql_query_reservierung))
 			{
-				$this->errormsg = $this->db_last_error();
+				$this->errormsg = 'Fehler beim Laden der Reservierungen';
 				return -2;
 			}
 			$stpl_tbl = $this->db_result;
diff --git a/include/meta/angular-tablesorter.php b/include/meta/angular-tablesorter.php
index b0e36e2dc..dd57586f5 100644
--- a/include/meta/angular-tablesorter.php
+++ b/include/meta/angular-tablesorter.php
@@ -25,9 +25,9 @@ if($dr=='')
 	$dr='/';
 
 //Originaldateien des Herstellers
-echo '<link rel="stylesheet" type="text/css" href="'.$dr.'vendor/FHC-vendor/angular-tablesort/tablesort.css">';
+echo '<link rel="stylesheet" type="text/css" href="'.$dr.'FHC-vendor/angular-tablesort/tablesort.css">';
 
-echo '<script src="'.$dr.'vendor/FHC-vendor/angular-tablesort/js/angular-tablesort.js"></script>';
+echo '<script src="'.$dr.'FHC-vendor/angular-tablesort/js/angular-tablesort.js"></script>';
 
 //Anpassungen
 echo '<link rel="stylesheet" type="text/css" href="'.$dr.'include/vendor_custom/angular-tablesorter/tablesort.css">';
diff --git a/include/meta/easyui.php b/include/meta/easyui.php
index 3d5c62bfe..78df35b87 100644
--- a/include/meta/easyui.php
+++ b/include/meta/easyui.php
@@ -25,11 +25,11 @@ if($dr=='')
 	$dr='/';
 
 //Originaldateien des Herstellers
-echo '<link rel="stylesheet" type="text/css" href="'.$dr.'vendor/FHC-vendor/easyui/themes/icon.css">';
-echo '<link rel="stylesheet" type="text/css" href="'.$dr.'vendor/FHC-vendor/easyui/themes/gray/easyui.css">';
+echo '<link rel="stylesheet" type="text/css" href="'.$dr.'FHC-vendor/easyui/themes/icon.css">';
+echo '<link rel="stylesheet" type="text/css" href="'.$dr.'FHC-vendor/easyui/themes/gray/easyui.css">';
 
-echo '<script src="'.$dr.'vendor/FHC-vendor/easyui/jquery.min.js"></script>';
-echo '<script src="'.$dr.'vendor/FHC-vendor/easyui/jquery.easyui.min.js"></script>';
+echo '<script src="'.$dr.'FHC-vendor/easyui/jquery.min.js"></script>';
+echo '<script src="'.$dr.'FHC-vendor/easyui/jquery.easyui.min.js"></script>';
 
 
 //Anpassungen
diff --git a/include/meta/jquery-tablesorter.php b/include/meta/jquery-tablesorter.php
index 4d0295739..badbd741f 100644
--- a/include/meta/jquery-tablesorter.php
+++ b/include/meta/jquery-tablesorter.php
@@ -39,9 +39,9 @@ if($dr=='')
 	$dr='/';
 
 //Originaldateien des Herstellers
-echo '<link rel="stylesheet" type="text/css" href="'.$dr.'vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css">';
-echo '<script src="'.$dr.'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js"></script>';
-echo '<script src="'.$dr.'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js"></script>';
+echo '<link rel="stylesheet" type="text/css" href="'.$dr.'FHC-vendor/jquery-tablesorter/css/theme.default.css">';
+echo '<script src="'.$dr.'FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js"></script>';
+echo '<script src="'.$dr.'FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js"></script>';
 
 //Anpassungen
 echo '<link rel="stylesheet" type="text/css" href="'.$dr.'include/vendor_custom/jquery-tablesorter/tablesort.css">';
diff --git a/include/person.class.php b/include/person.class.php
index b4f3f2676..edfa0ec7f 100644
--- a/include/person.class.php
+++ b/include/person.class.php
@@ -374,12 +374,7 @@ class person extends basis_db
 			$this->errormsg = 'Staatsbuergerschaft darf nicht laenger als 3 Zeichen sein';
 			return false;
 		}
-		if ($this->geschlecht != 'm' && $this->geschlecht != 'w' && $this->geschlecht != 'u')
-		{
-			$this->errormsg = 'Geschlecht muss w, m oder u sein!';
-			return false;
-		}
-
+		
 		//Pruefen ob das Geburtsdatum mit der SVNR uebereinstimmt.
 		if ($this->svnr != '' && $this->gebdatum != '')
 		{
diff --git a/include/pgsql.class.php b/include/pgsql.class.php
index 52ac9b4f8..7e0333b9f 100644
--- a/include/pgsql.class.php
+++ b/include/pgsql.class.php
@@ -289,7 +289,7 @@ class basis_db extends db
 			case FHC_INTEGER:
 				$var = $this->db_escape($var);
 				if(!is_numeric($var) && $var!=='')
-					die('Invalid Integer Parameter detected:'.$var);
+					die('Invalid Integer Parameter detected');
 				$var = $this->db_null_value($var, false);
 				break;
 
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 4304e5341..22cc06425 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -420,6 +420,69 @@ class prestudent extends person
 		return true;
 	}
 
+	/**
+	 * Laden aller Prestudenten, die an $datum zum Reihungstest geladen sind.
+	 * Wenn es mehrere Bewerbungen für ein Person gibt, wird nur die höchste Prestudent_id zurückgeliefert
+	 * @param string $datum Datum in der Form YYYY-MM-DD an dem der Reihungstest stattfindet
+	 * @return true wenn erfolgreich, false im Fehlerfall
+	 */
+	public function getFirstPrioPrestudentRT($datum)
+	{
+		$sql_query='SELECT DISTINCT
+						ps.prestudent_id,
+						pers.vorname, pers.nachname, pers.person_id, pers.titelpre,
+						pers.titelpost, pers.gebdatum,
+						tbl_reihungstest.*,
+						ps.studiengang_kz as studiengang_kz,
+						tbl_studiengang.typ
+					FROM 
+						public.tbl_prestudent ps
+						JOIN public.tbl_person pers USING (person_id)
+						JOIN public.tbl_rt_person USING (person_id)
+						JOIN public.tbl_reihungstest ON (tbl_reihungstest.reihungstest_id=tbl_rt_person.rt_id)
+						JOIN public.tbl_studiengang ON (ps.studiengang_kz=tbl_studiengang.studiengang_kz)
+						JOIN public.tbl_prestudentstatus ON (tbl_prestudentstatus.prestudent_id=ps.prestudent_id 
+																AND status_kurzbz=\'Interessent\' 
+																AND tbl_prestudentstatus.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz)
+					WHERE
+						tbl_reihungstest.datum='.$this->db_add_param($datum).'
+						/*AND tbl_rt_person.studienplan_id IN (SELECT studienplan_id FROM public.tbl_prestudentstatus WHERE prestudent_id=ps.prestudent_id)*/
+						AND tbl_prestudentstatus.studienplan_id IN (SELECT studienplan_id FROM public.tbl_rt_studienplan WHERE reihungstest_id=tbl_rt_person.rt_id)
+						AND EXISTS(SELECT * FROM public.tbl_prestudentstatus JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+							WHERE prestudent_id=ps.prestudent_id AND tbl_studiensemester.ende > '.$this->db_add_param($datum).')
+						AND priorisierung = (SELECT priorisierung FROM public.tbl_prestudent 
+									WHERE person_id = pers.person_id 
+									AND get_rolle_prestudent (ps.prestudent_id,NULL) IN (\'Interessent\',\'Bewerber\',\'Wartender\',\'Aufgenommener\')
+									--AND tbl_prestudent.studiengang_kz=ps.studiengang_kz
+									ORDER BY priorisierung ASC LIMIT 1)
+					ORDER BY nachname,vorname';
+
+		if(!$this->db_query($sql_query))
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+
+		$this->num_rows=0;
+
+		while($row = $this->db_fetch_object())
+		{
+			$ps=new prestudent();
+			$ps->prestudent_id = $row->prestudent_id;
+			$ps->person_id = $row->person_id;
+			$ps->reihungstest_id = $row->reihungstest_id;
+			$ps->titelpost = $row->titelpost;
+			$ps->titelpre = $row->titelpre;
+			$ps->nachname = $row->nachname;
+			$ps->vorname = $row->vorname;
+			$ps->gebdatum = $row->gebdatum;
+			$ps->studiengang_kz = $row->studiengang_kz;
+			$this->result[]=$ps;
+			$this->num_rows++;
+		}
+		return true;
+	}
+
 	/**
 	 * Laedt über einen Prestudenten alle anderen Prestudenten einer Person, die aktuell an STG interessiert sind.
 	 * @integer $prestudent_id Prestudent ID, über die alle weiteren Prestudenten ermittelt werden sollen.
@@ -436,11 +499,12 @@ class prestudent extends person
 			SELECT DISTINCT ON (priorisierung, prestudent_id) 
 				priorisierung,
 				prestudent_id, 
-				studienplan_id,
+				tbl_prestudentstatus.studienplan_id,
 				studiengang_kz,
 				typ,
 				tbl_studiengangstyp.bezeichnung AS typ_bz,
-				ausbildungssemester
+				ausbildungssemester,
+				tbl_orgform.bezeichnung_mehrsprachig
 			FROM
 				public.tbl_prestudentstatus
 			JOIN
@@ -449,6 +513,10 @@ class prestudent extends person
 				public.tbl_studiengang USING (studiengang_kz)
 			JOIN
 				public.tbl_studiengangstyp USING (typ)
+			JOIN
+				lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
+			JOIN
+				bis.tbl_orgform ON (tbl_studienplan.orgform_kurzbz = tbl_orgform.orgform_kurzbz)
 			WHERE 
 				tbl_prestudent.person_id = (
 				SELECT
@@ -516,6 +584,7 @@ class prestudent extends person
 					$obj->typ = $row->typ;
 					$obj->typ_bz = $row->typ_bz;
 					$obj->ausbildungssemester = $row->ausbildungssemester;
+					$obj->orgform_bezeichnung = $this->db_parse_lang_array($row->bezeichnung_mehrsprachig);
 
 					$this->result[] = $obj;
 				}
diff --git a/include/pruefling.class.php b/include/pruefling.class.php
index 3c5244067..764900b0b 100644
--- a/include/pruefling.class.php
+++ b/include/pruefling.class.php
@@ -350,9 +350,10 @@ class pruefling extends basis_db
 	 * definiert sind, bei der Berechnung der Endpunkte nicht berücksichtigt.
 	 * @param $studiengang_kz Wenn eine Studiengangskennzahl übergeben wird, dann werden nur die Punkte der
 	 * Basis-Fragengebiete (ohne Quereinsteiger) bei der Berechnung der Endpunkte berücksichtigt.
+	 * @param $gewichtung_studiengang_kz Wenn diese studiengang_kz übergeben wird, wird das Ergebnis entsprechend des Gewichtungsschemas des Studienganges gewichtet
 	 * @return Endpunkte des Reihungstests oder False wenn keine Punkte vorhanden
 	 */
-	public function getReihungstestErgebnisPerson($person_id, $punkte=false, $reihungstest_id, $has_excluded_gebiete = false, $studiengang_kz = null)
+	public function getReihungstestErgebnisPerson($person_id, $punkte=false, $reihungstest_id, $has_excluded_gebiete = false, $studiengang_kz = null, $gewichtung_studiengang_kz = null)
 	{
 		if(is_numeric($reihungstest_id))
 		{
@@ -415,39 +416,57 @@ class pruefling extends basis_db
 			 * Ergebniss der beiden Tests summiert bekommen
 			 * Im Zweifelsfall wird der neuere Reihungstest genommen */
 			$qry .= "
-				AND prestudent_id = (
-					SELECT
-						prestudent_id
-					FROM
-						public.tbl_rt_person
-					JOIN 
-						public.tbl_prestudent USING(person_id)
-					JOIN
-						public.tbl_prestudentstatus USING (prestudent_id, studienplan_id)
-					JOIN 
-						tbl_reihungstest ON (
-							tbl_rt_person.rt_id = tbl_reihungstest.reihungstest_id			
-						)
-					WHERE
-						tbl_rt_person.person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
-					AND 
-						tbl_rt_person.rt_id = ".$this->db_add_param($reihungstest_id, FHC_INTEGER)."
-					AND 
-						tbl_prestudentstatus.status_kurzbz='Interessent'
-					AND 
-						tbl_prestudentstatus.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
-					ORDER BY
-						tbl_reihungstest.datum DESC, tbl_prestudent.priorisierung ASC LIMIT 1
-				)
-			";
+					AND prestudent_id = (
+						SELECT
+							prestudent_id
+						FROM
+							public.tbl_rt_person
+						JOIN 
+							public.tbl_prestudent USING(person_id)
+						JOIN
+							public.tbl_prestudentstatus USING (prestudent_id, studienplan_id)
+						JOIN 
+							tbl_reihungstest ON (
+								tbl_rt_person.rt_id = tbl_reihungstest.reihungstest_id			
+							)
+						WHERE
+							tbl_rt_person.person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
+						AND 
+							tbl_rt_person.rt_id = ".$this->db_add_param($reihungstest_id, FHC_INTEGER)."
+						AND 
+							tbl_prestudentstatus.status_kurzbz='Interessent'
+						AND 
+							tbl_prestudentstatus.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+						ORDER BY tbl_reihungstest.datum DESC, tbl_prestudent.priorisierung ASC LIMIT 1
+					)
+				";
+
+			//calculate Gewichte for Studiengang if set
+			$gewichte = array();
+			if (isset($gewichtung_studiengang_kz))
+			{
+				$ablauf = new ablauf();
+				$ablauf->getAblaufGebiete($gewichtung_studiengang_kz);
+
+				foreach ($ablauf->result as $abl)
+				{
+					$gewichte[$abl->gebiet_id] = $abl->gewicht;
+				}
+			}
+
 			if($result = $this->db_query($qry))
 			{
 				// Wenn keine Eintraege vorhanden dann false
 				if($this->db_num_rows($result)==0)
 					return false;
 
+				$summeGewicht = 0;
+
 				while($row = $this->db_fetch_object($result))
 				{
+					if (!isset($row->punkte))
+						continue;
+
 					//wenn maxpunkte ueberschritten wurde -> 100%
 					if($row->punkte>=$row->maxpunkte)
 					{
@@ -455,17 +474,20 @@ class pruefling extends basis_db
 						$row->punkte = $row->maxpunkte;
 					}
 					else
-						$prozent = ($row->punkte/$row->maxpunkte)*100;
+						$prozent = (($row->punkte + $row->offsetpunkte)/($row->maxpunkte + $row->offsetpunkte))*100;
 
 					if($punkte)
 					{
-						$ergebnis +=$row->punkte;
+						$ergebnis += $row->punkte;
 					}
-
 					else
-						$ergebnis+=$prozent*$row->gewicht;
+					{
+						$gew = isset($gewichte[$row->gebiet_id]) ? $gewichte[$row->gebiet_id] : 1;
+						$ergebnis += $prozent * $gew;
+						$summeGewicht += $gew;
+					}
 				}
-				return $ergebnis;
+				return $summeGewicht > 0 ? $ergebnis/$summeGewicht : $ergebnis;
 			}
 			else
 			{
diff --git a/include/studienordnung.class.php b/include/studienordnung.class.php
index 58c033057..eca5fa52a 100644
--- a/include/studienordnung.class.php
+++ b/include/studienordnung.class.php
@@ -154,6 +154,7 @@ class studienordnung extends basis_db
 					FROM lehre.tbl_studienordnung sto
 					LEFT JOIN lehre.tbl_studienordnungstatus s USING(status_kurzbz)
 					LEFT JOIN public.tbl_studiensemester ON(sto.gueltigvon=tbl_studiensemester.studiensemester_kurzbz)
+					LEFT JOIN public.tbl_studiensemester stoende ON(sto.gueltigbis=stoende.studiensemester_kurzbz)
 					WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER, false);
 		}
 		else
@@ -164,6 +165,7 @@ class studienordnung extends basis_db
 					LEFT JOIN lehre.tbl_studienplan USING(studienordnung_id)
 					LEFT JOIN lehre.tbl_studienplan_semester sem USING (studienplan_id)
 					LEFT JOIN public.tbl_studiensemester ON(sto.gueltigvon=tbl_studiensemester.studiensemester_kurzbz)
+					LEFT JOIN public.tbl_studiensemester stoende ON(sto.gueltigbis=stoende.studiensemester_kurzbz)
 					WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER, false);
 
 			if (!is_null($studiensemester_kurzbz))
@@ -172,7 +174,7 @@ class studienordnung extends basis_db
 				$qry.=" AND semester=".$this->db_add_param($semester, FHC_INTEGER,false);
 		}
 
-		$qry.=" ORDER BY gueltig_startdatum desc";
+		$qry.=" ORDER BY gueltig_startdatum desc, stoende.start nulls first";
 
 		if(!$this->db_query($qry))
 		{
@@ -475,10 +477,10 @@ class studienordnung extends basis_db
 			return false;
 		}
 
-        $qry = 'SELECT 1 FROM lehre.tbl_studienplan_semester 
-            WHERE studienplan_id 
+        $qry = 'SELECT 1 FROM lehre.tbl_studienplan_semester
+            WHERE studienplan_id
             IN (SELECT studienplan_id FROM lehre.tbl_studienplan
-                WHERE studienordnung_id ='.$this->db_add_param($studienordnung_id).';'; 
+                WHERE studienordnung_id ='.$this->db_add_param($studienordnung_id).';';
 
 		if($this->db_query($qry))
 		{
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 68ae8a1cb..b8c42da11 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -189,10 +189,6 @@ function checkZeilenUmbruch()
 			$text.=  '<br>';
 			$text.=  "<a class='Item' target='_blank' href='upload.php?course_id=$studiengang_kz&term_id=$semester&short=$short'>".$p->t('lehre/upload')."</a>";
 			$text.=  '&nbsp;&nbsp;&nbsp;';
-			if(isset($dir_empty) && $dir_empty == false)
-				$text.=  "<a class='Item' title='".$p->t('lehre/ziparchivTitle')."' href='zipdownload.php?stg=$studiengang_kz&sem=$semester&short=$short' target='_blank'>".$p->t('lehre/ziparchiv')."</a>";
-			else
-				$text.=  $p->t('lehre/ziparchiv');
 		}
 
 		$menu[]=array
@@ -279,41 +275,6 @@ function checkZeilenUmbruch()
 		);
 	}
 
-	// Uebungstool
-	if((!defined('CIS_LEHRVERANSTALTUNG_UEBUNGSTOOL_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_UEBUNGSTOOL_ANZEIGEN) && $angemeldet)
-	{
-		$link='';
-		$link_onclick='';
-		$text='';
-
-		if(isset($angezeigtes_stsem))
-			$studiensem = '&stsem='.urlencode($angezeigtes_stsem);
-		else
-			$studiensem = '';
-
-		//Kreuzerltool
-		if($is_lector)
-		{
-			$link='benotungstool/verwaltung.php?lvid='.urlencode($lvid).$studiensem;
-			$text.='<a href="'.APP_ROOT.'cms/dms.php?id='.$p->t('dms_link/benotungstoolHandbuch').'" class="Item" target="_blank">'.$p->t('lehre/benotungstoolHandbuch').' [PDF]</a>';
-		}
-		else
-		{
-			$link='benotungstool/studentenansicht.php?lvid='.urlencode($lvid).$studiensem;
-		}
-
-		$menu[]=array
-		(
-			'id'=>'core_menu_uebungstool',
-			'position'=>'60',
-			'name'=>$p->t('lehre/kreuzerltool'),
-			'icon'=>'../../../skin/images/button_kreuzerltool.png',
-			'link'=>$link,
-			'link_onclick'=>$link_onclick,
-			'text'=>$text
-		);
-	}
-
 	//Gesamtnote
 	if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
 	{
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
index c49542246..d465eba28 100644
--- a/include/tw/vilesci_menu_main.inc.php
+++ b/include/tw/vilesci_menu_main.inc.php
@@ -185,7 +185,6 @@ $menu=array
 			'Lehreinheiten'=>array('name'=>'Lehreinheiten', 'link'=>'lehre/lehreinheiten_vorrueckung.php', 'target'=>'main','permissions'=>array('lehre/vorrueckung'),),
 			'Studenten'=>array('name'=>'Studenten', 'link'=>'personen/student_vorrueckung.php', 'target'=>'main','permissions'=>array('student/vorrueckung'),)
 		),
-		'Kreuzerllistekopieren'=>array('name'=>'Kreuzerllisten kopieren', 'link'=>CIS_ROOT.'cis/private/lehre/benotungstool/copy_uebung.php', 'target'=>'_blank','permissions'=>array('admin')),
 		'Firmenwartung'=>array('name'=>'Firmenwartung', 'link'=>'stammdaten/firma_zusammen_uebersicht.php', 'target'=>'main','permissions'=>array('basis/firma')),
 		'checkStudenten'=>array('name'=>'CheckStudenten', 'link'=>'../system/checkStudenten.php', 'target'=>'main', 'permissions'=>array('student/stammdaten')),
 		'StudienplanZuteilung'=>array('name'=>'Studienplan Zuteilung', 'link'=>'lehre/studienplan_zuteilung.php', 'target'=>'main','permissions'=>array('assistenz')),
diff --git a/include/udf.class.php b/include/udf.class.php
index 6d7111346..eda139227 100644
--- a/include/udf.class.php
+++ b/include/udf.class.php
@@ -234,10 +234,6 @@ class UDF extends basis_db
 				$toString = $this->dropdownListValuesToString($decodedJson[$udfName], $udfDescription['enum']);
 			}
 		}
-		else if ($decodedJson[$udfName] == null)
-		{
-			$toString = '';
-		}
 
 		return $toString;
 	}
diff --git a/include/vertrag.class.php b/include/vertrag.class.php
index b67dd425d..01b10c2b0 100644
--- a/include/vertrag.class.php
+++ b/include/vertrag.class.php
@@ -346,7 +346,7 @@ class vertrag extends basis_db
 			mitarbeiter_uid,
 			null as pruefung_id,
 			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.faktor*tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
+			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			null as betreuerart_kurzbz,
 			(	SELECT
@@ -370,7 +370,7 @@ class vertrag extends basis_db
 			null as mitarbeiter_uid,
 			null::integer as pruefung_id,
 			projektarbeit_id,
-			(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
+			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
@@ -513,7 +513,7 @@ class vertrag extends basis_db
 			mitarbeiter_uid,
 			null as pruefung_id,
 			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.faktor*tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
+			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			null as betreuerart_kurzbz,
 			(	SELECT
@@ -539,7 +539,7 @@ class vertrag extends basis_db
 			null as mitarbeiter_uid,
 			null::integer as pruefung_id,
 			projektarbeit_id,
-			(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
+			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index d2ef43101..29b4db23f 100644
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -240,7 +240,7 @@ class wochenplan extends basis_db
 
 			if (!$this->db_query($sql_query))
 			{
-				$this->errormsg=$this->db_last_error();
+				$this->errormsg = 'Failed to load Personal Information';
 				return false;
 			}
 			if ($row = $this->db_fetch_object())
@@ -262,7 +262,7 @@ class wochenplan extends basis_db
 			}
 			else
 			{
-				$this->errormsg='User nicht gefunden';
+				$this->errormsg = 'User nicht gefunden';
 				return false;
 			}
 		}
@@ -275,7 +275,7 @@ class wochenplan extends basis_db
 
 			if (!$this->db_query($sql_query))
 			{
-				$this->errormsg=$this->db_last_error();
+				$this->errormsg = 'Failed to load Location Information';
 				return false;
 			}
 
@@ -303,7 +303,7 @@ class wochenplan extends basis_db
 
 			if (!$this->db_query($sql_query))
 			{
-				$this->errormsg=$this->db_last_error();
+				$this->errormsg = 'Failed to load Location Information';
 				return false;
 			}
 
@@ -328,7 +328,10 @@ class wochenplan extends basis_db
 						FROM public.tbl_studiengang WHERE studiengang_kz=".$this->db_add_param($this->stg_kz);
 
 			if (!($this->db_query($sql_query)))
-				die($this->db_last_error());
+			{
+				$this->errormsg = 'Failed to load Degree Program';
+				return false;
+			}
 			if ($row = $this->db_fetch_object())
 			{
 				$this->stg_bez = $row->bezeichnung;
@@ -342,13 +345,13 @@ class wochenplan extends basis_db
 		// Stundentafel abfragen
 		$sql_query="SELECT stunde, beginn, ende FROM lehre.tbl_stunde ORDER BY stunde";
 		if (!$this->db_query($sql_query))
-			die($this->db_last_error());
+			die('Failed to load Timetable');
 		$this->stunde = $this->db_result;
 
 		// Studiensemesterdaten ermitteln
 		$sql_query="SELECT * FROM public.tbl_studiensemester WHERE now()<ende ORDER BY start LIMIT 2";
 		if (!$this->db_query($sql_query))
-			die($this->db_last_error());
+			die('Failed to load Studiensemester');
 		else
 		{
 			if ($row = $this->db_fetch_object())
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index afe6e7e27..7a0c47ca8 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -46,10 +46,6 @@
 		<!ENTITY menu-statistic.label		"Berichte">
 		<!ENTITY menu-statistic.accesskey	"R">
 
-		<!ENTITY menu-statistic-koordinatorstunden.key			"K">
-		<!ENTITY menu-statistic-koordinatorstunden.label		"Koordinatorstunden">
-		<!ENTITY menu-statistic-koordinatorstunden.accesskey	"K">
-
 		<!ENTITY menu-statistic-lehre.key		"L">
 		<!ENTITY menu-statistic-lehre.label		"Lehre">
 		<!ENTITY menu-statistic-lehre.accesskey	"L">
@@ -155,14 +151,6 @@
 		<!ENTITY menu-statistic-substatistik-alvsstatistik-html.label		"HTML">
 		<!ENTITY menu-statistic-substatistik-alvsstatistik-html.accesskey	"H">
 
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj.key			"L">
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj.label		"LV-Planung Gesamt SJ">
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj.accesskey	"L">
-
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj-excel.key		"E">
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj-excel.label		"EXCEL">
-		<!ENTITY menu-statistic-substatistik-lvplanunggesamtsj-excel.accesskey	"E">
-
 		<!ENTITY menu-statistic-abgaengerstatistik.key			"A">
 		<!ENTITY menu-statistic-abgaengerstatistik.label		"AbgängerInnenstatistik">
 		<!ENTITY menu-statistic-abgaengerstatistik.accesskey	"A">
@@ -175,10 +163,6 @@
 		<!ENTITY menu-statistic-absolventenzahlen.label		"AbsolventInnenzahlen">
 		<!ENTITY menu-statistic-absolventenzahlen.accesskey	"Z">
 
-		<!ENTITY menu-statistic-lektorenstatistik.key		"L">
-		<!ENTITY menu-statistic-lektorenstatistik.label		"LektorInnenstatistik">
-		<!ENTITY menu-statistic-lektorenstatistik.accesskey	"L">
-
 		<!ENTITY menu-statistic-studentenstatistik.key			"S">
 		<!ENTITY menu-statistic-studentenstatistik.label		"Studierendenstatistik">
 		<!ENTITY menu-statistic-studentenstatistik.accesskey	"S">
diff --git a/public/css/TinyMCE.css b/public/css/TinyMCE.css
new file mode 100644
index 000000000..a6d956b48
--- /dev/null
+++ b/public/css/TinyMCE.css
@@ -0,0 +1,7 @@
+.mce-tinymce .mce-container .mce-panel {
+	border-width: 0px;
+}
+
+.mce-panel {
+	border-width: 0px !important;
+}
diff --git a/public/css/Widgets.css b/public/css/Widgets.css
new file mode 100644
index 000000000..69c23639b
--- /dev/null
+++ b/public/css/Widgets.css
@@ -0,0 +1,47 @@
+.div-table {
+	display: table;
+	width: 100%;
+}
+
+.div-row {
+	display: table-row;
+}
+
+.div-cell {
+	display: table-cell;
+}
+
+.div-cell-label {
+	display: table-cell;
+}
+
+label[required-field=true]::after {
+	content: "*";
+}
+
+.div-cell-data {
+	display: table-cell;
+}
+
+.halign-right {
+	text-align: right;
+	margin-left: auto;
+	margin-right: 0;
+}
+
+.valign-middle {
+	vertical-align: middle;
+}
+
+.valign-top {
+	vertical-align: top;
+	padding-top: 1px;
+}
+
+.width-150px {
+	width: 150px;
+}
+
+.width-30px {
+	width: 30px;
+}
diff --git a/public/css/messaging/message.css b/public/css/messaging/message.css
new file mode 100644
index 000000000..f5440b892
--- /dev/null
+++ b/public/css/messaging/message.css
@@ -0,0 +1,210 @@
+/* Smaller subject field */
+input[type=text] {
+    height: 28px;
+    padding: 0;
+}
+
+.msgfield label {
+    margin-bottom: 0 !important;
+    margin-top: 3px;
+}
+
+@media screen and (min-width: 1200px) {
+    .col-lg-1.msgfieldcol-left {
+        width: 13%;
+    }
+
+    .col-lg-11.msgfieldcol-right {
+        width: 87%;
+    }
+}
+
+#sendButton {
+    width: 120px;
+}
+
+/* Overwrites the Widget.css class */
+div .width-150px {
+	width: 200px;
+}
+
+.panel-heading {
+    font-size: 16px;
+}
+
+.signatureblock {
+    color: grey;
+}
+
+.signatureblocklink {
+    color: grey;
+}
+
+.signatureblocklink:hover {
+    color: #337ab7;
+}
+
+.rwd-line {
+    display: block;
+}
+
+@media screen and (min-width: 1831px) {
+    .rwd-line {
+        display: inline;
+    }
+}
+
+.panel-heading {
+    font-size: 16px;
+}
+
+@media screen and (min-width: 1500px) {
+    #msgtable {
+        width: 70%;
+    }
+}
+
+#msgtable td {
+    border: none !important;
+}
+
+#replybutton {
+    width: 120px;
+}
+
+/* STYLE THE HTML ELEMENTS (INCLUDES RESETS FOR THE DEFAULT FIELDSET AND LEGEND STYLES) */
+fieldset {
+	margin: 0;
+	padding: 2rem;
+	box-sizing: border-box;
+	display: block;
+	border: none;
+	border: solid 1px #CCC;
+	min-width: 0;
+	background-color: #FFF;
+}
+
+fieldset legend {
+	margin: 0 0 1.5rem;
+	padding: 0;
+	width: 100%;
+	float: left;
+	display: table;
+	font-size: 1.5rem;
+	line-height: 140%;
+	font-weight: 600;
+	color: #333;
+}
+
+fieldset legend + * {
+	clear: both;
+}
+
+body:not(:-moz-handler-blocked) fieldset {
+	display: table-cell;
+}
+
+/* TOGGLE STYLING */
+.toggle {
+	margin: 0 0 1.5rem;
+	box-sizing: border-box;
+	font-size: 0;
+	flex-flow: row nowrap;
+	justify-content: flex-start;
+	align-items: stretch;
+}
+
+.toggle input {
+	width: 0;
+	height: 0;
+	position: absolute;
+	left: -9999px;
+}
+
+.toggle input + label {
+	margin: 0;
+	padding: .75rem 2rem;
+	box-sizing: border-box;
+	position: relative;
+	display: inline-block;
+	border: solid 1px #DDD;
+	background-color: #FFF;
+	font-size: 14px;
+	line-height: 140%;
+	font-weight: 600;
+	text-align: center;
+	box-shadow: 0 0 0 rgba(255, 255, 255, 0);
+	transition: border-color .15s ease-out,  color .25s ease-out,  background-color .15s ease-out, box-shadow .15s ease-out;
+	cursor: pointer;
+}
+
+.toggle input + label:first-of-type {
+	border-radius: 6px 0 0 6px;
+	border-right: none;
+}
+
+.toggle input + label:last-of-type {
+	border-radius: 0 6px 6px 0;
+	border-left: none;
+}
+
+.toggle input:hover + label {
+	border-color: #213140;
+}
+
+.toggle input:checked + label {
+	background-color: #337ab7;
+	color: #FFF;
+	box-shadow: 0 0 10px rgba(102, 179, 251, 0.5);
+	border-color: #337ab7;
+	z-index: 1;
+}
+
+.toggle input:focus + label {
+	outline: dotted 1px #CCC;
+	outline-offset: .45rem;
+}
+
+@media (max-width: 800px) {
+	.toggle input + label {
+		padding: .75rem .25rem;
+		flex: 0 0 50%;
+		justify-content: center;
+		align-items: center;
+	}
+}
+
+/* STYLING FOR THE STATUS HELPER TEXT FOR THE DEMO */
+.status {
+	margin: 0;
+	font-size: 1rem;
+	font-weight: 400;
+}
+
+.status span {
+	font-weight: 600;
+	color: #B6985A;
+}
+
+.status span:first-of-type {
+	display: inline;
+}
+
+.status span:last-of-type {
+	display: none;
+}
+
+@media (max-width: 800px) {
+	.status span:first-of-type {
+		display: none;
+	}
+	.status span:last-of-type {
+		display: inline;
+	}
+}
+
+
+.buttonsSpacer {
+	display: inline-block;
+	width: 30px;
+}
diff --git a/public/css/messaging/messageReply.css b/public/css/messaging/messageReply.css
deleted file mode 100644
index 17f978ecc..000000000
--- a/public/css/messaging/messageReply.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.panel-heading {
-    font-size: 16px;
-}
-
-@media screen and (min-width: 1500px) {
-    #msgtable {
-        width: 70%;
-    }
-}
-
-#msgtable td {
-    border: none !important;
-}
-
-#replybutton {
-    width: 120px;
-}
diff --git a/public/css/messaging/messageSent.css b/public/css/messaging/messageSent.css
deleted file mode 100644
index 96403d797..000000000
--- a/public/css/messaging/messageSent.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.panel-heading {
-    font-size: 16px;
-}
-
-.signatureblock {
-    color: grey;
-}
-
-.signatureblocklink {
-    color: grey;
-}
-
-.signatureblocklink:hover {
-    color: #337ab7;
-}
-
-.rwd-line {
-    display: block;
-}
-
-@media screen and (min-width: 1831px) {
-    .rwd-line {
-        display: inline;
-    }
-}
diff --git a/public/css/messaging/messageWrite.css b/public/css/messaging/messageWrite.css
deleted file mode 100644
index 91b20729f..000000000
--- a/public/css/messaging/messageWrite.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/*smaller subject field*/
-input[type=text] {
-    height: 28px;
-    padding: 0;
-}
-
-.msgfield label {
-    margin-bottom: 0 !important;
-    margin-top: 3px;
-}
-
-@media screen and (min-width: 1200px) {
-    .col-lg-1.msgfieldcol-left {
-        width: 13%;
-    }
-
-    .col-lg-11.msgfieldcol-right {
-        width: 87%;
-    }
-}
-
-#sendButton {
-    width: 120px;
-}
\ No newline at end of file
diff --git a/public/js/DialogLib.js b/public/js/DialogLib.js
index f5d373604..f594ae67c 100644
--- a/public/js/DialogLib.js
+++ b/public/js/DialogLib.js
@@ -79,7 +79,7 @@ var FHC_DialogLib = {
 			buttons: [{
 				text: "Ok",
 				click: function() {
-					$(this).dialog("close");
+					$("#fhc-dialoglib-dialog").remove();
 				}
 			}]
 		});
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
index 0bcb88124..e881749e6 100644
--- a/public/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -284,10 +284,13 @@ var InfocenterDetails = {
 					{
 						var freigabeResponseData = FHC_AjaxClient.getData(data);
 
-						if (freigabeResponseData.nonCriticalErrors && freigabeResponseData.nonCriticalErrors.length > 0
-							&& typeof freigabeResponseData.nonCriticalErrors == "string")
+						if (freigabeResponseData.nonCriticalErrors && freigabeResponseData.nonCriticalErrors.length > 0)
 						{
-							FHC_DialogLib.alertWarning(freigabeResponseData.nonCriticalErrors);
+							FHC_DialogLib.alertWarning(freigabeResponseData.nonCriticalErrors.join(", "));
+						}
+						else if (freigabeResponseData.infoMessages && freigabeResponseData.infoMessages.length > 0)
+						{
+							FHC_DialogLib.alertInfo(freigabeResponseData.infoMessages.join(", "));
 						}
 						FHC_AjaxClient.showVeil();
 						InfocenterDetails.initFrgMessageSend(freigabeData);
@@ -680,7 +683,7 @@ var InfocenterDetails = {
 	sendFreigabeMessage: function(prestudentid, vorlage_kurzbz, msgvars)
 	{
 		FHC_AjaxClient.ajaxCallPost(
-			'system/Messages/sendJson',
+			'system/messages/Messages/sendExplicitTemplateJson',
 			{
 				"prestudents": prestudentid,
 				"vorlage_kurzbz": vorlage_kurzbz,
diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
index 2768f77b2..87a40c0f1 100644
--- a/public/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -26,7 +26,7 @@ var InfocenterPersonDataset = {
 	 */
 	appendTableActionsHtml: function(infocenter_studiensemester)
 	{
-		var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/Messages/write";
+		var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/messages/Messages/writeTemplate";
 
 		var formHtml = '<form id="sendMsgsForm" method="post" action="'+ url +'" target="_blank"></form>';
 		$("#datasetActionsTop").before(formHtml);
diff --git a/public/js/messaging/messageList.js b/public/js/infocenter/messageList.js
similarity index 97%
rename from public/js/messaging/messageList.js
rename to public/js/infocenter/messageList.js
index 85d5ad603..6146c7639 100644
--- a/public/js/messaging/messageList.js
+++ b/public/js/infocenter/messageList.js
@@ -54,7 +54,7 @@ var MessageList = {
 		var recid = id.substr(id.indexOf('_') + 1);
 
 		FHC_AjaxClient.ajaxCallGet(
-			'system/Messages/getMessageFromIds',
+			'system/messages/Messages/getMessageFromIds',
 			{
 				"msg_id": msgid,
 				"receiver_id": recid
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index 341a325fc..b8d6e888c 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -551,15 +551,18 @@ $(function() {
 			{
 				successCallback: function (data, textStatus, jqXHR)
 				{
-					if (data.error)
+					if (data.error && data.retval != null)
 					{
-						// Password not verified
+						// Print error message
 						FHC_DialogLib.alertWarning(data.retval);
 					}
+					
 					if (!data.error && data.retval != null)
 					{
 						// Update status 'Erteilt'
 						$('#tableWidgetTabulator').tabulator('updateData', data.retval);
+
+						// Print success message
 						FHC_DialogLib.alertSuccess(data.retval.length + " Lehraufträge wurden akzeptiert.");
 					}
 				},
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index 7326a95c1..3131bcfb3 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -645,9 +645,16 @@ $(function() {
                     {
                         // Update status 'Erteilt'
                         $('#tableWidgetTabulator').tabulator('updateData', data.retval);
+
+                        // Print success message
+                        FHC_DialogLib.alertSuccess(data.retval.length + " Lehraufträge wurden erteilt.");
                     }
 
-                    FHC_DialogLib.alertSuccess(data.retval.length + " Lehraufträge wurden erteilt.");
+                    if (data.error && data.retval != null)
+                    {
+                        // Print error message
+                        FHC_DialogLib.alertError(data.retval);
+                    }
                 },
                 errorCallback: function (jqXHR, textStatus, errorThrown)
                 {
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 379a02b6a..b7f5e7430 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -671,9 +671,16 @@ $(function() {
                     {
                         // Update status 'Bestellt'
                         $('#tableWidgetTabulator').tabulator('updateData', data.retval);
+
+                        // Print success message
+                        FHC_DialogLib.alertSuccess("Alle " + data.retval.length + " Lehraufträge wurden bestellt.")
                     }
 
-                    FHC_DialogLib.alertSuccess("Alle " + data.retval.length + " Lehraufträge wurden bestellt.")
+                   if (data.error && data.retval != null)
+                   {
+                       // Print error message
+                       FHC_DialogLib.alertError(data.retval);
+                   }
                 },
                 errorCallback: function (jqXHR, textStatus, errorThrown)
                 {
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 9894573ee..3a3a23792 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -1,6 +1,6 @@
-/**
- * JS used by view system/messages/messageWrite
- */
+// ********************************************************
+// JS used by view system/messages/htmlWriteTemplate
+// ********************************************************
 
 function tinymcePreviewSetContent()
 {
@@ -19,11 +19,12 @@ function tinymcePreviewSetContent()
 
 function parseMessageText(receiver_id, text)
 {
-	FHC_AjaxClient.ajaxCallGet(
-		"system/Messages/parseMessageText",
+	FHC_AjaxClient.ajaxCallPost(
+		"system/messages/Messages/parseMessageText",
 		{
-			person_id: receiver_id,
-			text: text
+			receiver_id: receiver_id,
+			text: text,
+			type: $("#type").val()
 		},
 		{
 			successCallback: function(data, textStatus, jqXHR) {
@@ -34,7 +35,7 @@ function parseMessageText(receiver_id, text)
 				}
 				else if (FHC_AjaxClient.isError(data))
 				{
-					alert(data.retval);
+					FHC_DialogLib.alertError(data.retval);
 				}
 			}
 		}
@@ -45,21 +46,16 @@ $(document).ready(function ()
 {
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
-		autoresize_min_height: 150,
-		autoresize_max_height: 600,
-		autoresize_bottom_margin: 10
+		plugins: "autoresize"
 	});
 
 	tinymce.init({
+		selector: "#tinymcePreview",
+		plugins: "autoresize",
 		menubar: false,
 		toolbar: false,
 		statusbar: false,
-		readonly: 1,
-		selector: "#tinymcePreview",
-		plugins: "autoresize",
-		autoresize_min_height: 150,
-		autoresize_bottom_margin: 10
+		readonly: 1
 	});
 
 	if ($("#variables"))
@@ -97,7 +93,7 @@ $(document).ready(function ()
 			}
 			else
 			{
-				alert("Subject and text are required fields!");
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
 			}
 		});
 	}
@@ -111,7 +107,7 @@ $(document).ready(function ()
 			if (vorlage_kurzbz != '')
 			{
 				FHC_AjaxClient.ajaxCallGet(
-					"system/Messages/getVorlage",
+					"system/messages/Messages/getVorlage",
 					{
 						vorlage_kurzbz: vorlage_kurzbz
 					},
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
index 6343701d7..c6401ded2 100644
--- a/public/js/messaging/messageWriteReply.js
+++ b/public/js/messaging/messageWriteReply.js
@@ -23,7 +23,7 @@ $(document).ready(function ()
 			}
 			else
 			{
-				alert("Subject and text are required fields!");
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
 			}
 		});
 	}
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
new file mode 100644
index 000000000..b4b1573a2
--- /dev/null
+++ b/public/js/messaging/read.js
@@ -0,0 +1,254 @@
+// ***********************************************************************
+// List all personal messages, used by view system/messages/ajaxRead
+// ***********************************************************************
+
+// Global variable that contains tha tabulator instance
+var tableMessageLst;
+var selectedToggleMessage = "received";
+
+/**
+ * Use DialogLib to display a Generic error
+ */
+function readMessagesGenericError()
+{
+	FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
+}
+
+/**
+ * Gets all the received messages
+ */
+function getReceivedMessages()
+{
+	tableMessageLst.hideColumn("to");
+	tableMessageLst.showColumn("from");
+
+	_getMessages(FHC_JS_DATA_STORAGE_OBJECT.called_path + "/listReceivedMessages");
+}
+
+/**
+ * Gets all the sent messages
+ */
+function getSentMessages()
+{
+	tableMessageLst.hideColumn("from");
+	tableMessageLst.showColumn("to");
+
+	_getMessages(FHC_JS_DATA_STORAGE_OBJECT.called_path + "/listSentMessages");
+}
+
+/**
+ * Change the TinyMCE content
+ */
+function changeTinyMCE(row)
+{
+	if (row == null)
+	{
+		tinyMCE.get("readMessagePanel").setContent('');
+	}
+	else
+	{
+		tinyMCE.get("readMessagePanel").setContent(row.getData().body);
+	}
+}
+
+/**
+ * Called on Tabulator row click event
+ * - If a clicked message is unread thes is set as read
+ * - Change the TinyMCE content with the clicked message body
+ */
+function rowClick(e, row)
+{
+	// If in received mode and the message is not unread
+	if (selectedToggleMessage == "received" && row.getData().status == "0")
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			FHC_JS_DATA_STORAGE_OBJECT.called_path + "/setMessageRead",
+			{
+				message_id: row.getData().message_id,
+				statusPersonId: row.getData().statusPersonId
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+
+					if (FHC_AjaxClient.isSuccess(data))
+					{
+						rowFormatter(row, "normal"); // format row
+						row.getData().status = "1"; // update status to read
+					}
+					else
+					{
+						readMessagesGenericError();
+					}
+				},
+				errorCallback: readMessagesGenericError,
+				veilTimeout: 300
+			}
+		);
+	}
+
+	// If NOT in send mode
+	if (selectedToggleMessage == "received")
+	{
+		$("#replyMessage").show();
+	}
+
+	changeTinyMCE(row); // Change TinyMCE content
+}
+
+/**
+ * Radio button click event to switch between received and sent messages
+ */
+function toggleMessages()
+{
+	if ($(this)[0].id == "received")
+	{
+		selectedToggleMessage = "received";
+		getReceivedMessages();
+	}
+	else
+	{
+		selectedToggleMessage = "send";
+		$("#replyMessage").hide();
+		getSentMessages();
+	}
+
+	changeTinyMCE(null); // clean tinymce
+	tableMessageLst.redraw(); // redraw table after its content is changed
+}
+
+/**
+ * Formats tabulator rows
+ */
+function rowFormatter(row, fontWeight = 700)
+{
+	if (row.getData().status == "0")
+	{
+		var cells = row.getElement().childNodes;
+
+		for (var i = 0; i < cells.length; i++)
+		{
+			cells[i].style.fontWeight = fontWeight;
+		}
+	}
+}
+
+/**
+ * Get received/sent messages and change tabulator content
+ */
+function _getMessages(getMessagesURL)
+{
+	tableMessageLst.replaceData(Array());
+
+	FHC_AjaxClient.ajaxCallGet(
+		getMessagesURL,
+		null,
+		{
+			successCallback: function(data, textStatus, jqXHR) {
+
+				if (FHC_AjaxClient.hasData(data))
+				{
+					var messages = null;
+
+					try
+					{
+						messages = JSON.parse(FHC_AjaxClient.getData(data));
+					}
+					catch (syntaxError) {}
+
+					if ($.isArray(messages))
+					{
+						try
+						{
+							tableMessageLst.replaceData(messages);
+						}
+						catch (syntaxError)
+						{
+							readMessagesGenericError();
+						}
+					}
+				}
+			},
+			errorCallback: readMessagesGenericError,
+			veilTimeout: 300
+		}
+	);
+}
+
+/**
+ * Open new tab/window to write a new message
+ */
+function writeNewMessage()
+{
+	window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+		FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/" +
+		FHC_JS_DATA_STORAGE_OBJECT.called_path +
+		"/write";
+}
+
+/**
+ * Open new tab/window to reply to a received message
+ */
+function replyMessage()
+{
+	var selectedMessages = tableMessageLst.getSelectedData();
+
+	if ($.isArray(selectedMessages))
+	{
+		var selectedMessage = selectedMessages[0];
+
+		window.open("writeReply?token=" + selectedMessage.token, "_blank");
+	}
+	else //
+	{
+		FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "pleaseSelectMessage"));
+	}
+}
+
+/**
+ * Start me up!
+ */
+$(document).ready(function () {
+
+	$("#replyMessage").hide();
+
+	// TinyMCE initialization
+	tinymce.init({
+		selector: "#readMessagePanel",
+		plugins: "autoresize",
+		menubar: false,
+		toolbar: false,
+		statusbar: false,
+		readonly: 1,
+		autoresize_min_height: 300,
+		autoresize_bottom_margin: 0
+	});
+
+	// Tabulator initialization
+	tableMessageLst = new Tabulator("#lstMessagesPanel", {
+		height: "270px",
+		layout: "fitColumns",
+		selectable: 1,
+		layoutColumnsOnNewData: true,
+		columns: [
+			{title: "Subject", field: "subject", responsive: 0},
+			{title: "From", field: "from", visible: false},
+			{title: "To", field: "to", visible: false},
+			{title: "Date", field: "sent", sorter: "datetime"}
+		],
+		rowClick: rowClick,
+		rowFormatter: rowFormatter
+	});
+
+	// Bind radio buttons click event with toggleMessages function
+	$("#toggleMessages input").click(toggleMessages);
+
+	// Bind write a new message button
+	$("#writeMessage").click(writeNewMessage);
+
+	// Bind reply to a message button
+	$("#replyMessage").click(replyMessage);
+
+	// First retrieve the received message and populate the tabulator
+	getReceivedMessages();
+
+});
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
new file mode 100644
index 000000000..e34c98923
--- /dev/null
+++ b/public/js/messaging/write.js
@@ -0,0 +1,63 @@
+// ****************************************************************************************
+// Write a message to an organisation unit, used by view system/messages/ajaxWrite
+// ****************************************************************************************
+
+/**
+ *
+ */
+function sendMessageToOU()
+{
+	if ($('#organisationUnit').val() == 0)
+	{
+		FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("global", "notValidOE"));
+	}
+	else
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			FHC_JS_DATA_STORAGE_OBJECT.called_path + '/sendMessageToOU',
+			{
+				receiverOU: $('#organisationUnit').val(),
+				subject: $('#subject').val(),
+				body: tinyMCE.get("body").getContent()
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+
+					if (FHC_AjaxClient.isSuccess(data))
+					{
+						window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/" +
+							FHC_JS_DATA_STORAGE_OBJECT.called_path +
+							"/read";
+					}
+					else
+					{
+						FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
+					}
+				},
+				errorCallback: function() {
+					FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
+				},
+				veilTimeout: 300
+			}
+		);
+	}
+}
+
+/**
+ *
+ */
+$(document).ready(function () {
+
+	//
+	tinymce.init({
+		selector: "#body",
+		plugins: "autoresize",
+		autoresize_min_height: 150,
+		autoresize_max_height: 600,
+		autoresize_bottom_margin: 10
+	});
+
+	$('#sendButton').click(sendMessageToOU);
+
+});
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
new file mode 100644
index 000000000..c78748889
--- /dev/null
+++ b/public/js/messaging/writeReply.js
@@ -0,0 +1,48 @@
+// ****************************************************************************************
+// Write a reply to a received message, used by view system/messages/ajaxWriteReply
+// ****************************************************************************************
+
+/**
+ *
+ */
+function sendReply()
+{
+	FHC_AjaxClient.ajaxCallPost(
+		FHC_JS_DATA_STORAGE_OBJECT.called_path + '/sendMessageReply',
+		{
+			receiver_id: $('#receiver_id').val(),
+			relationmessage_id: $('#relationmessage_id').val(),
+			token: $('#token').val(),
+			subject: $('#subject').val(),
+			body: tinyMCE.get("body").getContent()
+		},
+		{
+			successCallback: function(data, textStatus, jqXHR) {
+
+				FHC_DialogLib.alertSuccess("Message sent succesfully");
+			},
+			errorCallback: function() {
+				FHC_DialogLib.alertError("Error");
+			},
+			veilTimeout: 300
+		}
+	);
+}
+
+/**
+ *
+ */
+$(document).ready(function () {
+
+	//
+	tinymce.init({
+		selector: "#body",
+		plugins: "autoresize",
+		autoresize_min_height: 150,
+		autoresize_max_height: 600,
+		autoresize_bottom_margin: 10
+	});
+
+	$('#sendButton').click(sendReply);
+
+});
diff --git a/rdf/aufnahmetermine.rdf.php b/rdf/aufnahmetermine.rdf.php
index 50941d7e4..a135eac84 100644
--- a/rdf/aufnahmetermine.rdf.php
+++ b/rdf/aufnahmetermine.rdf.php
@@ -113,11 +113,11 @@ if($prestudent_id!='')
 		// * Endpunkte über alle Basisgebiete
 		if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
 		{
-			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, true, $row->reihungstest_id, false, $row->studiengang_kz);
+			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, true, $row->reihungstest_id, false, $row->studiengang_kz, $studiengang_kz);
 		}
 		else
 		{
-			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, false, $row->reihungstest_id, false, $row->studiengang_kz);
+			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, false, $row->reihungstest_id, false, $row->studiengang_kz, $studiengang_kz);
 		}
 
 		// * ggf. Endpunkte exklusive bestimmter Gebiete, die in der config-Datei gesetzt sind
@@ -125,11 +125,11 @@ if($prestudent_id!='')
 		{
 			if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
 			{
-				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, true, $row->reihungstest_id, true, $row->studiengang_kz);
+				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, true, $row->reihungstest_id, true, $row->studiengang_kz, $studiengang_kz);
 			}
 			else
 			{
-				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, false, $row->reihungstest_id, true, $row->studiengang_kz);
+				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($row->person_id, false, $row->reihungstest_id, true, $row->studiengang_kz, $studiengang_kz);
 			}
 		}
 
@@ -174,22 +174,22 @@ elseif($rt_person_id!='')
 		// * Endpunkte über alle Basisgebiete
 		if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
 		{
-			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, true, $reihungstest->reihungstest_id, false, $studiengang_kz);
+			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, true, $reihungstest->reihungstest_id, false, $studiengang_kz, $studiengang_kz);
 		}
 		else
 		{
-			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, false, $reihungstest->reihungstest_id, false, $studiengang_kz);
+			$endpunkte_inkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, false, $reihungstest->reihungstest_id, false, $studiengang_kz, $studiengang_kz);
 		}
 		// * ggf. Endpunkte exklusive bestimmter Gebiete, die in der config-Datei gesetzt sind
 		if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
 		{
 			if(defined('FAS_REIHUNGSTEST_PUNKTE') && FAS_REIHUNGSTEST_PUNKTE)
 			{
-				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, true, $reihungstest->reihungstest_id, true, $studiengang_kz);
+				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, true, $reihungstest->reihungstest_id, true, $studiengang_kz, $studiengang_kz);
 			}
 			else
 			{
-				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, false, $reihungstest->reihungstest_id, true, $studiengang_kz);
+				$endpunkte_exkl_gebiete = $pruefling->getReihungstestErgebnisPerson($reihungstest->person_id, false, $reihungstest->reihungstest_id, true, $studiengang_kz, $studiengang_kz);
 			}
 		}
 
@@ -244,6 +244,7 @@ function drawrow($row)
 	$oRdf->obj[$i]->setAttribut('stufe',$reihungstest_obj->stufe,true);
 	$oRdf->obj[$i]->setAttribut('studienplan_id',$row->studienplan_id,true);
 	$oRdf->obj[$i]->setAttribut('studienplan_bezeichnung',$studienplan->bezeichnung,true);
+	$oRdf->obj[$i]->setAttribut('studienplan_studiengang_kz',$stpl_stg->studiengang_kz,true);
 	$oRdf->obj[$i]->setAttribut('studienplan_studiengang',$stpl_stg->kuerzel,true);
 	$oRdf->obj[$i]->setAttribut('studiensemester',$reihungstest_obj->studiensemester_kurzbz,true);
 	$oRdf->obj[$i]->setAttribut('datum',$datum_obj->formatDatum($reihungstest_obj->datum,'d.m.Y'),true);
diff --git a/rdf/geschlecht.rdf.php b/rdf/geschlecht.rdf.php
new file mode 100644
index 000000000..1cdc963ac
--- /dev/null
+++ b/rdf/geschlecht.rdf.php
@@ -0,0 +1,40 @@
+<?php
+/* Copyright (C) 2019 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 Österreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/rdf.class.php');
+require_once('../include/basis_db.class.php');
+require_once('../include/geschlecht.class.php');
+
+$oRdf = new rdf('GESCHLECHT','http://www.technikum-wien.at/geschlecht');
+$oRdf->sendHeader();
+
+$geschlecht = new geschlecht();
+$geschlecht->getAll();
+
+foreach($geschlecht->result as $row)
+{
+	$i=$oRdf->newObjekt($row->geschlecht);
+	$oRdf->obj[$i]->setAttribut('geschlecht', $row->geschlecht,true);
+	$oRdf->obj[$i]->setAttribut('bezeichnung', $row->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE],true);
+
+	$oRdf->addSequence($row->geschlecht);
+}
+$oRdf->sendRdfText();
+?>
diff --git a/rdf/lehrauftrag.xml.php b/rdf/lehrauftrag.xml.php
index 5b47c70a9..8d65f0a38 100644
--- a/rdf/lehrauftrag.xml.php
+++ b/rdf/lehrauftrag.xml.php
@@ -338,7 +338,7 @@ function drawLehrauftrag($uid)
 			$stunden = $row->semesterstunden;
 			$satz = $row->stundensatz;
 			$faktor = $row->faktor;
-			$brutto = $row->semesterstunden * $row->stundensatz * $row->faktor;
+			$brutto = $row->semesterstunden * $row->stundensatz;
 			$last_le = $row->lehreinheit_id;
 		}
 		array_unique($gruppen);
@@ -404,7 +404,7 @@ function drawLehrauftrag($uid)
 			$stg->load($row->studiengang_kz);
 			$stg_kuerzel = $stg->kuerzel;
 
-			$brutto = $row->stunden * $row->stundensatz * $row->faktor;
+			$brutto = $row->stunden * $row->stundensatz;
 			if ($row->stunden != 0)
 			{
 				switch ($row->projekttyp_kurzbz)
@@ -444,7 +444,7 @@ function drawLehrauftrag($uid)
 				<lehrveranstaltung><![CDATA['.$lv_row['lehrveranstaltung'].']]></lehrveranstaltung>
 				<fachbereich><![CDATA['.$lv_row['fachbereich'].']]></fachbereich>
 				<gruppe><![CDATA['.$lv_row['gruppe'].']]></gruppe>
-                <gruppen_getrennt>'. $lv_row['einzelgruppe']. '</gruppen_getrennt> <!-- Variable enthält CDATA tags-->
+				<gruppen_getrennt>'. $lv_row['einzelgruppe']. '</gruppen_getrennt> <!-- Variable enthält CDATA tags-->
 				<stunden><![CDATA['.$lv_row['stunden'].']]></stunden>
 				<satz><![CDATA['.$lv_row['satz'].']]></satz>
 				<faktor><![CDATA['.$lv_row['faktor'].']]></faktor>
diff --git a/rdf/prestudenthistorie.rdf.php b/rdf/prestudenthistorie.rdf.php
new file mode 100644
index 000000000..110e1a4e7
--- /dev/null
+++ b/rdf/prestudenthistorie.rdf.php
@@ -0,0 +1,166 @@
+<?php
+/* Copyright (C) 2006 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: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+// header für no cache
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+// content type setzen
+header("Content-type: application/xhtml+xml");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/person.class.php');
+require_once('../include/prestudent.class.php');
+require_once('../include/datum.class.php');
+require_once('../include/statusgrund.class.php');
+require_once('../include/studiengang.class.php');
+
+$rdf_url='http://www.technikum-wien.at/prestudenthistorie';
+$datum = new datum();
+
+echo '
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:ROLLE="'.$rdf_url.'/rdf#"
+>
+
+  <RDF:Seq about="'.$rdf_url.'/liste">
+';
+
+if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
+	$prestudent_id = $_GET['prestudent_id'];
+else
+	die('Prestudent_id muss angegeben werden');
+
+$studiengang = new studiengang();
+$studiengang->getAll('typ, kurzbz', false);
+
+if (!$db = new basis_db())
+	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+$prestudent = new prestudent($prestudent_id);
+$prestudent->getLastStatus($prestudent_id);
+$prestudentGET_studiengang = $prestudent->studiengang_kz;
+$prestudentGET_orgform_kurzbz = $prestudent->orgform_kurzbz;
+$prestudent->getPrestudenten($prestudent->person_id);
+
+foreach ($prestudent->result as $row)
+{
+	$prestudentLastStatus = new prestudent();
+	$prestudentLastStatus->getLastStatus($row->prestudent_id);
+	$row->studiensemester_kurzbz = $prestudentLastStatus->studiensemester_kurzbz;
+	$row->ausbildungssemester = $prestudentLastStatus->ausbildungssemester;
+	$row->datum = $prestudentLastStatus->datum;
+	$row->orgform_kurzbz = $prestudentLastStatus->orgform_kurzbz;
+	$row->studienplan_bezeichnung = $prestudentLastStatus->studienplan_bezeichnung;
+	$row->status_kurzbz = $prestudentLastStatus->status_kurzbz;
+	if ($prestudentLastStatus->statusgrund_id != '')
+	{
+		$statusgrund = new statusgrund($prestudentLastStatus->statusgrund_id);
+		$row->statusgrund = $statusgrund->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
+	}
+	else
+	{
+		$row->statusgrund = '';
+	}
+}
+
+// Sortiert PreStudenten nach Studiensemester
+function sortPrestudents($a, $b)
+{
+	$c = substr($b->studiensemester_kurzbz, 2) - substr($a->studiensemester_kurzbz, 2);
+	$c .= strcmp(substr($b->studiensemester_kurzbz, 0, 2), substr($a->studiensemester_kurzbz, 0, 2));
+	$c .= $a->priorisierung - $b->priorisierung;
+	return $c;
+}
+
+usort($prestudent->result, "sortPrestudents");
+
+$studiensemester_kurzbz = '';
+$stdsem = '';
+
+foreach ($prestudent->result as $row)
+{
+	// Allfällige Studentendaten laden
+	$uid = '';
+	$gruppe = '';
+	$status = '';
+	$aktiv = 'true';
+	$bold = '';
+	if ($row->status_kurzbz == 'Abgewiesener' || $row->status_kurzbz == 'Abbrecher' || $row->status_kurzbz == 'Absolvent' )
+	{
+		$aktiv = 'false';
+	}
+	$qry ="SELECT * FROM public.tbl_student WHERE prestudent_id='$row->prestudent_id'";
+	if($result = $db->db_query($qry))
+	{
+		if($db->db_num_rows($result)>1)
+		{
+			$uid  ='ACHTUNG: Mehrere Studenteneinträge vorhanden!';
+		}
+		else
+		{
+			if($row_std = $db->db_fetch_object($result))
+			{
+				$uid = $row_std->student_uid;
+				$gruppe = $row_std->semester.$row_std->verband.$row_std->gruppe;
+			}
+		}
+	}
+
+	$status = $row->status_kurzbz;
+	if ($row->ausbildungssemester != '')
+	{
+		$status .= ' ('.$row->ausbildungssemester.'. Semester)';
+	}
+	if ($row->statusgrund != '')
+	{
+		$status .= ' - '.$row->statusgrund;
+	}
+	if ($row->studiengang_kz == $prestudentGET_studiengang && $row->orgform_kurzbz == $prestudentGET_orgform_kurzbz)
+	{
+		$bold = 'bold';
+	}
+	echo '
+		<RDF:li>
+			<RDF:Description id="'.$row->prestudent_id.'" about="'.$rdf_url.'/'.$row->prestudent_id.'" >
+				<ROLLE:prestudent_id><![CDATA['.$row->prestudent_id.']]></ROLLE:prestudent_id>
+				<ROLLE:studiensemester_kurzbz><![CDATA['.$row->studiensemester_kurzbz.']]></ROLLE:studiensemester_kurzbz>
+				<ROLLE:prioritaet><![CDATA['.$row->priorisierung.']]></ROLLE:prioritaet>
+				<ROLLE:studiengang><![CDATA['.$studiengang->kuerzel_arr[$row->studiengang_kz].']]></ROLLE:studiengang>
+				<ROLLE:orgform_kurzbz><![CDATA['.$row->orgform_kurzbz.']]></ROLLE:orgform_kurzbz>
+				<ROLLE:studienplan_bezeichnung><![CDATA['.$row->studienplan_bezeichnung.']]></ROLLE:studienplan_bezeichnung>
+				<ROLLE:reihung_absolviert><![CDATA[???]]></ROLLE:reihung_absolviert>
+				<ROLLE:uid><![CDATA['.$uid.']]></ROLLE:uid>
+				<ROLLE:status><![CDATA['.$status.']]></ROLLE:status>
+				<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
+				<ROLLE:bold><![CDATA['.$bold.']]></ROLLE:bold>
+			</RDF:Description>
+		</RDF:li>
+	';
+
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 5d2e3dd0c..3c0492338 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -180,6 +180,7 @@ function draw_content_liste($row)
 			<STUDENT:status_bestaetigung><![CDATA['.($prestudent->bestaetigtam!=''?$datum_obj->formatDatum($prestudent->bestaetigtam,'d.m.Y'):'-').']]></STUDENT:status_bestaetigung>
 			<STUDENT:status_datum_iso><![CDATA['.$datum_obj->formatDatum($prestudent->datum,'Y-m-d').']]></STUDENT:status_datum_iso>
 			<STUDENT:status_bestaetigung_iso><![CDATA['.($prestudent->bestaetigtam!=''?$datum_obj->formatDatum($prestudent->bestaetigtam,'Y-m-d'):'-').']]></STUDENT:status_bestaetigung_iso>
+			<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
 
 			<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
 			<STUDENT:anmerkungpre>'.($row->anmerkung==''?'&#xA0;':'<![CDATA['.$row->anmerkung.']]>').'</STUDENT:anmerkungpre>
@@ -222,10 +223,10 @@ function draw_content($row)
 	{
 		switch($row->bnaktiv)
 		{
-			case "t":
+			case true:
 				$aktiv = "true";
 				break;
-			case "f":
+			case false:
 				$aktiv = "false";
 				break;
 			default:
@@ -294,6 +295,8 @@ function draw_content($row)
 			<STUDENT:studienplan_id><![CDATA['.$prestudent->studienplan_id.']]></STUDENT:studienplan_id>
 			<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
 			<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
+			<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
+			<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.$mail_privat.']]></STUDENT:link_bewerbungstool>
 
 			<STUDENT:aktiv><![CDATA['.$aktiv.']]></STUDENT:aktiv>
 			<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
@@ -475,7 +478,7 @@ if($xmlformat=='rdf')
 			AS email_privat,
 			(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte,
 			 tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, tbl_prestudent.anmeldungreihungstest, p.matr_nr,
-			 tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung
+			 tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung, p.zugangscode
 		FROM
 			public.tbl_student
 			JOIN public.tbl_benutzer ON (student_uid=uid)
diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
index 163b2749a..7756901f5 100644
--- a/rdf/studienblatt.xml.php
+++ b/rdf/studienblatt.xml.php
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- *          Karl Burkhart <burkhart@technikum-wien.at>
- *          Manfred Kindl <kindlm@technikum-wien.at>
+ *		  Karl Burkhart <burkhart@technikum-wien.at>
+ *		  Manfred Kindl <kindlm@technikum-wien.at>
  */
 header("Content-type: application/xhtml+xml");
 require_once('../config/vilesci.config.inc.php');
@@ -36,6 +36,7 @@ require_once('../include/mitarbeiter.class.php');
 require_once('../include/organisationsform.class.php');
 require_once('../include/zgv.class.php');
 require_once('../include/konto.class.php');
+require_once('../include/geschlecht.class.php');
 
 $uid_arr = (isset($_REQUEST['uid'])?$_REQUEST['uid']:null);
 $studiensemester = (isset($_REQUEST['ss'])?$_REQUEST['ss']:null);
@@ -52,33 +53,33 @@ $student_help = new student();
 // an 2ter stelle da im Aufruf vom FAS ;<uid>; der erste immer '' ist
 if($student_help->load($uid))
 {
-    $studiengang = new studiengang();
-    $studiengang->load($student_help->studiengang_kz);
+	$studiengang = new studiengang();
+	$studiengang->load($student_help->studiengang_kz);
 	switch($studiengang->typ)
-    {
-        case 'b':
-            $studTyp = 'Bachelor';
-            $titel_kurzbz = 'BSc';
-            break;
-        case 'm':
-            $studTyp = 'Master';
-            $titel_kurzbz ='MSc';
-            break;
-        case 'd':
-            $studTyp = 'Diplom';
-            break;
-        case 'l':
-            $studTyp = 'Lehrgang';
-            break;
-        case 'k':
-            $studTyp = 'Kurzstudium';
-            break;
-        default:
-            $studTyp ='';
-            $titel_kurzbz = '';
-    }
-    echo "\t<studiengang_typ>".$studTyp."</studiengang_typ>\n";
-    echo "\t<studiengang><![CDATA[".$studiengang->bezeichnung."]]></studiengang>\n";
+	{
+		case 'b':
+			$studTyp = 'Bachelor';
+			$titel_kurzbz = 'BSc';
+			break;
+		case 'm':
+			$studTyp = 'Master';
+			$titel_kurzbz ='MSc';
+			break;
+		case 'd':
+			$studTyp = 'Diplom';
+			break;
+		case 'l':
+			$studTyp = 'Lehrgang';
+			break;
+		case 'k':
+			$studTyp = 'Kurzstudium';
+			break;
+		default:
+			$studTyp ='';
+			$titel_kurzbz = '';
+	}
+	echo "\t<studiengang_typ>".$studTyp."</studiengang_typ>\n";
+	echo "\t<studiengang><![CDATA[".$studiengang->bezeichnung."]]></studiengang>\n";
 }
 
 foreach($uid_arr as $uid)
@@ -105,152 +106,150 @@ foreach($uid_arr as $uid)
 			$staatsbuergerschaft->load($student->staatsbuergerschaft);
 
 
-            $svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
+			$svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
 
-			switch($student->geschlecht)
-            {
-                case 'm':
-                    $geschlecht = 'Männlich';
-                    break;
-                case 'w':
-                    $geschlecht = 'Weiblich';
-                    break;
-                case 'u':
-                    $geschlecht = 'Unbekannt';
-                    break;
-                default:
-                    $geschlecht ='';
-            }
+			$geschlecht_obj = new geschlecht();
+			$geschlecht_obj->load($student->geschlecht);
 
-            //Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
-            if ($studienordnung->studiengang_kz<0)
-            {
-            	$stg = new studiengang();
-            	$stg->load($studienordnung->studiengang_kz);
+			$geschlecht = $geschlecht_obj->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE];
+			$geschlecht_englisch = $geschlecht_obj->bezeichnung_mehrsprachig_arr['English'];
 
-            	$studiengang_kz = sprintf("%03s", $stg->erhalter_kz).sprintf("%04s", abs($studienordnung->studiengang_kz));
-            }
-            else
-            	$studiengang_kz = sprintf("%04s", abs($studienordnung->studiengang_kz));
+			//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
+			if ($studienordnung->studiengang_kz<0)
+			{
+				$stg = new studiengang();
+				$stg->load($studienordnung->studiengang_kz);
+
+				$studiengang_kz = sprintf("%03s", $stg->erhalter_kz).sprintf("%04s", abs($studienordnung->studiengang_kz));
+			}
+			else
+				$studiengang_kz = sprintf("%04s", abs($studienordnung->studiengang_kz));
+
+			$sprache_obj = new sprache();
+			$sprache_obj->load($studienplan->sprache);
+			$studienplan_sprache = $sprache_obj->bezeichnung_arr[DEFAULT_LANGUAGE];
+			$studienplan_sprache_englisch = $sprache_obj->bezeichnung_arr['English'];
 
 			echo "\t\t<quote>1</quote>\n";
-			echo "\t\t<personenkz>".$uid."</personenkz>\n";
-			echo "\t\t<geschlecht>".$geschlecht."</geschlecht>\n";
+			echo "\t\t<personenkz><![CDATA[".$uid."]]></personenkz>\n";
+			echo "\t\t<geschlecht><![CDATA[".$geschlecht."]]></geschlecht>\n";
+			echo "\t\t<geschlecht_englisch><![CDATA[".$geschlecht_englisch."]]></geschlecht_englisch>\n";
 			echo "\t\t<anrede><![CDATA[".$student->anrede."]]></anrede>\n";
 			echo "\t\t<vorname><![CDATA[".$student->vorname." ".$student->vornamen."]]></vorname>\n";
 			echo "\t\t<vornamen><![CDATA[".$student->vornamen."]]></vornamen>\n";
 			echo "\t\t<nachname><![CDATA[".$student->nachname."]]></nachname>\n";
 			echo "\t\t<titelpre><![CDATA[".$student->titelpre."]]></titelpre>\n";
 			echo "\t\t<titelpost><![CDATA[".$student->titelpost."]]></titelpost>\n";
-			echo "\t\t<gebdatum>".$gebdatum."</gebdatum>\n";
+			echo "\t\t<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>\n";
 			echo "\t\t<gebort><![CDATA[".$student->gebort."]]></gebort>\n";
 			echo "\t\t<staatsbuergerschaft><![CDATA[".$staatsbuergerschaft->langtext."]]></staatsbuergerschaft>\n";
-			echo "\t\t<svnr>".$svnr."</svnr>\n";
-			echo "\t\t<matr_nr>".trim($student->matr_nr)."</matr_nr>\n";
-			echo "\t\t<matrikelnr>".trim($student->matrikelnr)."</matrikelnr>\n";
+			echo "\t\t<svnr><![CDATA[".$svnr."]]></svnr>\n";
+			echo "\t\t<matr_nr><![CDATA[".trim($student->matr_nr)."]]></matr_nr>\n";
+			echo "\t\t<matrikelnr><![CDATA[".trim($student->matrikelnr)."]]></matrikelnr>\n";
 			echo "\t\t<studiengang><![CDATA[".$studienordnung->studiengangbezeichnung."]]></studiengang>\n";
 			echo "\t\t<studiengang_englisch><![CDATA[".$studienordnung->studiengangbezeichnung_englisch."]]></studiengang_englisch>\n";
-            echo "\t\t<studiengang_kurzbz><![CDATA[".$studienordnung->studiengangkurzbzlang."]]></studiengang_kurzbz>\n";
+			echo "\t\t<studiengang_kurzbz><![CDATA[".$studienordnung->studiengangkurzbzlang."]]></studiengang_kurzbz>\n";
 			echo "\t\t<studiengang_kz><![CDATA[".$studiengang_kz."]]></studiengang_kz>\n";
-            echo "\t\t<studiengangSprache><![CDATA[".$studienplan->sprache."]]></studiengangSprache>";
-            echo "\t\t<ects_gesamt>".$studienordnung->ects."</ects_gesamt>";
-            echo "\t\t<ects_pro_semester>".($studienplan->regelstudiendauer!=0?$studienordnung->ects/$studienplan->regelstudiendauer:0)."</ects_pro_semester>";
+			echo "\t\t<studiengangSprache><![CDATA[".$studienplan_sprache."]]></studiengangSprache>";
+			echo "\t\t<studiengangSpracheEnglisch><![CDATA[".$studienplan_sprache_englisch."]]></studiengangSpracheEnglisch>";
+			echo "\t\t<ects_gesamt><![CDATA[".$studienordnung->ects."]]></ects_gesamt>";
+			echo "\t\t<ects_pro_semester><![CDATA[".($studienplan->regelstudiendauer!=0?$studienordnung->ects/$studienplan->regelstudiendauer:0)."]]></ects_pro_semester>";
 
-            echo "\t\t<aktuellesJahr>".date('Y')."</aktuellesJahr>";
+			echo "\t\t<aktuellesJahr><![CDATA[".date('Y')."]]></aktuellesJahr>";
 
-            echo "\t\t<ausbildungssemester_aktuell>".$prestudent->ausbildungssemester."</ausbildungssemester_aktuell>";
+			echo "\t\t<ausbildungssemester_aktuell><![CDATA[".$prestudent->ausbildungssemester."]]></ausbildungssemester_aktuell>";
 
-            $studiensemester_aktuell = new studiensemester();
-            $studiensemester_aktuell->load($studiensemester);
+			$studiensemester_aktuell = new studiensemester();
+			$studiensemester_aktuell->load($studiensemester);
 
-            echo "\t\t<studiensemester_aktuell><![CDATA[".$studiensemester_aktuell->bezeichnung."]]></studiensemester_aktuell>";
+			echo "\t\t<studiensemester_aktuell><![CDATA[".$studiensemester_aktuell->bezeichnung."]]></studiensemester_aktuell>";
 
 			// check ob Oeh-Beitrag bezahlt wurde
 			$oehbeitrag = $konto->getOehBeitragGesamt($uid, $studiensemester_aktuell->studiensemester_kurzbz);
-			echo "\t\t<oehbeitrag>".str_replace('.', ',', $oehbeitrag)."</oehbeitrag>";
+			echo "\t\t<oehbeitrag><![CDATA[".str_replace('.', ',', $oehbeitrag)."]]></oehbeitrag>";
 
-            // check ob Quereinsteiger
-            $ausbildungssemester = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->ausbildungssemester:'';
-            echo "\t\t<semesterStudent>".$ausbildungssemester."</semesterStudent>";
+			// check ob Quereinsteiger
+			$ausbildungssemester = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->ausbildungssemester:'';
+			echo "\t\t<semesterStudent><![CDATA[".$ausbildungssemester."]]></semesterStudent>";
 
-            $studiensemester_beginn = new studiensemester();
-            $studienbeginn = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->studiensemester_kurzbz:'';
-            $studiensemester_beginn->load($studienbeginn);
+			$studiensemester_beginn = new studiensemester();
+			$studienbeginn = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->studiensemester_kurzbz:'';
+			$studiensemester_beginn->load($studienbeginn);
 
-            echo "\t\t<studiensemester_beginn>".$studiensemester_beginn->bezeichnung."</studiensemester_beginn>";
-            echo "\t\t<studiensemester_beginndatum>".date('d.m.Y',strtotime($studiensemester_beginn->start))."</studiensemester_beginndatum>";
+			echo "\t\t<studiensemester_beginn><![CDATA[".$studiensemester_beginn->bezeichnung."]]></studiensemester_beginn>";
+			echo "\t\t<studiensemester_beginndatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_beginn->start))."]]></studiensemester_beginndatum>";
 
-            $prestudent->getLastStatus($student->prestudent_id,$studiensemester);
-            $studiensemester_abschluss = new studiensemester();
-            $abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
-            $studiensemester_abschluss->load($abschluss);
-            echo "\t\t<voraussichtlichLetztesStudiensemester>".$studiensemester_abschluss->bezeichnung."</voraussichtlichLetztesStudiensemester>";
-            echo "\t\t<voraussichtlichLetztesStudiensemester_datum>".date('d.m.Y',strtotime($studiensemester_abschluss->ende))."</voraussichtlichLetztesStudiensemester_datum>";
+			$prestudent->getLastStatus($student->prestudent_id,$studiensemester);
+			$studiensemester_abschluss = new studiensemester();
+			$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
+			$studiensemester_abschluss->load($abschluss);
+			echo "\t\t<voraussichtlichLetztesStudiensemester><![CDATA[".$studiensemester_abschluss->bezeichnung."]]></voraussichtlichLetztesStudiensemester>";
+			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".date('d.m.Y',strtotime($studiensemester_abschluss->ende))."]]></voraussichtlichLetztesStudiensemester_datum>";
 
-            $studiensemester_endedatum = new studiensemester();
-            $studiensemester_endedatum->load($studiensemester_endedatum->getaktorNext(1));
+			$studiensemester_endedatum = new studiensemester();
+			$studiensemester_endedatum->load($studiensemester_endedatum->getaktorNext(1));
 
-            echo "\t\t<studiensemester_endedatum>".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."</studiensemester_endedatum>";
+			echo "\t\t<studiensemester_endedatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."]]></studiensemester_endedatum>";
 
-            $status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
+			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
 
 			switch($status_aktuell)
-            {
-                case 'Student':
-                    $studierendenstatus_aktuell = 'Aktive/r StudentIn';
-                    break;
-                case 'Unterbrecher':
-                    $studierendenstatus_aktuell = 'UnterbrecherIn';
-                    break;
-                case 'Absolvent':
-                    $studierendenstatus_aktuell = 'AbsolventIn';
-                    break;
-                case 'Diplomand':
-                    $studierendenstatus_aktuell = 'DiplomandIn';
-                    break;
-                case 'Abbrecher':
-                    $studierendenstatus_aktuell = 'AbbrecherIn';
-                    break;
-                default:
-                    $studierendenstatus_aktuell ='';
-            }
+			{
+				case 'Student':
+					$studierendenstatus_aktuell = 'Aktive/r StudentIn';
+					break;
+				case 'Unterbrecher':
+					$studierendenstatus_aktuell = 'UnterbrecherIn';
+					break;
+				case 'Absolvent':
+					$studierendenstatus_aktuell = 'AbsolventIn';
+					break;
+				case 'Diplomand':
+					$studierendenstatus_aktuell = 'DiplomandIn';
+					break;
+				case 'Abbrecher':
+					$studierendenstatus_aktuell = 'AbbrecherIn';
+					break;
+				default:
+					$studierendenstatus_aktuell ='';
+			}
 
-            echo "\t\t<studierendenstatus_aktuell>".$studierendenstatus_aktuell."</studierendenstatus_aktuell>\n";
-	    echo "\t\t<datum_reifepruefung>".$prestudent->zgvdatum."</datum_reifepruefung>\n";
-	    $zgv = new zgv($prestudent->zgv_code);
-	    echo "\t\t<schulform_zgv><![CDATA[".$zgv->zgv_kurzbz."]]></schulform_zgv>\n";
-	    echo "\t\t<studienplan_bezeichnung><![CDATA[".$studienplan->bezeichnung."]]></studienplan_bezeichnung>\n";
-	    echo "\t\t<anmerkungpre><![CDATA[$prestudent->anmerkung]]></anmerkungpre>\n";
+			echo "\t\t<studierendenstatus_aktuell><![CDATA[".$studierendenstatus_aktuell."]]></studierendenstatus_aktuell>\n";
+		echo "\t\t<datum_reifepruefung><![CDATA[".$prestudent->zgvdatum."]]></datum_reifepruefung>\n";
+		$zgv = new zgv($prestudent->zgv_code);
+		echo "\t\t<schulform_zgv><![CDATA[".$zgv->zgv_kurzbz."]]></schulform_zgv>\n";
+		echo "\t\t<studienplan_bezeichnung><![CDATA[".$studienplan->bezeichnung."]]></studienplan_bezeichnung>\n";
+		echo "\t\t<anmerkungpre><![CDATA[$prestudent->anmerkung]]></anmerkungpre>\n";
 
-	    $titel_kurzbz = '';
-            switch($studiengang->typ)
-            {
-                case 'b':
-                    $studTyp = 'Bachelor';
-                    $titel_kurzbz = 'BSc';
-                    break;
-                case 'm':
-                    $studTyp = 'Master';
-                    $titel_kurzbz ='MSc';
-                    break;
-                case 'd':
-                    $studTyp = 'Diplom';
-                    break;
-                case 'l':
-            		$studTyp = 'Lehrgang';
-           			break;
-        		case 'k':
-            		$studTyp = 'Kurzstudium';
-            		break;
-                default:
-                    $studTyp ='';
-                    $titel_kurzbz = '';
-            }
+		$titel_kurzbz = '';
+			switch($studiengang->typ)
+			{
+				case 'b':
+					$studTyp = 'Bachelor';
+					$titel_kurzbz = 'BSc';
+					break;
+				case 'm':
+					$studTyp = 'Master';
+					$titel_kurzbz ='MSc';
+					break;
+				case 'd':
+					$studTyp = 'Diplom';
+					break;
+				case 'l':
+					$studTyp = 'Lehrgang';
+		   			break;
+				case 'k':
+					$studTyp = 'Kurzstudium';
+					break;
+				default:
+					$studTyp ='';
+					$titel_kurzbz = '';
+			}
 
-            echo "\t\t<titel_kurzbz><![CDATA[".$titel_kurzbz."]]></titel_kurzbz>\n";
+			echo "\t\t<titel_kurzbz><![CDATA[".$titel_kurzbz."]]></titel_kurzbz>\n";
 			echo "\t\t<studiengang_typ><![CDATA[".$studTyp."]]></studiengang_typ>\n";
 			echo "\t\t<studienplan_sprache><![CDATA[".$studienplan->sprache."]]></studienplan_sprache>\n";
-			echo "\t\t<regelstudiendauer>".$studienplan->regelstudiendauer."</regelstudiendauer>\n";
+			echo "\t\t<regelstudiendauer><![CDATA[".$studienplan->regelstudiendauer."]]></regelstudiendauer>\n";
 
 			$akadgrad = new akadgrad();
 			$akadgrad->getAkadgradStudent($student->uid);
@@ -272,15 +271,15 @@ foreach($uid_arr as $uid)
 				$lv_studiengang=new studiengang();
 				$lv_studiengang->load($lv_studiengang_kz);
 				$lv_studiengang_bezeichnung=$lv_studiengang->bezeichnung;
-	            $stg_typ->getStudiengangTyp($lv_studiengang->typ);
+				$stg_typ->getStudiengangTyp($lv_studiengang->typ);
 				$lv_studiengang_typ=$stg_typ->bezeichnung;
 			}
 
-			echo "\t\t<lv_studiengang_kz>".sprintf('%04s', $lv_studiengang_kz)."</lv_studiengang_kz>";
+			echo "\t\t<lv_studiengang_kz><![CDATA[".sprintf('%04s', $lv_studiengang_kz)."]]></lv_studiengang_kz>";
 			echo "\t\t<lv_studiengang_typ><![CDATA[$lv_studiengang_typ]]></lv_studiengang_typ>";
 			echo "\t\t<lv_studiengang_bezeichnung><![CDATA[$lv_studiengang_bezeichnung]]></lv_studiengang_bezeichnung>";
 
-			echo "\t\t<datum_aktuell>".$datum_aktuell."</datum_aktuell>\n";
+			echo "\t\t<datum_aktuell><![CDATA[".$datum_aktuell."]]></datum_aktuell>\n";
 
 			$adresse = new adresse();
 			$adresse->load_pers($student->person_id);
diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
index 61b56361c..53d948424 100644
--- a/rdf/zeugnis.rdf.php
+++ b/rdf/zeugnis.rdf.php
@@ -1,448 +1,457 @@
-<?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> and
- *			Gerald Raab <gerald.raab@technikum-wien.at>.
- */
-//header("Cache-Control: no-cache");
-//header("Cache-Control: post-check=0, pre-check=0",false);
-//header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-//header("Pragma: no-cache");
-// content type setzen
-header("Content-type: application/xhtml+xml");
-require_once('../config/vilesci.config.inc.php');
-require_once('../include/functions.inc.php');
-require_once('../include/zeugnisnote.class.php');
-require_once('../include/datum.class.php');
-require_once('../include/note.class.php');
-require_once('../include/studiengang.class.php');
-require_once('../include/mitarbeiter.class.php');
-require_once('../include/anrechnung.class.php');
-
-$datum = new datum();
-$db = new basis_db();
-$projektarbeit=array();
-$fussnotenzeichen=array('¹)','²)','³)');
-$anzahl_fussnoten=0;
-$studiengang_typ='';
-$xml_fussnote='';
-
-function breaktext($text, $zeichen)
-{
-	$arr = explode(' ',$text);
-	$ret = '';
-	$teilstring='';
-
-	foreach($arr as $elem)
-	{
-		if(strlen($teilstring.$elem)>$zeichen)
-		{
-			$ret.=' '.$teilstring.'\n';
-			$teilstring=$elem;
-		}
-		else
-			$teilstring .=' '.$elem;
-	}
-	$ret.=$teilstring;
-	return $ret;
-}
-
-if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
-{
-
-	if(isset($_GET['uid']))
-		$uid = $_GET['uid'];
-	else
-		$uid = null;
-
-	$uid_arr = explode(";",$uid);
-
-	if ($uid_arr[0] == "")
-	{
-		unset($uid_arr[0]);
-		$uid_arr = array_values($uid_arr);
-	}
-
-	$note_arr = array();
-	$note = new note();
-	$note->getAll($offiziell = true);
-	foreach ($note->result as $n)
-		$note_arr[$n->note] = $n->anmerkung;
-
-	if(isset($_GET['ss']))
-		$studiensemester_kurzbz = $_GET['ss'];
-	else
-		die('Studiensemester wurde nicht uebergeben');
-
-	//Daten holen
-
-	$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
-	$xml .= "<zeugnisse>";
-
-	for ($i = 0; $i < sizeof($uid_arr); $i++)
-	{
-		$anzahl_fussnoten=0;
-		$studiengang_typ='';
-		$xml_fussnote='';
-		$projektarbeit=array();
-
-		$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.projektarbeit_note_anzeige,
-					tbl_studiengang.bezeichnung, tbl_studiengang.english, tbl_studentlehrverband.semester,
-					tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre,
-					tbl_person.titelpost, tbl_person.anrede, tbl_studiensemester.bezeichnung as sembezeichnung,
-					tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_student.prestudent_id, tbl_studiengang.max_semester
-				FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer, tbl_studentlehrverband, tbl_studiensemester
-				WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz
-				AND tbl_student.student_uid = tbl_benutzer.uid AND tbl_benutzer.person_id = tbl_person.person_id
-				AND tbl_student.student_uid = ".$db->db_add_param($uid_arr[$i])."
-				AND tbl_studentlehrverband.student_uid=tbl_student.student_uid
-				AND tbl_studiensemester.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
-				AND tbl_studentlehrverband.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
-
-		if($result = $db->db_query($query))
-		{
-			$xml .= "\n	<zeugnis>";
-			if($row = $db->db_fetch_object($result))
-			{
-				$studiengang = new studiengang();
-				$stgleiter = $studiengang->getLeitung($row->studiengang_kz);
-				$stgl='';
-				foreach ($stgleiter as $stgleiter_uid)
-				{
-					$stgl_ma = new mitarbeiter($stgleiter_uid);
-					$stgl .= trim($stgl_ma->titelpre.' '.$stgl_ma->vorname.' '.$stgl_ma->nachname.' '.$stgl_ma->titelpost);
-				}
-
-				//Wenn das Semester 0 ist, dann wird das Semester aus der Rolle geholt. (Ausnahme: Incoming)
-				//damit bei Outgoing Studenten die im 0. Semester angelegt sind das richtige Semester aufscheint
-				$qry ="SELECT ausbildungssemester as semester, tbl_studienordnung.studiengangbezeichnung, tbl_studienordnung.studiengangbezeichnung_englisch
- 						FROM public.tbl_prestudentstatus
-						LEFT JOIN lehre.tbl_studienplan USING (studienplan_id)
-						LEFT JOIN lehre.tbl_studienordnung USING (studienordnung_id)
-						WHERE
-						prestudent_id=".$db->db_add_param($row->prestudent_id)." AND
-						studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
-						tbl_prestudentstatus.status_kurzbz not in('Incoming','Aufgenommener','Bewerber','Wartender', 'Interessent', 'Abgewiesener')
-						ORDER BY DATUM DESC LIMIT 1";
-				if($result_sem = $db->db_query($qry))
-				{
-					if($row_sem = $db->db_fetch_object($result_sem))
-					{
-						$row->semester = $row_sem->semester;
-						$row->studiengangbezeichnung = $row_sem->studiengangbezeichnung;
-						$row->studiengangbezeichnung_englisch = $row_sem->studiengangbezeichnung_englisch;
-						$bezeichnung = $row_sem->semester.'. Semester';
-					}
-					else
-						$bezeichnung = '';
-				}
-				else
-					$bezeichnung = '';
-
-				$studiengangbezeichnung = empty($row->studiengangbezeichnung) ? $row->bezeichnung : $row->studiengangbezeichnung;
-				$studiengangbezeichnung_englisch = empty($row->studiengangbezeichnung_englisch) ? $row->english : $row->studiengangbezeichnung_englisch;
-
-				$xml .= "		<studiensemester><![CDATA[".$row->sembezeichnung."]]></studiensemester>";
-				$xml .= "		<stsem><![CDATA[".$row->stsem."]]></stsem>";
-				$xml .=	"		<semester><![CDATA[".$row->semester."]]></semester>";
-				$xml .=	"		<semester_bezeichnung><![CDATA[".$bezeichnung."]]></semester_bezeichnung>";
-				$xml .= "		<studiengang><![CDATA[".$studiengangbezeichnung."]]></studiengang>";
-				$xml .= "		<studiengang_englisch><![CDATA[".$studiengangbezeichnung_englisch."]]></studiengang_englisch>";
-				if($row->typ=='b')
-					$bezeichnung='Bachelor';
-				elseif($row->typ=='m')
-					$bezeichnung='Master';
-				elseif($row->typ=='d')
-					$bezeichnung='Diplom';
-				else
-					$bezeichnung='';
-				$studiengang_typ=$row->typ;
-				$semester = $row->semester;
-
-				//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
-				if ($row->studiengang_kz<0)
-				{
-					$stg = new studiengang();
-					$stg->load($row->studiengang_kz);
-
-					$studiengang_kz = sprintf("%03s", $stg->erhalter_kz).sprintf("%04s", abs($row->studiengang_kz));
-				}
-				else
-					$studiengang_kz = sprintf("%04s", abs($row->studiengang_kz));
-
-				$xml .= "		<studiengang_art><![CDATA[".$bezeichnung."]]></studiengang_art>";
-				$xml .= "		<studiengang_kz><![CDATA[".$studiengang_kz."]]></studiengang_kz>";
-				$xml .= "\n		<anrede><![CDATA[".$row->anrede."]]></anrede>";
-				$xml .= "\n		<vorname><![CDATA[".$row->vorname."]]></vorname>";
-				$xml .= "		<nachname><![CDATA[".$row->nachname."]]></nachname>";
-				$xml .= "		<name><![CDATA[".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.$row->nachname.($row->titelpost!=''?', '.$row->titelpost:''))."]]></name>";
-				$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
-				$xml .= "		<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>";
-				$xml .= "		<matrikelnr><![CDATA[".trim($row->matrikelnr)."]]></matrikelnr>";
-				$xml .= "		<studiengangsleiter><![CDATA[".$stgl."]]></studiengangsleiter>";
-				$datum_aktuell = date('d.m.Y');
-				$xml .= "		<ort_datum><![CDATA[".$datum_aktuell."]]></ort_datum>";
-				$xml .= "		<projektarbeit_note_anzeige>".($row->projektarbeit_note_anzeige=='t'?'true':'false')."</projektarbeit_note_anzeige>";
-
-				$qry_proj = "
-					SELECT
-						lehrveranstaltung_id, titel, themenbereich, note, titel_english,
-						tbl_projekttyp.bezeichnung, projekttyp_kurzbz
-					FROM
-						lehre.tbl_projektarbeit
-						JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-						JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-					WHERE
-						student_uid=".$db->db_add_param($uid_arr[$i])."
-						AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
-						AND projekttyp_kurzbz in('Bachelor', 'Diplom')
-					ORDER BY beginn ASC, projektarbeit_id ASC";
-
-				if($result_proj = $db->db_query($qry_proj))
-				{
-					while($row_proj = $db->db_fetch_object($result_proj))
-					{
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['titel']=$row_proj->titel;
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['titel_en']=$row_proj->titel_english;
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['themenbereich']=$row_proj->themenbereich;
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['note']=$row_proj->note;
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['projekttyp_bezeichnung']=$row_proj->bezeichnung;
-						$projektarbeit[$row_proj->lehrveranstaltung_id]['projekttyp_kurzbz']=$row_proj->projekttyp_kurzbz;
-					}
-				}
-
-				// Wenn es das letzte Semesterzeugnis ist, wird zusaetzlich die Abschlusspruefung geliefert
-				if($row->semester==$row->max_semester)
-				{
-
-					$qry_abschlusspruefung = "SELECT
-													tbl_abschlusspruefung.datum,
-													tbl_abschlusspruefung.pruefungstyp_kurzbz,
-													tbl_abschlussbeurteilung.bezeichnung,
-													tbl_abschlussbeurteilung.bezeichnung_english
-											FROM
-												lehre.tbl_abschlusspruefung
-												LEFT JOIN lehre.tbl_abschlussbeurteilung USING(abschlussbeurteilung_kurzbz)
-											WHERE
-												tbl_abschlusspruefung.student_uid=".$db->db_add_param($uid_arr[$i])."
-											ORDER BY datum DESC LIMIT 1";
-					if($result_abschlusspruefung = $db->db_query($qry_abschlusspruefung))
-					{
-						if($row_abschlusspruefung = $db->db_fetch_object($result_abschlusspruefung))
-						{
-							$xml .= "		<abschlusspruefung_typ><![CDATA[".$row_abschlusspruefung->pruefungstyp_kurzbz."]]></abschlusspruefung_typ>";
-							$xml .= "		<abschlusspruefung_datum><![CDATA[".$datum->formatDatum($row_abschlusspruefung->datum,'d.m.Y')."]]></abschlusspruefung_datum>";
-							$xml .= "		<abschlusspruefung_note><![CDATA[".$row_abschlusspruefung->bezeichnung."]]></abschlusspruefung_note>";
-							$xml .= "		<abschlusspruefung_note_english><![CDATA[".$row_abschlusspruefung->bezeichnung_english."]]></abschlusspruefung_note_english>";
-						}
-					}
-				}
-
-				$obj = new zeugnisnote();
-
-				$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz);
-
-				$ects_gesamt = $ects_gesamt_positiv = 0;
-				$prestudent_id = $row->prestudent_id;
-				foreach ($obj->result as $row)
-				{
-					if($row->zeugnis)
-					{
-						if (trim($row->note)!=='' && isset($note_arr[$row->note]))
-							$note = $note_arr[$row->note];
-						else
-							$note = "";
-						$note2=$note;
-
-						//Firma fuer Berufspraktikum
-						$qry = "SELECT tbl_firma.name
-								FROM
-									lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, public.tbl_firma
-								WHERE
-									tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-									tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
-									tbl_projektarbeit.firma_id = tbl_firma.firma_id AND
-									tbl_projektarbeit.student_uid=".$db->db_add_param($uid_arr[$i])." AND
-									tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
-									tbl_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($row->lehrveranstaltung_id);
-
-						$firma = '';
-						$firma_eng = '';
-						if($result_firma = $db->db_query($qry))
-						{
-							if($row_firma = $db->db_fetch_object($result_firma))
-							{
-								if($row_firma->name!='')
-								{
-									$firma = " bei Firma: $row_firma->name";
-									$firma_eng = " at: $row_firma->name";
-								}
-							}
-						}
-
-						//Bakk/Dipl Fussnoten
-						if(array_key_exists($row->lehrveranstaltung_id, $projektarbeit))
-						{
-							$bezeichnung = $row->lehrveranstaltung_bezeichnung.$firma.' '.$fussnotenzeichen[$anzahl_fussnoten];
-							$bezeichnung_englisch = $row->lehrveranstaltung_bezeichnung_english.$firma_eng.' '.$fussnotenzeichen[$anzahl_fussnoten];
-							$xml_fussnote .="\n <fussnote>";
-							$xml_fussnote .=" 		<fussnotenzeichen>".$fussnotenzeichen[$anzahl_fussnoten]."</fussnotenzeichen>";
-
-							//$projektarbeit[$row->lehrveranstaltung_id]['titel'] = breaktext($projektarbeit[$row->lehrveranstaltung_id]['titel'], 40);
-
-							$anzahl_nl = substr_count($projektarbeit[$row->lehrveranstaltung_id]['titel'],'\n');
-							$nl2='';
-							if($projektarbeit[$row->lehrveranstaltung_id]['themenbereich']!='')
-							{
-								//$xml_fussnote .="       <themenbereich_bezeichnung>Themenbereich: </themenbereich_bezeichnung>";
-								$xml_fussnote .="       <themenbereich><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['themenbereich'].']]></themenbereich>';
-								$anzahl_nl++;
-								$nl2='\n';
-							}
-
-							/*if($studiengang_typ=='b')
-								$typ = 'Bachelorarbeit:';
-							else
-								$typ = 'Master Thesis:';*/
-
-							$nl='';
-							$nl2='';
-							$xml_fussnote .="      <titel_bezeichnung><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['projekttyp_bezeichnung']."]]></titel_bezeichnung>";
-							$xml_fussnote .="      <titel_kurzbz><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['projekttyp_kurzbz']."]]></titel_kurzbz>";
-							$xml_fussnote .="      <titel><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['titel'].$nl2."]]></titel>";
-							$xml_fussnote .="      <titel_en><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['titel_en'].$nl2."]]></titel_en>";
-							//$note = $note_arr[$projektarbeit[$row->lehrveranstaltung_id]['note']];
-							$note = $projektarbeit[$row->lehrveranstaltung_id]['note'];
-							//$nl = str_repeat('\n',($anzahl_nl));
-							$xml_fussnote .='      <note>'.(isset($note_arr[$note])?$note_arr[$note]:"").$nl.'</note>';
-							$xml_fussnote .='      <sws>'.$nl.'</sws>';
-							$xml_fussnote .='      <sws_lv>'.$nl.'</sws_lv>';
-							$xml_fussnote .='      <ects>'.$nl.'</ects>';
-							$xml_fussnote .='      <lv_lehrform_kurzbz>'.$nl.'</lv_lehrform_kurzbz>';
-
-
-
-							$xml_fussnote .=" </fussnote>";
-
-							$anzahl_fussnoten++;
-						}
-						else
-						{
-							$bezeichnung = $row->lehrveranstaltung_bezeichnung.$firma;
-							$bezeichnung_englisch = $row->lehrveranstaltung_bezeichnung_english.$firma_eng;
-						}
-
-
-						$bisio_von = '';
-						$bisio_bis = '';
-						$bisio_ort = '';
-						$bisio_universitaet = '';
-						$auslandssemester=false;
-
-						$qry = "SELECT tbl_bisio.* FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-								WHERE tbl_lehreinheit.lehrveranstaltung_id='$row->lehrveranstaltung_id'
-								AND student_uid=".$db->db_add_param($uid_arr[$i]);
-						if($result_bisio = $db->db_query($qry))
-						{
-							if($row_bisio = $db->db_fetch_object($result_bisio))
-							{
-								$bisio_von = $row_bisio->von;
-								$bisio_bis = $row_bisio->bis;
-								$bisio_ort = $row_bisio->ort;
-								$bisio_universitaet = $row_bisio->universitaet;
-								$auslandssemester=true;
-								$note2 = 'ar';
-							}
-						}
-
-						$qry = "SELECT wochen FROM public.tbl_semesterwochen
-								WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester
-								FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($row->lehrveranstaltung_id).")";
-						$wochen = 15;
-						if($result_wochen = $db->db_query($qry))
-						{
-							if($row_wochen = $db->db_fetch_object($result_wochen))
-							{
-								$wochen = $row_wochen->wochen;
-							}
-						}
-						$xml .= "\n			<unterrichtsfach>";
-						$xml .= "				<bezeichnung><![CDATA[".$bezeichnung."]]></bezeichnung>";
-						$xml .= "				<bezeichnung_englisch><![CDATA[".$bezeichnung_englisch."]]></bezeichnung_englisch>";
-						$xml .= "				<note_positiv><![CDATA[".$row->note_positiv."]]></note_positiv>";
-						$xml .= "				<note><![CDATA[".$note2."]]></note>";
-						$xml .= "				<sws><![CDATA[".($row->semesterstunden==0?'':number_format(sprintf('%.1F',$row->semesterstunden/$wochen),1))."]]></sws>";
-						$xml .= "				<sws_lv><![CDATA[".($row->sws==0?'':number_format(sprintf('%.1F',$row->sws),1))."]]></sws_lv>";
-						$ectspunkte='';
-
-						$anrechnung = new anrechnung();
-						$anrechnung->getAnrechnungPrestudent($prestudent_id, null, $row->lehrveranstaltung_id);
-
-						if($anrechnung->result != null)
-						{
-							$lv = new lehrveranstaltung($anrechnung->result[0]->lehrveranstaltung_id);
-							if(($lv->ects !== $row->ects) && ($lv->ects != "") && ($lv->ects != null))
-							{
-								$row->ects = $lv->ects;
-							}
-						}
-
-						if($row->ects==0 || $row->ects=='')
-							$ectspunkte='';
-						else
-						{
-							//Bei 2 Nachkommastellen beide anzeigen, sonst nur 1
-							if(number_format($row->ects,1)==number_format($row->ects,2))
-								$ectspunkte=number_format($row->ects,1);
-							else
-								$ectspunkte=number_format($row->ects,2);
-						}
-						$ects_gesamt+=$ectspunkte;
-
-						if ($row->note_positiv === true)
-							$ects_gesamt_positiv += $ectspunkte;
-
-						$xml .= "				<ects><![CDATA[".$ectspunkte."]]></ects>";
-						$xml .= "				<lv_lehrform_kurzbz><![CDATA[".$row->lv_lehrform_kurzbz."]]></lv_lehrform_kurzbz>";
-						if($auslandssemester)
-						{
-							$xml .= "			<bisio_von><![CDATA[".date('d.m.Y', $datum->mktime_fromdate($bisio_von))."]]></bisio_von>";
-							$xml .= "			<bisio_bis><![CDATA[".date('d.m.Y', $datum->mktime_fromdate($bisio_bis))."]]></bisio_bis>";
-							$xml .= "			<bisio_ort><![CDATA[$bisio_ort]]></bisio_ort>";
-							$xml .= "			<bisio_universitaet><![CDATA[$bisio_universitaet]]></bisio_universitaet>";
-						}
-						$xml .= "			</unterrichtsfach>";
-					}
-				}
-				$xml .= "<ects_gesamt><![CDATA[".$ects_gesamt."]]></ects_gesamt>";
-				$xml .= "<ects_gesamt_positiv><![CDATA[".$ects_gesamt_positiv."]]></ects_gesamt_positiv>";
-				$xml .= $xml_fussnote;
-
-			}
-			else
-			{
-				$xml .="<name>PERSON NICHT GEFUNDEN / KEIN STATUS</name>";
-			}
-			$xml .= "	</zeugnis>";
-		}
-	}
-	$xml .= "</zeugnisse>";
-	echo $xml;
-}
-?>
+<?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> and
+ *			Gerald Raab <gerald.raab@technikum-wien.at>.
+ */
+//header("Cache-Control: no-cache");
+//header("Cache-Control: post-check=0, pre-check=0",false);
+//header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+//header("Pragma: no-cache");
+// content type setzen
+header("Content-type: application/xhtml+xml");
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/zeugnisnote.class.php');
+require_once('../include/datum.class.php');
+require_once('../include/note.class.php');
+require_once('../include/studiengang.class.php');
+require_once('../include/mitarbeiter.class.php');
+require_once('../include/anrechnung.class.php');
+require_once('../include/prestudent.class.php');
+
+$datum = new datum();
+$db = new basis_db();
+$projektarbeit=array();
+$fussnotenzeichen=array('¹)','²)','³)');
+$anzahl_fussnoten=0;
+$studiengang_typ='';
+$xml_fussnote='';
+
+function breaktext($text, $zeichen)
+{
+	$arr = explode(' ',$text);
+	$ret = '';
+	$teilstring='';
+
+	foreach($arr as $elem)
+	{
+		if(strlen($teilstring.$elem)>$zeichen)
+		{
+			$ret.=' '.$teilstring.'\n';
+			$teilstring=$elem;
+		}
+		else
+			$teilstring .=' '.$elem;
+	}
+	$ret.=$teilstring;
+	return $ret;
+}
+
+if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
+{
+
+	if(isset($_GET['uid']))
+		$uid = $_GET['uid'];
+	else
+		$uid = null;
+
+	$uid_arr = explode(";",$uid);
+
+	if ($uid_arr[0] == "")
+	{
+		unset($uid_arr[0]);
+		$uid_arr = array_values($uid_arr);
+	}
+
+	$note_arr = array();
+	$note = new note();
+	$note->getAll($offiziell = true);
+	foreach ($note->result as $n)
+		$note_arr[$n->note] = $n->anmerkung;
+
+	if(isset($_GET['ss']))
+		$studiensemester_kurzbz = $_GET['ss'];
+	else
+		die('Studiensemester wurde nicht uebergeben');
+
+	//Daten holen
+
+	$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
+	$xml .= "<zeugnisse>";
+
+	for ($i = 0; $i < sizeof($uid_arr); $i++)
+	{
+		$anzahl_fussnoten=0;
+		$studiengang_typ='';
+		$xml_fussnote='';
+		$projektarbeit=array();
+
+		$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.projektarbeit_note_anzeige,
+					tbl_studiengang.bezeichnung, tbl_studiengang.english, tbl_studentlehrverband.semester,
+					tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre,
+					tbl_person.titelpost, tbl_person.anrede, tbl_studiensemester.bezeichnung as sembezeichnung,
+					tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_student.prestudent_id, tbl_studiengang.max_semester
+				FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer, tbl_studentlehrverband, tbl_studiensemester
+				WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz
+				AND tbl_student.student_uid = tbl_benutzer.uid AND tbl_benutzer.person_id = tbl_person.person_id
+				AND tbl_student.student_uid = ".$db->db_add_param($uid_arr[$i])."
+				AND tbl_studentlehrverband.student_uid=tbl_student.student_uid
+				AND tbl_studiensemester.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
+				AND tbl_studentlehrverband.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
+
+		if($result = $db->db_query($query))
+		{
+			$xml .= "\n	<zeugnis>";
+			if($row = $db->db_fetch_object($result))
+			{
+				$studiengang = new studiengang();
+				$stgleiter = $studiengang->getLeitung($row->studiengang_kz);
+				$stgl='';
+				foreach ($stgleiter as $stgleiter_uid)
+				{
+					$stgl_ma = new mitarbeiter($stgleiter_uid);
+					$stgl .= trim($stgl_ma->titelpre.' '.$stgl_ma->vorname.' '.$stgl_ma->nachname.' '.$stgl_ma->titelpost);
+				}
+
+				//Wenn das Semester 0 ist, dann wird das Semester aus der Rolle geholt. (Ausnahme: Incoming)
+				//damit bei Outgoing Studenten die im 0. Semester angelegt sind das richtige Semester aufscheint
+				$qry ="SELECT ausbildungssemester as semester, tbl_studienordnung.studiengangbezeichnung, tbl_studienordnung.studiengangbezeichnung_englisch
+ 						FROM public.tbl_prestudentstatus
+						LEFT JOIN lehre.tbl_studienplan USING (studienplan_id)
+						LEFT JOIN lehre.tbl_studienordnung USING (studienordnung_id)
+						WHERE
+						prestudent_id=".$db->db_add_param($row->prestudent_id)." AND
+						studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
+						tbl_prestudentstatus.status_kurzbz not in('Incoming','Aufgenommener','Bewerber','Wartender', 'Interessent', 'Abgewiesener')
+						ORDER BY DATUM DESC LIMIT 1";
+				if($result_sem = $db->db_query($qry))
+				{
+					if($row_sem = $db->db_fetch_object($result_sem))
+					{
+						$row->semester = $row_sem->semester;
+						$row->studiengangbezeichnung = $row_sem->studiengangbezeichnung;
+						$row->studiengangbezeichnung_englisch = $row_sem->studiengangbezeichnung_englisch;
+						$bezeichnung = $row_sem->semester.'. Semester';
+					}
+					else
+						$bezeichnung = '';
+				}
+				else
+					$bezeichnung = '';
+
+				$studiengangbezeichnung = empty($row->studiengangbezeichnung) ? $row->bezeichnung : $row->studiengangbezeichnung;
+				$studiengangbezeichnung_englisch = empty($row->studiengangbezeichnung_englisch) ? $row->english : $row->studiengangbezeichnung_englisch;
+
+				$xml .= "		<studiensemester><![CDATA[".$row->sembezeichnung."]]></studiensemester>";
+				$xml .= "		<stsem><![CDATA[".$row->stsem."]]></stsem>";
+				$xml .=	"		<semester><![CDATA[".$row->semester."]]></semester>";
+				$xml .=	"		<semester_bezeichnung><![CDATA[".$bezeichnung."]]></semester_bezeichnung>";
+				$xml .= "		<studiengang><![CDATA[".$studiengangbezeichnung."]]></studiengang>";
+				$xml .= "		<studiengang_englisch><![CDATA[".$studiengangbezeichnung_englisch."]]></studiengang_englisch>";
+				if($row->typ=='b')
+					$bezeichnung='Bachelor';
+				elseif($row->typ=='m')
+					$bezeichnung='Master';
+				elseif($row->typ=='d')
+					$bezeichnung='Diplom';
+				else
+					$bezeichnung='';
+				$studiengang_typ=$row->typ;
+				$semester = $row->semester;
+
+				//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
+				if ($row->studiengang_kz<0)
+				{
+					$stg = new studiengang();
+					$stg->load($row->studiengang_kz);
+
+					$studiengang_kz = sprintf("%03s", $stg->erhalter_kz).sprintf("%04s", abs($row->studiengang_kz));
+				}
+				else
+					$studiengang_kz = sprintf("%04s", abs($row->studiengang_kz));
+
+				$xml .= "		<studiengang_art><![CDATA[".$bezeichnung."]]></studiengang_art>";
+				$xml .= "		<studiengang_kz><![CDATA[".$studiengang_kz."]]></studiengang_kz>";
+				$xml .= "\n		<anrede><![CDATA[".$row->anrede."]]></anrede>";
+				$xml .= "\n		<vorname><![CDATA[".$row->vorname."]]></vorname>";
+				$xml .= "		<nachname><![CDATA[".$row->nachname."]]></nachname>";
+				$xml .= "		<name><![CDATA[".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.$row->nachname.($row->titelpost!=''?', '.$row->titelpost:''))."]]></name>";
+				$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
+				$xml .= "		<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>";
+				$xml .= "		<matrikelnr><![CDATA[".trim($row->matrikelnr)."]]></matrikelnr>";
+				$xml .= "		<studiengangsleiter><![CDATA[".$stgl."]]></studiengangsleiter>";
+				$datum_aktuell = date('d.m.Y');
+				$xml .= "		<ort_datum><![CDATA[".$datum_aktuell."]]></ort_datum>";
+				$xml .= "		<projektarbeit_note_anzeige>".($row->projektarbeit_note_anzeige=='t'?'true':'false')."</projektarbeit_note_anzeige>";
+
+				$qry_proj = "
+					SELECT
+						lehrveranstaltung_id, titel, themenbereich, note, titel_english,
+						tbl_projekttyp.bezeichnung, projekttyp_kurzbz
+					FROM
+						lehre.tbl_projektarbeit
+						JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+						JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					WHERE
+						student_uid=".$db->db_add_param($uid_arr[$i])."
+						AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
+						AND projekttyp_kurzbz in('Bachelor', 'Diplom')
+					ORDER BY beginn ASC, projektarbeit_id ASC";
+
+				if($result_proj = $db->db_query($qry_proj))
+				{
+					while($row_proj = $db->db_fetch_object($result_proj))
+					{
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['titel']=$row_proj->titel;
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['titel_en']=$row_proj->titel_english;
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['themenbereich']=$row_proj->themenbereich;
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['note']=$row_proj->note;
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['projekttyp_bezeichnung']=$row_proj->bezeichnung;
+						$projektarbeit[$row_proj->lehrveranstaltung_id]['projekttyp_kurzbz']=$row_proj->projekttyp_kurzbz;
+					}
+				}
+
+				// Wenn es das letzte Semesterzeugnis ist, wird zusaetzlich die Abschlusspruefung geliefert
+				if($row->semester==$row->max_semester)
+				{
+
+					$qry_abschlusspruefung = "SELECT
+													tbl_abschlusspruefung.datum,
+													tbl_abschlusspruefung.pruefungstyp_kurzbz,
+													tbl_abschlussbeurteilung.bezeichnung,
+													tbl_abschlussbeurteilung.bezeichnung_english
+											FROM
+												lehre.tbl_abschlusspruefung
+												LEFT JOIN lehre.tbl_abschlussbeurteilung USING(abschlussbeurteilung_kurzbz)
+											WHERE
+												tbl_abschlusspruefung.student_uid=".$db->db_add_param($uid_arr[$i])."
+											ORDER BY datum DESC LIMIT 1";
+					if($result_abschlusspruefung = $db->db_query($qry_abschlusspruefung))
+					{
+						if($row_abschlusspruefung = $db->db_fetch_object($result_abschlusspruefung))
+						{
+							$xml .= "		<abschlusspruefung_typ><![CDATA[".$row_abschlusspruefung->pruefungstyp_kurzbz."]]></abschlusspruefung_typ>";
+							$xml .= "		<abschlusspruefung_datum><![CDATA[".$datum->formatDatum($row_abschlusspruefung->datum,'d.m.Y')."]]></abschlusspruefung_datum>";
+							$xml .= "		<abschlusspruefung_note><![CDATA[".$row_abschlusspruefung->bezeichnung."]]></abschlusspruefung_note>";
+							$xml .= "		<abschlusspruefung_note_english><![CDATA[".$row_abschlusspruefung->bezeichnung_english."]]></abschlusspruefung_note_english>";
+						}
+					}
+				}
+
+				$obj = new zeugnisnote();
+
+				$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz);
+
+				$ects_gesamt = $ects_gesamt_positiv = 0;
+				$prestudent_id = $row->prestudent_id;
+
+				$prestudent = new prestudent();
+				$showAllNoten = false;
+				$lastPrestudentStatus = $prestudent->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+				//wenn Incoming, sollen am Zeugnis alle Noten gedruckt werden
+				if ($lastPrestudentStatus)
+					$showAllNoten = $prestudent->status_kurzbz === 'Incoming';
+
+				foreach ($obj->result as $row)
+				{
+					if($showAllNoten || $row->zeugnis)
+					{
+						if (trim($row->note)!=='' && isset($note_arr[$row->note]))
+							$note = $note_arr[$row->note];
+						else
+							$note = "";
+						$note2=$note;
+
+						//Firma fuer Berufspraktikum
+						$qry = "SELECT tbl_firma.name
+								FROM
+									lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, public.tbl_firma
+								WHERE
+									tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+									tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+									tbl_projektarbeit.firma_id = tbl_firma.firma_id AND
+									tbl_projektarbeit.student_uid=".$db->db_add_param($uid_arr[$i])." AND
+									tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
+									tbl_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($row->lehrveranstaltung_id);
+
+						$firma = '';
+						$firma_eng = '';
+						if($result_firma = $db->db_query($qry))
+						{
+							if($row_firma = $db->db_fetch_object($result_firma))
+							{
+								if($row_firma->name!='')
+								{
+									$firma = " bei Firma: $row_firma->name";
+									$firma_eng = " at: $row_firma->name";
+								}
+							}
+						}
+
+						//Bakk/Dipl Fussnoten
+						if(array_key_exists($row->lehrveranstaltung_id, $projektarbeit))
+						{
+							$bezeichnung = $row->lehrveranstaltung_bezeichnung.$firma.' '.$fussnotenzeichen[$anzahl_fussnoten];
+							$bezeichnung_englisch = $row->lehrveranstaltung_bezeichnung_english.$firma_eng.' '.$fussnotenzeichen[$anzahl_fussnoten];
+							$xml_fussnote .="\n <fussnote>";
+							$xml_fussnote .=" 		<fussnotenzeichen>".$fussnotenzeichen[$anzahl_fussnoten]."</fussnotenzeichen>";
+
+							//$projektarbeit[$row->lehrveranstaltung_id]['titel'] = breaktext($projektarbeit[$row->lehrveranstaltung_id]['titel'], 40);
+
+							$anzahl_nl = substr_count($projektarbeit[$row->lehrveranstaltung_id]['titel'],'\n');
+							$nl2='';
+							if($projektarbeit[$row->lehrveranstaltung_id]['themenbereich']!='')
+							{
+								//$xml_fussnote .="       <themenbereich_bezeichnung>Themenbereich: </themenbereich_bezeichnung>";
+								$xml_fussnote .="       <themenbereich><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['themenbereich'].']]></themenbereich>';
+								$anzahl_nl++;
+								$nl2='\n';
+							}
+
+							/*if($studiengang_typ=='b')
+								$typ = 'Bachelorarbeit:';
+							else
+								$typ = 'Master Thesis:';*/
+
+							$nl='';
+							$nl2='';
+							$xml_fussnote .="      <titel_bezeichnung><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['projekttyp_bezeichnung']."]]></titel_bezeichnung>";
+							$xml_fussnote .="      <titel_kurzbz><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['projekttyp_kurzbz']."]]></titel_kurzbz>";
+							$xml_fussnote .="      <titel><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['titel'].$nl2."]]></titel>";
+							$xml_fussnote .="      <titel_en><![CDATA[".$projektarbeit[$row->lehrveranstaltung_id]['titel_en'].$nl2."]]></titel_en>";
+							//$note = $note_arr[$projektarbeit[$row->lehrveranstaltung_id]['note']];
+							$note = $projektarbeit[$row->lehrveranstaltung_id]['note'];
+							//$nl = str_repeat('\n',($anzahl_nl));
+							$xml_fussnote .='      <note>'.(isset($note_arr[$note])?$note_arr[$note]:"").$nl.'</note>';
+							$xml_fussnote .='      <sws>'.$nl.'</sws>';
+							$xml_fussnote .='      <sws_lv>'.$nl.'</sws_lv>';
+							$xml_fussnote .='      <ects>'.$nl.'</ects>';
+							$xml_fussnote .='      <lv_lehrform_kurzbz>'.$nl.'</lv_lehrform_kurzbz>';
+
+
+
+							$xml_fussnote .=" </fussnote>";
+
+							$anzahl_fussnoten++;
+						}
+						else
+						{
+							$bezeichnung = $row->lehrveranstaltung_bezeichnung.$firma;
+							$bezeichnung_englisch = $row->lehrveranstaltung_bezeichnung_english.$firma_eng;
+						}
+
+
+						$bisio_von = '';
+						$bisio_bis = '';
+						$bisio_ort = '';
+						$bisio_universitaet = '';
+						$auslandssemester=false;
+
+						$qry = "SELECT tbl_bisio.* FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+								WHERE tbl_lehreinheit.lehrveranstaltung_id='$row->lehrveranstaltung_id'
+								AND student_uid=".$db->db_add_param($uid_arr[$i]);
+						if($result_bisio = $db->db_query($qry))
+						{
+							if($row_bisio = $db->db_fetch_object($result_bisio))
+							{
+								$bisio_von = $row_bisio->von;
+								$bisio_bis = $row_bisio->bis;
+								$bisio_ort = $row_bisio->ort;
+								$bisio_universitaet = $row_bisio->universitaet;
+								$auslandssemester=true;
+								$note2 = 'ar';
+							}
+						}
+
+						$qry = "SELECT wochen FROM public.tbl_semesterwochen
+								WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester
+								FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($row->lehrveranstaltung_id).")";
+						$wochen = 15;
+						if($result_wochen = $db->db_query($qry))
+						{
+							if($row_wochen = $db->db_fetch_object($result_wochen))
+							{
+								$wochen = $row_wochen->wochen;
+							}
+						}
+						$xml .= "\n			<unterrichtsfach>";
+						$xml .= "				<bezeichnung><![CDATA[".$bezeichnung."]]></bezeichnung>";
+						$xml .= "				<bezeichnung_englisch><![CDATA[".$bezeichnung_englisch."]]></bezeichnung_englisch>";
+						$xml .= "				<note_positiv><![CDATA[".$row->note_positiv."]]></note_positiv>";
+						$xml .= "				<note><![CDATA[".$note2."]]></note>";
+						$xml .= "				<sws><![CDATA[".($row->semesterstunden==0?'':number_format(sprintf('%.1F',$row->semesterstunden/$wochen),1))."]]></sws>";
+						$xml .= "				<sws_lv><![CDATA[".($row->sws==0?'':number_format(sprintf('%.1F',$row->sws),1))."]]></sws_lv>";
+						$ectspunkte='';
+
+						$anrechnung = new anrechnung();
+						$anrechnung->getAnrechnungPrestudent($prestudent_id, null, $row->lehrveranstaltung_id);
+
+						if($anrechnung->result != null)
+						{
+							$lv = new lehrveranstaltung($anrechnung->result[0]->lehrveranstaltung_id);
+							if(($lv->ects !== $row->ects) && ($lv->ects != "") && ($lv->ects != null))
+							{
+								$row->ects = $lv->ects;
+							}
+						}
+
+						if($row->ects==0 || $row->ects=='')
+							$ectspunkte='';
+						else
+						{
+							//Bei 2 Nachkommastellen beide anzeigen, sonst nur 1
+							if(number_format($row->ects,1)==number_format($row->ects,2))
+								$ectspunkte=number_format($row->ects,1);
+							else
+								$ectspunkte=number_format($row->ects,2);
+						}
+						$ects_gesamt+=$ectspunkte;
+
+						if ($row->note_positiv === true)
+							$ects_gesamt_positiv += $ectspunkte;
+
+						$xml .= "				<ects><![CDATA[".$ectspunkte."]]></ects>";
+						$xml .= "				<lv_lehrform_kurzbz><![CDATA[".$row->lv_lehrform_kurzbz."]]></lv_lehrform_kurzbz>";
+						if($auslandssemester)
+						{
+							$xml .= "			<bisio_von><![CDATA[".date('d.m.Y', $datum->mktime_fromdate($bisio_von))."]]></bisio_von>";
+							$xml .= "			<bisio_bis><![CDATA[".date('d.m.Y', $datum->mktime_fromdate($bisio_bis))."]]></bisio_bis>";
+							$xml .= "			<bisio_ort><![CDATA[$bisio_ort]]></bisio_ort>";
+							$xml .= "			<bisio_universitaet><![CDATA[$bisio_universitaet]]></bisio_universitaet>";
+						}
+						$xml .= "			</unterrichtsfach>";
+					}
+				}
+				$xml .= "<ects_gesamt><![CDATA[".$ects_gesamt."]]></ects_gesamt>";
+				$xml .= "<ects_gesamt_positiv><![CDATA[".$ects_gesamt_positiv."]]></ects_gesamt_positiv>";
+				$xml .= $xml_fussnote;
+
+			}
+			else
+			{
+				$xml .="<name>PERSON NICHT GEFUNDEN / KEIN STATUS</name>";
+			}
+			$xml .= "	</zeugnis>";
+		}
+	}
+	$xml .= "</zeugnisse>";
+	echo $xml;
+}
+?>
diff --git a/rdf/zeugnisnote.rdf.php b/rdf/zeugnisnote.rdf.php
index 4fd3a37cf..7bbc893e9 100644
--- a/rdf/zeugnisnote.rdf.php
+++ b/rdf/zeugnisnote.rdf.php
@@ -119,7 +119,7 @@ foreach ($obj->result as $row)
 				<NOTE:studiengang><![CDATA['.(isset($stg_arr[$benutzer->studiengang_kz])?$stg_arr[$benutzer->studiengang_kz]:'').']]></NOTE:studiengang>
 				<NOTE:studiengang_kz><![CDATA['.$benutzer->studiengang_kz.']]></NOTE:studiengang_kz>
 				<NOTE:studiengang_lv><![CDATA['.$stg_arr[$lv_obj->studiengang_kz].']]></NOTE:studiengang_lv>
-				<NOTE:lv_studiengang_kz><![CDATA['.$lv_obj->studiengang_kz.']]></NOTE:lv_studiengang_kz>
+				<NOTE:studiengang_kz_lv><![CDATA['.$lv_obj->studiengang_kz.']]></NOTE:studiengang_kz_lv>
 				<NOTE:semester_lv><![CDATA['.$lv_obj->semester.']]></NOTE:semester_lv>
 				<NOTE:ects_lv><![CDATA['.$lv_obj->ects.']]></NOTE:ects_lv>
 				<NOTE:student_semester><![CDATA['.$benutzer->semester.']]></NOTE:student_semester>
diff --git a/skin/tempus.css b/skin/tempus.css
index f064ccb8c..de025ef27 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -205,6 +205,10 @@ treechildren::-moz-tree-cell-text(Aktiv_false)
 {
   color: grey;
 }
+treechildren::-moz-tree-cell-text(bold)
+{
+	font-weight: bold;
+}
 treechildren::-moz-tree-cell(Lektor_inaktiv)
 {
   color: grey;
diff --git a/system/checkStudenten.php b/system/checkStudenten.php
index ee1089f86..2590574db 100644
--- a/system/checkStudenten.php
+++ b/system/checkStudenten.php
@@ -244,8 +244,9 @@ FROM
 WHERE
 	status.studiensemester_kurzbz = ".$db->db_add_param($aktSem)."
 	AND lv.studiensemester_kurzbz = ".$db->db_add_param($aktSem)."
-	AND status.status_kurzbz NOT IN ('Interessent','Bewerber','Aufgenommener','Wartender','Abgewiesener')
-	AND get_rolle_prestudent (prestudent_id, ".$db->db_add_param($aktSem).")='Student'";
+	AND status.status_kurzbz NOT IN ('Interessent','Bewerber','Aufgenommener','Wartender','Abgewiesener','Unterbrecher')
+	AND get_rolle_prestudent (prestudent_id, ".$db->db_add_param($aktSem).")='Student'
+	AND status.ausbildungssemester != lv.semester";
 
 if ($studiengang_kz != '')
 	$qry .= " AND prestudent.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
@@ -256,11 +257,8 @@ if ($db->db_query($qry))
 	{
 		$student_uid = $row->student_uid;
 
-		if ($row->ausbildungssemester != $row->semester)
-		{
-			$ausgabe[$row->studiengang][5][] = $student_uid;
-			$text .= "Studenten-uid: ".$student_uid."<br>";
-		}
+		$ausgabe[$row->studiengang][5][] = $student_uid;
+		$text .= "Studenten-uid: ".$student_uid."<br>";
 	}
 }
 
@@ -623,7 +621,7 @@ WHERE
 	status_kurzbz in('Student', 'Diplomand', 'Absolvent', 'Abbrecher')
 	AND tbl_prestudent.bismelden
 	AND tbl_benutzer.aktiv
-	AND tbl_person.matr_nr is null OR tbl_person.matr_nr = ''
+	AND (tbl_person.matr_nr is null OR tbl_person.matr_nr = '')
 	AND tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($aktSem);
 
 if ($studiengang_kz != '')
@@ -655,7 +653,7 @@ if ($result = $db->db_query($qry))
 	while ($row = $db->db_fetch_object($result))
 	{
 		$ausgabe[$row->studiengang_kz][15][] = $row->vorname.' '.$row->nachname.
-			' ('.$row->prestudent_id.')';
+			' (Prestudent ID: '.$row->prestudent_id.')';
 		$text .= $row->vorname.' '.$row->nachname.
 			' ('.$row->prestudent_id.')';
 	}
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index f73517090..623ea7ac7 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -3449,6 +3449,399 @@ if(!$result = @$db->db_query("SELECT 1 FROM fue.tbl_projekttyp LIMIT 1"))
 		echo '<br>fue.tbl_projekttyp hinzugefuegt.';
 }
 
+// Add column oe_kurzbz to public.tbl_msg_recipient
+if(!$result = @$db->db_query("SELECT oe_kurzbz FROM public.tbl_msg_recipient LIMIT 1"))
+{
+	$qry = 'ALTER TABLE public.tbl_msg_recipient ADD COLUMN oe_kurzbz character varying(32);';
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_msg_recipient: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Added column oe_kurzbz to table public.tbl_msg_recipient';
+
+	// FOREIGN KEY fk_tbl_msg_recipient_oe_kurzbz: public.tbl_msg_recipient.oe_kurzbz references public.tbl_organisationseinheit.oe_kurzbz
+	if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'fk_tbl_msg_recipient_oe_kurzbz'"))
+	{
+		if ($db->db_num_rows($result) == 0)
+		{
+			$qry = "ALTER TABLE public.tbl_msg_recipient ADD CONSTRAINT fk_tbl_msg_recipient_oe_kurzbz FOREIGN KEY (oe_kurzbz)
+					REFERENCES public.tbl_organisationseinheit(oe_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;";
+
+			if (!$db->db_query($qry))
+				echo '<strong>public.tbl_msg_recipient: '.$db->db_last_error().'</strong><br>';
+			else
+				echo '<br>public.tbl_msg_recipient: added foreign key on column oe_kurzbz referenced to public.tbl_organisationseinheit(oe_kurzbz)';
+		}
+	}
+}
+
+// Add new webservice type in system.tbl_webservicetyp
+if ($result = @$db->db_query("SELECT 1 FROM system.tbl_webservicetyp WHERE webservicetyp_kurzbz = 'API';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_webservicetyp(webservicetyp_kurzbz, beschreibung) VALUES('API', 'Cronjob');";
+
+		if (!$db->db_query($qry))
+			echo '<strong>system.tbl_webservicetyp '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_webservicetyp: Added webservice type "API"<br>';
+	}
+}
+
+// Add new Table for gender
+// Add FK to public.tbl_person and Drop old Check Constraint
+if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_geschlecht LIMIT 1"))
+{
+	$qry = "
+		CREATE TABLE public.tbl_geschlecht
+		(
+			geschlecht character(1) NOT NULL,
+			bezeichnung_mehrsprachig varchar(255)[],
+			sort smallint
+		);
+		COMMENT ON TABLE public.tbl_geschlecht IS 'Key-Table of Gender';
+		ALTER TABLE public.tbl_geschlecht ADD CONSTRAINT pk_tbl_geschlecht PRIMARY KEY (geschlecht);
+
+		INSERT INTO public.tbl_geschlecht(geschlecht, bezeichnung_mehrsprachig, sort) VALUES ('m', '{\"männlich\",\"male\"}', 1);
+		INSERT INTO public.tbl_geschlecht(geschlecht, bezeichnung_mehrsprachig, sort) VALUES ('w', '{\"weiblich\",\"female\"}', 2);
+		INSERT INTO public.tbl_geschlecht(geschlecht, bezeichnung_mehrsprachig, sort) VALUES ('x', '{\"divers\",\"divers\"}', 3);
+		INSERT INTO public.tbl_geschlecht(geschlecht, bezeichnung_mehrsprachig, sort) VALUES ('u', '{\"unbekannt\",\"unknown\"}', 4);
+
+		ALTER TABLE public.tbl_person ADD CONSTRAINT fk_tbl_person_geschlecht FOREIGN KEY (geschlecht) REFERENCES public.tbl_geschlecht (geschlecht) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+		ALTER TABLE public.tbl_person DROP CONSTRAINT tbl_person_geschlecht;
+
+		GRANT SELECT ON TABLE public.tbl_geschlecht TO web;
+		GRANT SELECT ON TABLE public.tbl_geschlecht TO wawi;
+		GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE public.tbl_geschlecht TO vilesci;
+	";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_geschlecht: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_geschlecht hinzugefügt. Check Constraint für Geschlecht entfernt.';
+}
+
+if($result = $db->db_query("SELECT * FROM pg_proc WHERE proname = 'transform_geschlecht'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = '
+		CREATE OR REPLACE FUNCTION transform_geschlecht(character, date) RETURNS character
+		LANGUAGE plpgsql
+		AS $_$
+			DECLARE geschlecht ALIAS FOR $1;
+			DECLARE gebdatum ALIAS FOR $2;
+
+			BEGIN
+				IF geschlecht=\'x\' THEN
+					IF date_part(\'day\', gebdatum)::int%2=0 THEN
+						geschlecht:=\'m\';
+					ELSE
+						geschlecht:=\'w\';
+					END IF;
+				END IF;
+			RETURN geschlecht;
+			END;
+		$_$;';
+		if(!$db->db_query($qry))
+			echo '<strong>transform_geschlecht: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Function transform_geschlecht hinzugefügt.';
+	}
+}
+
+// Add column offset to testtool.tbl_gebiet
+if(!$result = @$db->db_query("SELECT offsetpunkte FROM testtool.tbl_gebiet LIMIT 1"))
+{
+	$qry = "ALTER TABLE testtool.tbl_gebiet ADD COLUMN offsetpunkte numeric(8,4)";
+
+	if(!$db->db_query($qry))
+		echo '<strong>testtool.tbl_gebiet: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>testtool.tbl_gebiet: Spalte offsetpunkte hinzugefuegt';
+}
+
+// ADD COLUMN offset to testtool.vw_auswertung_ablauf
+if(!$result = @$db->db_query("SELECT offsetpunkte FROM testtool.vw_auswertung_ablauf LIMIT 1"))
+{
+	// CREATE OR REPLACE VIEW testtool.vw_auswertung_ablauf
+	$qry = '
+		CREATE OR REPLACE VIEW testtool.vw_auswertung_ablauf AS (
+			SELECT
+				tbl_gebiet.gebiet_id,
+				tbl_gebiet.bezeichnung AS gebiet,
+				tbl_ablauf.reihung,
+				tbl_gebiet.maxpunkte,
+				tbl_pruefling.pruefling_id,
+				tbl_pruefling.prestudent_id,
+				tbl_person.vorname,
+				tbl_person.nachname,
+				tbl_person.gebdatum,
+				tbl_person.geschlecht,
+				tbl_pruefling.semester,
+				upper(tbl_studiengang.typ::character varying(1)::text || tbl_studiengang.kurzbz::text) AS stg_kurzbz,
+				tbl_studiengang.bezeichnung AS stg_bez,
+				tbl_pruefling.registriert,
+				tbl_pruefling.idnachweis,
+				( SELECT sum(tbl_vorschlag.punkte) AS sum
+					   FROM testtool.tbl_vorschlag
+						 JOIN testtool.tbl_antwort USING (vorschlag_id)
+						 JOIN testtool.tbl_frage USING (frage_id)
+					  WHERE tbl_antwort.pruefling_id = tbl_pruefling.pruefling_id AND tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
+				) AS punkte,
+				tbl_rt_person.rt_id AS reihungstest_id,
+				tbl_ablauf.gewicht,
+				tbl_studiengang.studiengang_kz,
+				tbl_gebiet.offsetpunkte
+			FROM
+				testtool.tbl_pruefling
+			 JOIN testtool.tbl_ablauf ON tbl_ablauf.studiengang_kz = tbl_pruefling.studiengang_kz
+			 JOIN testtool.tbl_gebiet USING (gebiet_id)
+			 JOIN public.tbl_prestudent USING (prestudent_id)
+			 JOIN public.tbl_person USING (person_id)
+			 JOIN public.tbl_rt_person USING (person_id)
+			 JOIN lehre.tbl_studienplan ON tbl_studienplan.studienplan_id = tbl_rt_person.studienplan_id
+			 JOIN lehre.tbl_studienordnung ON tbl_studienordnung.studienordnung_id = tbl_studienplan.studienordnung_id
+			 JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
+			WHERE NOT (tbl_ablauf.gebiet_id IN
+				(
+				SELECT tbl_kategorie.gebiet_id
+				FROM testtool.tbl_kategorie
+				)
+			) AND tbl_studienordnung.studiengang_kz = tbl_pruefling.studiengang_kz
+           )';
+
+	if(!$db->db_query($qry))
+		echo '<strong>testtool.vw_auswertung_ablauf: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>testtool.vw_auswertung_ablauf view created';
+}
+
+// ADD COLUMN offset to testtool.vw_auswertung_ablauf
+if(!$result = @$db->db_query("SELECT offsetpunkte FROM testtool.vw_auswertung LIMIT 1"))
+{
+	// CREATE OR REPLACE VIEW testtool.vw_auswertung_ablauf
+	$qry = '
+					CREATE OR REPLACE VIEW testtool.vw_auswertung AS
+			SELECT
+				tbl_gebiet.gebiet_id,
+				tbl_gebiet.bezeichnung AS gebiet,
+				tbl_gebiet.maxpunkte,
+				tbl_pruefling.pruefling_id,
+				tbl_pruefling.prestudent_id,
+				tbl_person.vorname,
+				tbl_person.nachname,
+				tbl_person.gebdatum,
+				tbl_person.geschlecht,
+				tbl_pruefling.semester,
+				upper(tbl_studiengang.typ::character varying(1)::text || tbl_studiengang.kurzbz::text) AS stg_kurzbz,
+				tbl_studiengang.bezeichnung AS stg_bez,
+				tbl_pruefling.registriert,
+				tbl_pruefling.idnachweis,
+				(
+					SELECT
+						sum(tbl_vorschlag.punkte) AS sum
+					FROM
+						testtool.tbl_vorschlag
+						JOIN testtool.tbl_antwort USING (vorschlag_id)
+						JOIN testtool.tbl_frage USING (frage_id)
+					WHERE
+						tbl_antwort.pruefling_id = tbl_pruefling.pruefling_id
+						AND tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
+				) AS punkte,
+				tbl_rt_person.rt_id as reihungstest_id,
+				tbl_ablauf.gewicht,
+				tbl_person.person_id,
+				tbl_gebiet.offsetpunkte
+			FROM
+				testtool.tbl_pruefling
+				JOIN testtool.tbl_ablauf ON (tbl_ablauf.studiengang_kz = tbl_pruefling.studiengang_kz AND tbl_ablauf.semester = tbl_pruefling.semester)
+				JOIN testtool.tbl_gebiet USING (gebiet_id)
+				JOIN public.tbl_prestudent USING (prestudent_id)
+				JOIN public.tbl_person USING (person_id)
+				JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
+				JOIN public.tbl_rt_person USING (person_id)
+				JOIN lehre.tbl_studienplan ON (tbl_studienplan.studienplan_id = tbl_rt_person.studienplan_id)
+				JOIN lehre.tbl_studienordnung ON (tbl_studienordnung.studienordnung_id = tbl_studienplan.studienordnung_id)
+			WHERE
+				tbl_studienordnung.studiengang_kz = tbl_prestudent.studiengang_kz
+				AND NOT (tbl_ablauf.gebiet_id IN ( SELECT tbl_kategorie.gebiet_id
+					FROM testtool.tbl_kategorie));';
+
+	if(!$db->db_query($qry))
+		echo '<strong>testtool.vw_auswertung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>testtool.vw_auswertung view created';
+}
+
+// Add column orgform_kurzbz to tbl_bankverbindung
+if(!$result = @$db->db_query("SELECT orgform_kurzbz FROM public.tbl_bankverbindung LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_bankverbindung ADD COLUMN orgform_kurzbz varchar(3);
+			ALTER TABLE public.tbl_bankverbindung ADD CONSTRAINT fk_bankverbindung_orgform FOREIGN KEY (orgform_kurzbz) REFERENCES bis.tbl_orgform (orgform_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_bankverbindung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_bankverbindung: Spalte orgform_kurzbz hinzugefuegt';
+}
+
+// iban, bic und weitere Variablen zu vw_msg_vars hinzufügen
+if(!$result = @$db->db_query('SELECT "IBAN Studiengang", "BIC Studiengang", "Studiengangskennzahl", "Einstiegssemester", "Einstiegsstudiensemester", "Vorname Studiengangsassistenz", "Nachname Studiengangsassistenz", "Durchwahl Studiengangsassistenz", "Alias Studiengangsassistenz", "Relative Prio" FROM public.vw_msg_vars LIMIT 1'))
+{
+	$qry = '
+	CREATE OR REPLACE VIEW public.vw_msg_vars AS (
+		SELECT DISTINCT ON(p.person_id, pr.prestudent_id) p.person_id,
+		  pr.prestudent_id AS prestudent_id,
+		  p.nachname AS "Nachname",
+		  p.vorname AS "Vorname",
+		  p.anrede AS "Anrede",
+		  a.strasse AS "Strasse",
+		  a.ort AS "Ort",
+		  a.plz AS "PLZ",
+		  a.gemeinde AS "Gemeinde",
+		  a.langtext AS "Nation",
+		  ke.kontakt AS "Email",
+		  kt.kontakt AS "Telefon",
+		  s.bezeichnung AS "Studiengang DE",
+		  s.english AS "Studiengang EN",
+		  st.bezeichnung AS "Typ",
+		  last_prestudent_status.orgform_kurzbz AS "Orgform",
+		  p.zugangscode AS "Zugangscode",
+		  bk.iban AS "IBAN Studiengang",
+		  bk.bic AS "BIC Studiengang",
+		  s.studiengang_kz AS "Studiengangskennzahl",
+		  first_prestudent_status.ausbildungssemester AS "Einstiegssemester",
+		  first_prestudent_status.studiensemester AS "Einstiegsstudiensemester",
+		  ass.vorname AS "Vorname Studiengangsassistenz",
+		  ass.nachname AS "Nachname Studiengangsassistenz",
+		  ass.telefonklappe AS "Durchwahl Studiengangsassistenz",
+		  ass.alias AS "Alias Studiengangsassistenz",
+		  (SELECT count(*)
+		   FROM (
+					SELECT pss.prestudent_id, pss.person_id, priorisierung,
+						   (
+							   SELECT status_kurzbz
+							   FROM public.tbl_prestudentstatus
+							   WHERE prestudent_id = pss.prestudent_id
+							   ORDER BY datum DESC,
+										tbl_prestudentstatus.insertamum DESC LIMIT 1
+						   ) AS laststatus
+					FROM public.tbl_prestudent pss
+					JOIN public.tbl_prestudentstatus USING (prestudent_id)
+					WHERE person_id = (
+						SELECT person_id
+						FROM public.tbl_prestudent
+						WHERE prestudent_id = pr.prestudent_id
+					)
+					  AND studiensemester_kurzbz = (
+						SELECT studiensemester_kurzbz
+						FROM public.tbl_prestudentstatus
+						WHERE prestudent_id = pr.prestudent_id
+						  AND status_kurzbz = \'Interessent\' LIMIT 1
+					)
+					  AND status_kurzbz = \'Interessent\'
+				) prest
+		   WHERE laststatus NOT IN (\'Abbrecher\', \'Abgewiesener\', \'Absolvent\')
+		   AND priorisierung <= pr.priorisierung) AS "Relative Prio"
+		FROM public.tbl_person p
+		LEFT JOIN (
+			SELECT person_id,
+				   kontakt
+			FROM public.tbl_kontakt
+			WHERE zustellung = TRUE
+			  AND kontakttyp = \'email\'
+			ORDER BY kontakt_id DESC
+		) ke USING(person_id)
+		LEFT JOIN (
+			SELECT person_id,
+				   kontakt
+			FROM public.tbl_kontakt
+			WHERE zustellung = TRUE
+			  AND kontakttyp IN (\'telefon\', \'mobil\')
+			ORDER BY kontakt_id DESC
+		) kt USING(person_id)
+		LEFT JOIN (
+			SELECT person_id,
+				   strasse,
+				   ort,
+				   plz,
+				   gemeinde,
+				   langtext
+			FROM public.tbl_adresse
+					 LEFT JOIN bis.tbl_nation ON(bis.tbl_nation.nation_code = public.tbl_adresse.nation)
+			WHERE public.tbl_adresse.heimatadresse = TRUE
+			ORDER BY adresse_id DESC
+		) a USING(person_id)
+		LEFT JOIN public.tbl_prestudent pr USING(person_id)
+		INNER JOIN public.tbl_studiengang s USING(studiengang_kz)
+		INNER JOIN public.tbl_studiengangstyp st USING(typ)
+		LEFT JOIN (
+			SELECT DISTINCT ON (ps.prestudent_id) ps.prestudent_id, tbl_studienplan.orgform_kurzbz
+			FROM public.tbl_prestudent ps
+					 JOIN public.tbl_prestudentstatus ON ps.prestudent_id = tbl_prestudentstatus.prestudent_id
+					 JOIN lehre.tbl_studienplan USING(studienplan_id)
+			ORDER BY ps.prestudent_id DESC,
+					 tbl_prestudentstatus.datum DESC,
+					 tbl_prestudentstatus.insertamum DESC,
+					 tbl_prestudentstatus.ext_id DESC
+		) last_prestudent_status ON pr.prestudent_id = last_prestudent_status.prestudent_id
+		LEFT JOIN (
+			SELECT DISTINCT ON (ps.prestudent_id) ps.prestudent_id, tbl_prestudentstatus.ausbildungssemester,
+												  studiensemester_kurzbz, tbl_studiensemester.bezeichnung AS studiensemester,
+												  tbl_studienordnung.studiengang_kz
+			FROM public.tbl_prestudent ps
+					 JOIN public.tbl_prestudentstatus ON ps.prestudent_id = tbl_prestudentstatus.prestudent_id
+					 JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
+					 JOIN lehre.tbl_studienplan USING(studienplan_id)
+					 JOIN lehre.tbl_studienordnung USING (studienordnung_id)
+			WHERE tbl_prestudentstatus.status_kurzbz = \'Interessent\'
+			ORDER BY ps.prestudent_id ASC,
+					 tbl_prestudentstatus.datum ASC,
+					 tbl_prestudentstatus.insertamum ASC,
+					 tbl_prestudentstatus.ext_id ASC
+		) first_prestudent_status ON pr.prestudent_id = first_prestudent_status.prestudent_id
+				 LEFT JOIN (
+			SELECT DISTINCT ON (tbl_benutzerfunktion.oe_kurzbz) vorname, nachname, oe_kurzbz, telefonklappe, alias
+			FROM public.tbl_benutzerfunktion
+					 JOIN public.tbl_benutzer USING (uid)
+					 JOIN public.tbl_person USING (person_id)
+					 JOIN public.tbl_mitarbeiter on tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid
+			WHERE tbl_benutzerfunktion.funktion_kurzbz = \'ass\'
+			  AND NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW())
+			ORDER BY tbl_benutzerfunktion.oe_kurzbz, tbl_benutzerfunktion.insertamum DESC NULLS LAST, datum_von DESC NULLS LAST
+		) ass ON s.oe_kurzbz = ass.oe_kurzbz
+				 LEFT JOIN (
+			SELECT DISTINCT ON (oe_kurzbz, orgform_kurzbz) oe_kurzbz, orgform_kurzbz, iban, bic
+			FROM tbl_bankverbindung
+			WHERE oe_kurzbz IS NOT NULL
+			ORDER BY oe_kurzbz, orgform_kurzbz, tbl_bankverbindung.insertamum DESC,tbl_bankverbindung.iban
+		)bk ON s.oe_kurzbz = bk.oe_kurzbz AND (last_prestudent_status.orgform_kurzbz = bk.orgform_kurzbz OR bk.orgform_kurzbz IS NULL)
+		WHERE p.aktiv = TRUE
+		ORDER BY p.person_id ASC, pr.prestudent_id ASC
+	);';
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.vw_msg_vars: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.vw_msg_vars IBAN Studiengang, BIC Studiengang, Studiengangskennzahl, Einstiegssemester, Einstiegsstudiensemester, Vorname Studiengangsassistenz, Nachname Studiengangsassistenz, Durchwahl Studiengangsassistenz, Relative Priorität added';
+}
+
+// UNIQUE INDEX unq_idx_ablauf_gebiet_studiengang_semester in testtool.tbl_ablauf löschen und durch neuen INDEX ersetzen, der auch den Studienplan einschließt
+if ($result = $db->db_query("SELECT 1 FROM pg_class WHERE relname = 'unq_idx_ablauf_gebiet_studiengang_semester'"))
+{
+	if ($db->db_num_rows($result) == 1)
+	{
+		$qry = 'DROP INDEX testtool.unq_idx_ablauf_gebiet_studiengang_semester;';
+		$qry .= 'CREATE UNIQUE INDEX unq_idx_ablauf_gebiet_studiengang_semester_studienplan ON testtool.tbl_ablauf USING btree (gebiet_id, studiengang_kz, semester, studienplan_id);';
+		if (!$db->db_query($qry))
+			echo '<strong>unq_idx_ablauf_gebiet_studiengang_semester_studienplan '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Dropped index "unq_idx_ablauf_gebiet_studiengang_semester" and created unique index "unq_idx_ablauf_gebiet_studiengang_semester_studienplan"';
+	}
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
@@ -3607,7 +4000,7 @@ $tabellen=array(
 	"public.tbl_aufnahmeschluessel"  => array("aufnahmeschluessel"),
 	"public.tbl_aufnahmetermin" => array("aufnahmetermin_id","aufnahmetermintyp_kurzbz","prestudent_id","termin","teilgenommen","bewertung","protokoll","insertamum","insertvon","updateamum","updatevon","ext_id"),
 	"public.tbl_aufnahmetermintyp" => array("aufnahmetermintyp_kurzbz","bezeichnung"),
-	"public.tbl_bankverbindung"  => array("bankverbindung_id","person_id","name","anschrift","bic","blz","iban","kontonr","typ","verrechnung","updateamum","updatevon","insertamum","insertvon","ext_id","oe_kurzbz"),
+	"public.tbl_bankverbindung"  => array("bankverbindung_id","person_id","name","anschrift","bic","blz","iban","kontonr","typ","verrechnung","updateamum","updatevon","insertamum","insertvon","ext_id","oe_kurzbz", "orgform_kurzbz"),
 	"public.tbl_benutzer"  => array("uid","person_id","aktiv","alias","insertamum","insertvon","updateamum","updatevon","ext_id","updateaktivvon","updateaktivam","aktivierungscode"),
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
@@ -3626,6 +4019,7 @@ $tabellen=array(
 	"public.tbl_firmatag"  => array("firma_id","tag","insertamum","insertvon"),
 	"public.tbl_fotostatus"  => array("fotostatus_kurzbz","beschreibung"),
 	"public.tbl_funktion"  => array("funktion_kurzbz","beschreibung","aktiv","fachbereich","semester"),
+	"public.tbl_geschlecht"  => array("geschlecht","bezeichnung_mehrsprachig","sort"),
 	"public.tbl_geschaeftsjahr"  => array("geschaeftsjahr_kurzbz","start","ende","bezeichnung"),
 	"public.tbl_gruppe"  => array("gruppe_kurzbz","studiengang_kz","semester","bezeichnung","beschreibung","sichtbar","lehre","aktiv","sort","mailgrp","generiert","updateamum","updatevon","insertamum","insertvon","ext_id","orgform_kurzbz","gid","content_visible","gesperrt","zutrittssystem","aufnahmegruppe","direktinskription"),
 	"public.tbl_kontakt"  => array("kontakt_id","person_id","kontakttyp","anmerkung","kontakt","zustellung","updateamum","updatevon","insertamum","insertvon","ext_id","standort_id"),
@@ -3637,7 +4031,7 @@ $tabellen=array(
 	"public.tbl_mitarbeiter"  => array("mitarbeiter_uid","personalnummer","telefonklappe","kurzbz","lektor","fixangestellt","bismelden","stundensatz","ausbildungcode","ort_kurzbz","standort_id","anmerkung","insertamum","insertvon","updateamum","updatevon","ext_id","kleriker"),
 	"public.tbl_msg_attachment" => array("attachment_id","message_id","name","filename"),
 	"public.tbl_msg_message" => array("message_id","person_id","subject","body","priority","relationmessage_id","oe_kurzbz","insertamum","insertvon"),
-	"public.tbl_msg_recipient" => array("message_id","person_id","token","sent","sentinfo","insertamum","insertvon"),
+	"public.tbl_msg_recipient" => array("message_id","person_id","token","sent","sentinfo","insertamum","insertvon","oe_kurzbz"),
 	"public.tbl_msg_status" => array("message_id","person_id","status","statusinfo","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_notiz"  => array("notiz_id","titel","text","verfasser_uid","bearbeiter_uid","start","ende","erledigt","insertamum","insertvon","updateamum","updatevon","ext_id"),
 	"public.tbl_notizzuordnung"  => array("notizzuordnung_id","notiz_id","projekt_kurzbz","projektphase_id","projekttask_id","uid","person_id","prestudent_id","bestellung_id","lehreinheit_id","ext_id","anrechnung_id"),
@@ -3689,7 +4083,7 @@ $tabellen=array(
 	"testtool.tbl_ablauf_vorgaben"  => array("ablauf_vorgaben_id","studiengang_kz","sprache","sprachwahl","content_id","insertamum","insertvon","updateamum", "updatevon"),
 	"testtool.tbl_antwort"  => array("antwort_id","pruefling_id","vorschlag_id"),
 	"testtool.tbl_frage"  => array("frage_id","kategorie_kurzbz","gebiet_id","level","nummer","demo","insertamum","insertvon","updateamum","updatevon","aktiv"),
-	"testtool.tbl_gebiet"  => array("gebiet_id","kurzbz","bezeichnung","beschreibung","zeit","multipleresponse","kategorien","maxfragen","zufallfrage","zufallvorschlag","levelgleichverteilung","maxpunkte","insertamum", "insertvon", "updateamum", "updatevon", "level_start","level_sprung_auf","level_sprung_ab","antwortenprozeile","bezeichnung_mehrsprachig"),
+	"testtool.tbl_gebiet"  => array("gebiet_id","kurzbz","bezeichnung","beschreibung","zeit","multipleresponse","kategorien","maxfragen","zufallfrage","zufallvorschlag","levelgleichverteilung","maxpunkte","insertamum", "insertvon", "updateamum", "updatevon", "level_start","level_sprung_auf","level_sprung_ab","antwortenprozeile","bezeichnung_mehrsprachig", "offsetpunkte"),
 	"testtool.tbl_kategorie"  => array("kategorie_kurzbz","gebiet_id"),
 	"testtool.tbl_kriterien"  => array("gebiet_id","kategorie_kurzbz","punkte","typ"),
 	"testtool.tbl_pruefling"  => array("pruefling_id","prestudent_id","studiengang_kz","idnachweis","registriert","semester"),
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 42ac64571..d05a39aab 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -106,8 +106,8 @@ $filters = array(
 					{"name": "Nachname"},
 					{"name": "Nation"},
 					{"name": "LastAction"},
-					{"name": "User/Operator"},
 					{"name": "LastActionType"},
+					{"name": "User/Operator"},
 					{"name": "LockUser"},
 					{"name": "StgNichtAbgeschickt"},
 					{"name": "StgAbgeschickt"},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4dbfbebe0..64a0acc31 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -342,8 +342,8 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
-				'description' => 'last editor',
+				'text' => 'last change',
+				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
@@ -682,7 +682,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'messages',
+				'text' => 'Messages',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -802,7 +802,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'edited by',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -842,7 +842,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'approved for the course',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -882,7 +882,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'message',
+				'text' => 'Message',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1128,7 +1128,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Release',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1288,7 +1288,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Cancel',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1635,7 +1635,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Address',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1675,7 +1675,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Man',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1695,7 +1695,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Woman',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -1755,7 +1755,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Social insurance number',
 				'description' => 'social security number',
 				'insertvon' => 'system'
 			)
@@ -1775,7 +1775,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Replacement bearing',
 				'description' => 'Replacement Label',
 				'insertvon' => 'system'
 			)
@@ -1795,8 +1795,8 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
-				'description' => 'bPK',
+				'text' => 'bPK',
+				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
@@ -1975,8 +1975,8 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
-				'description' => 'ZIP-Code',
+				'text' => 'Post code',
+				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
@@ -1995,8 +1995,8 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
-				'description' => 'Street',
+				'text' => 'Street',
+				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
@@ -2077,7 +2077,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Education semester',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2520,7 +2520,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'ZGV exam',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2540,7 +2540,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'ZGV place',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2560,7 +2560,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'ZGV date',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2580,7 +2580,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'ZGV nation',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2640,7 +2640,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Graduate',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2660,7 +2660,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Leaving certificate',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2780,8 +2780,8 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
-				'description' => 'notes on the application',
+				'text' => 'Application Notes',
+				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
@@ -2820,7 +2820,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'ZGV',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2840,7 +2840,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Access requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2860,7 +2860,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Entry requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2880,7 +2880,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'No admission requirements defined for the course',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2900,7 +2900,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'last ZGV attended',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2920,7 +2920,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'reason for cancellation',
+				'text' => 'Reason for cancellation',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -2974,15 +2974,13 @@ $phrases = array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Bei Absage von InteressentInnen	erhalten diese den Status "Abgewiesener" und deren '
-				.'ZGV-Daten können im Infocenter nicht mehr bearbeitet oder freigegeben werden. '
-				.'Alle nicht gespeicherten ZGV-Daten gehen verloren. Fortfahren?',
+				'text' => 'Bei Absage von InteressentInnen erhalten diese den Status "Abgewiesener" und deren ZGV-Daten können im Infocenter nicht mehr bearbeitet oder freigegeben werden. Alle nicht gespeicherten ZGV-Daten gehen verloren. Fortfahren?',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'If interested parties are rejected, they receive the status "rejected" and their ZGV data can no longer be edited or released in the Info Center. All ZGV data that has not been saved will be lost. Continue?',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -3096,16 +3094,13 @@ $phrases = array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Bei Freigabe von InteressentInnen wird deren Interessentenstatus bestätigt
-					und deren Zgvdaten können im Infocenter nicht mehr bearbeitet oder freigegeben werden.<br/>
-					Alle nicht gespeicherten Zgvdaten gehen verloren.<br/>
-					Fortfahren?',
+				'text' => 'Bei Freigabe von InteressentInnen wird deren Interessentenstatus bestätigt und deren Zgvdaten können im Infocenter nicht mehr bearbeitet oder freigegeben werden.<br/> Alle nicht gespeicherten Zgvdaten gehen verloren.<br/> Fortfahren?',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'If interested parties are released, their interested party status is confirmed and their Zgv data can no longer be edited or released in the Infocenter. <br/> All Zgv data not saved will be lost. <br/> Continue?',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -3365,7 +3360,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Nothing to park out',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -3385,7 +3380,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Parking error',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -3405,7 +3400,7 @@ $phrases = array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => '',
+				'text' => 'Parking error',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -3615,6 +3610,30 @@ When on hold, the date is only a reminder.',
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rtPunkteEintragenInfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es existierte bereits ein Bewerberstatus und eine Reihungstestteilnahme. 
+				Deshalb wurde bei der Freigabe der Bewerberstatus automatisch hinzugefügt und der Bewerber als Reihungstestabsolvent markiert. 
+				Die Reihungstestpunkte müssen aber noch manuell eingetragen werden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An applicant status and a placement test participation already existed for this person.
+				Thus, the applicant status was added automatically and the applicant was marked as placement test participant.
+				However, the placement test result is yet to be entered manually!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'password',
@@ -3789,7 +3808,7 @@ When on hold, the date is only a reminder.',
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Please enter the old an new password',
+				'text' => 'Please enter the old and the new password',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -4036,65 +4055,65 @@ When on hold, the date is only a reminder.',
 		)
 	),
 	array(
-        'app' => 'core',
-        'category' => 'global',
-        'phrase' => 'lehrauftraegeBestellen',
-        'insertvon' => 'system',
-        'phrases' => array(
-            array(
-                'sprache' => 'German',
-                'text' => 'Lehraufträge bestellen',
-                'description' => '',
-                'insertvon' => 'system'
-            ),
-            array(
-                'sprache' => 'English',
-                'text' => 'Order lectureships',
-                'description' => '',
-                'insertvon' => 'system'
-            )
-        )
-    ),
-    array(
-        'app' => 'core',
-        'category' => 'global',
-        'phrase' => 'lehrauftraegeErteilen',
-        'insertvon' => 'system',
-        'phrases' => array(
-            array(
-                'sprache' => 'German',
-                'text' => 'Lehraufträge erteilen',
-                'description' => '',
-                'insertvon' => 'system'
-            ),
-            array(
-                'sprache' => 'English',
-                'text' => 'Approve lectureships',
-                'description' => '',
-                'insertvon' => 'system'
-            )
-        )
-    ),
-    array(
-        'app' => 'core',
-        'category' => 'global',
-        'phrase' => 'lehrauftraegeAnnehmen',
-        'insertvon' => 'system',
-        'phrases' => array(
-            array(
-                'sprache' => 'German',
-                'text' => 'Lehraufträge annehmen',
-                'description' => '',
-                'insertvon' => 'system'
-            ),
-            array(
-                'sprache' => 'English',
-                'text' => 'Accept lectureships',
-                'description' => '',
-                'insertvon' => 'system'
-            )
-        )
-    ),
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehrauftraegeBestellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehraufträge bestellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Order lectureships',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehrauftraegeErteilen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehraufträge erteilen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Approve lectureships',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehrauftraegeAnnehmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehraufträge annehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept lectureships',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -4114,6 +4133,326 @@ When on hold, the date is only a reminder.',
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Account Aktivierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Account Activation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'usage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte wählen Sie ein Passwort für Ihren Account.<br>Das Passwort muss zumindest 8 Zeichen enthalten, davon mindestens 1 Großbuchstabe, 1 Kleinbuchstabe und eine Ziffer.<br>Das Passwort darf keine Leerzeichen und Umlaute enthalten.<br>Erlaubte Sonderzeichen sind: -$#[]{}!().,*:;_',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please choose a password for your account<br>The password must contain at least 8 characters, of which 1 must be upper case, 1 lower case and 1 a numeral.<br>The password may not include spaces or umlauts.<br>The following special characters are allowed: -$#[]{}!().,*:;_',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'username',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Username',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Username',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'code',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'captcha',
+		'phrase' => 'label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Tippen Sie die angezeigten<br>Zeichen in das untere Feld.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter the characters in<br>the field below.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'captcha',
+		'phrase' => 'reload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich kann das Bild nicht lesen - neu laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reload picture',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'activate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abschicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Activate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'password',
+		'phrase' => 'wrongCaptcha',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Captcha code falsch ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Captcha code is wrong',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'missingParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte geben Sie Benutzername, Code und Passwort ein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter username, code and password',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'account',
+		'phrase' => 'wrongActivationCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der angegebene Aktivierungscode ist falsch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The provided activation code is wrong',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'received',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Empfangen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Received',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'reply',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antworten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reply',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'altRecipientNote',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '* Diese Nachricht wird an das Infocenter der FHTW zugestellt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '* This message will be delivered to the Infocenter of UAS Technikum Wien',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'refresh',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktualisierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Refresh',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'from',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Von',
+				'description' => 'Aktualisierung',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'From',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'newMessage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie haben eine neue Nachricht erhalten',
+				'description' => 'Aktualisierung',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You received a new message',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 
diff --git a/vilesci/bis/lehrgangsmeldung.php b/vilesci/bis/lehrgangsmeldung.php
index 76b0b7f30..262821df2 100644
--- a/vilesci/bis/lehrgangsmeldung.php
+++ b/vilesci/bis/lehrgangsmeldung.php
@@ -197,7 +197,7 @@ if($result = $db->db_query($qry))
 		{
 			$error_log.=(!empty($error_log)?', ':'')."Geburtsdatum ('".$row->gebdatum."')";
 		}
-		if($row->geschlecht!='m' && $row->geschlecht!='w')
+		if($row->geschlecht!='m' && $row->geschlecht!='w' && $row->geschlecht!='x')
 		{
 			$error_log.=(!empty($error_log)?', ':'')."Geschlecht ('".$row->geschlecht."')";
 		}
diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
index 5ca6e8b52..534b54ed9 100644
--- a/vilesci/bis/personalmeldung.php
+++ b/vilesci/bis/personalmeldung.php
@@ -115,7 +115,7 @@ $stg_obj = new studiengang();
 $stg_obj->getAll(null,false);
 
 $qry="
-	SELECT DISTINCT ON (UID) *
+	SELECT DISTINCT ON (UID) *, transform_geschlecht(tbl_person.geschlecht, tbl_person.gebdatum) as geschlecht_imputiert
 	FROM
 		public.tbl_mitarbeiter
 		JOIN public.tbl_benutzer ON(mitarbeiter_uid=uid)
@@ -175,7 +175,12 @@ if($result = $db->db_query($qry))
      <Person>
       <PersonalNummer>".sprintf("%015s",$row->personalnummer)."</PersonalNummer>
       <GeburtsDatum>".date("dmY", $datumobj->mktime_fromdate($row->gebdatum))."</GeburtsDatum>
-      <Geschlecht>".strtoupper($row->geschlecht)."</Geschlecht>
+      <Geschlecht>".strtoupper($row->geschlecht)."</Geschlecht>";
+	  if ($row->geschlecht == 'x')
+	  	$person_content.="
+	  <GeschlechtX>".strtoupper($row->geschlecht_imputiert)."</GeschlechtX>";
+
+	  $person_content.="
       <HoechsteAbgeschlosseneAusbildung>".$row->ausbildungcode."</HoechsteAbgeschlosseneAusbildung>";
 		$qryvw="SELECT * FROM bis.tbl_bisverwendung WHERE mitarbeiter_uid=".$db->db_add_param($row->mitarbeiter_uid)." AND habilitation=true;";
 		if($resultvw=$db->db_query($qryvw))
diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
index eab717bea..530031b90 100644
--- a/vilesci/bis/studentenmeldung.php
+++ b/vilesci/bis/studentenmeldung.php
@@ -37,6 +37,7 @@ require_once('../../include/studiengang.class.php');
 require_once('../../include/functions.inc.php');
 require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/bisio.class.php');
+require_once('../../include/prestudent.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -56,8 +57,18 @@ $fehler='';
 $maxsemester=0;
 $v='';
 $studiensemester=new studiensemester();
-$ssem=$studiensemester->getaktorNext();
-$psem=$studiensemester->getPrevious();
+// Wenn Studiensemester als GET übergeben wird, dieses laden, sonst getaktorNext()
+if (isset($_GET['studiensemester']))
+{
+	$ssem = $_GET['studiensemester'];
+	$psem = $studiensemester->getPreviousFrom($ssem);
+}
+else
+{
+	$ssem = $studiensemester->getaktorNext();
+	$psem = $studiensemester->getPrevious();
+}
+
 $anzahl_fehler=0;
 $erhalter='';
 $stgart='';
@@ -350,7 +361,46 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 		<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
 	</head>
 	<body>';
-echo "<H1>BIS - Studentendaten werden &uuml;berpr&uuml;ft! Studiengang: ".$db->convert_html_chars($stg_kz)."</H1>\n";
+if ($rechte->isBerechtigt('admin'))
+{
+	echo '<form name="frm_studiengang" action='.$_SERVER['PHP_SELF'].' method="GET">';
+	echo 'Studiengang: <SELECT name="stg_kz"  onchange="document.frm_studiengang.submit()">';
+	$studiengang = new studiengang();
+	$studiengang->getAll('typ, kurzbz', true);
+	$types = new studiengang();
+	$types->getAllTypes();
+	$typ = '';
+	foreach ($studiengang->result AS $row)
+	{
+		if ($row->studiengang_kz == $stg_kz)
+		{
+			$selected = 'selected';
+		}
+		else
+		{
+			$selected = '';
+		}
+
+		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).'">';
+		}
+
+		echo '<OPTION value="'.$row->studiengang_kz.'"'.$selected.'>'.$row->kuerzel.' - '.$row->bezeichnung.'</OPTION>';
+
+		$typ = $row->typ;
+	}
+	echo '</select>';
+	echo '</form>';
+}
+$studiengang = new studiengang($stg_kz);
+$typ = new studiengang($stg_kz);
+$typ->getStudiengangTyp($studiengang->typ);
+echo "<H1>BIS - Studentendaten werden &uuml;berpr&uuml;ft! Studiengang: ".$db->convert_html_chars($stg_kz)." - ".$typ->bezeichnung." ".$studiengang->bezeichnung."</H1>\n";
 echo "<H2>Nicht plausible BIS-Daten (f&uuml;r Meldung ".$db->convert_html_chars($ssem)."): </H2><br>";
 echo nl2br($v."\n\n");
 
@@ -564,6 +614,9 @@ function GenerateXMLStudentBlock($row)
 	$datei = '';
 	$datumobj = new datum();
 
+	$laststatus = new prestudent();
+	$laststatus->getLastStatus($row->prestudent_id);
+
 	//Pruefen ob Ausserordnetlicher Studierender (4.Stelle in Personenkennzeichen = 9)
 	if(mb_substr($row->matrikelnr,3,1)=='9')
 		$ausserordentlich=true;
@@ -595,7 +648,7 @@ function GenerateXMLStudentBlock($row)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Geburtsdatum ('".$row->gebdatum."')";
 	}
-	if($row->geschlecht!='m' && $row->geschlecht!='w')
+	if($row->geschlecht!='m' && $row->geschlecht!='w' && $row->geschlecht!='x')
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Geschlecht ('".$row->geschlecht."')";
 	}
@@ -839,7 +892,6 @@ function GenerateXMLStudentBlock($row)
 		}
 	}
 	//Wenn im Status keine Organisationsform eingetragen ist, wird die des Studienganges uebernommen
-	//echo '<pre>', var_dump($storgform), '</pre>';
 	if($storgform=='')
 	{
 		// Wenn FHTW und studiengang_kz 10006 (Campus International) wird die OrgForm des Studiengangs vom Incoming ermittelt
@@ -893,7 +945,7 @@ function GenerateXMLStudentBlock($row)
 
 			if($gserror!='')
 			{
-				$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
+				$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($laststatus->status_kurzbz): </u>\n";
 				$v.=$gserror."\n";
 				return '';
 			}
@@ -997,7 +1049,7 @@ function GenerateXMLStudentBlock($row)
 
 	if($error_log!='' OR $error_log1!='')
 	{
-		$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
+		$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($laststatus->status_kurzbz): </u>\n";
 		if($error_log!='')
 		{
 			$v.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Fehler: ".$error_log."\n";
@@ -1303,13 +1355,19 @@ function GenerateXMLBewerberBlock($orgformcode=null)
 	if(mb_strstr($ssem,"WS"))
 	{
 		//Bewerber
-		$qrybw="SELECT * FROM public.tbl_prestudent
+		$qrybw="
+		SELECT
+			*, transform_geschlecht(tbl_person.geschlecht, tbl_person.gebdatum) as geschlecht_imputiert
+		FROM
+			public.tbl_prestudent
 			JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
 			JOIN public.tbl_person USING(person_id)
 			LEFT JOIN bis.tbl_orgform USING(orgform_kurzbz)
-			WHERE (studiensemester_kurzbz=".$db->db_add_param($ssem)." OR studiensemester_kurzbz=".$db->db_add_param($psem).") AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz)."
+		WHERE (studiensemester_kurzbz=".$db->db_add_param($ssem)." OR studiensemester_kurzbz=".$db->db_add_param($psem).")
+			AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz)."
 			AND (tbl_prestudentstatus.datum<=".$db->db_add_param($bisdatum).")
-			AND status_kurzbz='Bewerber' AND reihungstestangetreten
+			AND status_kurzbz='Bewerber'
+			AND reihungstestangetreten
 			";
 		if(!is_null($orgformcode))
 			$qrybw.=" AND tbl_orgform.code=".$db->db_add_param($orgformcode);
@@ -1321,7 +1379,7 @@ function GenerateXMLBewerberBlock($orgformcode=null)
 				// Bachelor / Diplom
 				if(($stgart==1 || $stgart==3) && $rowbw->zgv_code!=NULL)
 				{
-					if(strtoupper($rowbw->geschlecht)=='M')
+					if(strtoupper($rowbw->geschlecht_imputiert)=='M')
 					{
 						if(!isset($bewerberM[$rowbw->zgv_code]))
 						{
@@ -1341,7 +1399,7 @@ function GenerateXMLBewerberBlock($orgformcode=null)
 				// Master
 				if($stgart==2 && $rowbw->zgvmas_code!=NULL)
 				{
-					if(strtoupper($rowbw->geschlecht)=='M')
+					if(strtoupper($rowbw->geschlecht_imputiert)=='M')
 					{
 						if(!isset($bewerberM[$rowbw->zgvmas_code]))
 						{
@@ -1369,7 +1427,18 @@ function GenerateXMLBewerberBlock($orgformcode=null)
 				else
 					$bewerbercount[$bworgform]=1;
 
-				$bwlist.='<tr><td>'.trim($rowbw->nachname).'</td><td>'.trim($rowbw->vorname).'</td><td>'.$bworgform.'</td></tr>';
+				if($rowbw->geschlecht_imputiert!=$rowbw->geschlecht)
+					$geschlecht_imputiert = ' -> '.$rowbw->geschlecht_imputiert;
+				else
+					$geschlecht_imputiert = '';
+
+				$bwlist.='
+				<tr>
+					<td>'.trim($rowbw->nachname).'</td>
+					<td>'.trim($rowbw->vorname).'</td>
+					<td>'.$bworgform.'</td>
+					<td>'.$rowbw->geschlecht.$geschlecht_imputiert.'</td>
+				</tr>';
 			}
 		}
 
diff --git a/vilesci/lehre/lehreinheiten_vorrueckung.php b/vilesci/lehre/lehreinheiten_vorrueckung.php
index 8e09dd312..af12376ae 100644
--- a/vilesci/lehre/lehreinheiten_vorrueckung.php
+++ b/vilesci/lehre/lehreinheiten_vorrueckung.php
@@ -104,7 +104,7 @@ echo '</SELECT>';
 
 echo ' Semester: <SELECT name="semester">';
 echo '<OPTION value="">-- Alle --</OPTION>';
-for ($i = 1;$i <= 8;$i++)
+for ($i = 1;$i <= 10;$i++)
 {
 	if ($semester == $i)
 		$selected = 'selected';
diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
index ae7f4057e..6c99066e3 100644
--- a/vilesci/lehre/lehrveranstaltung_details.php
+++ b/vilesci/lehre/lehrveranstaltung_details.php
@@ -616,18 +616,18 @@
 			}
 
 			$("#farbe").ColorPicker(
+			{
+				onSubmit: function(hsb, hex, rgb, el)
 				{
-					onSubmit: function(hsb, hex, rgb, el)
-					{
-						$(el).val(hex);
-						$(el).ColorPickerHide();
-						document.getElementById("farbevorschau").style.backgroundColor=hex;
-					},
-					onBeforeShow: function ()
-					{
-						$(this).ColorPickerSetColor(this.value);
-					}
-				})
+					$(el).val(hex);
+					$(el).ColorPickerHide();
+					document.getElementById("farbevorschau").style.backgroundColor=hex;
+				},
+				onBeforeShow: function ()
+				{
+					$(this).ColorPickerSetColor(this.value);
+				}
+			})
 			.bind("keyup", function()
 			{
 				$(this).ColorPickerSetColor(this.value);
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index d0f6be270..a6f77bf6e 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -37,6 +37,7 @@ require_once('../../../include/student.class.php');
 require_once('../../../include/lehrverband.class.php');
 require_once('../../../include/nation.class.php');
 require_once('../../../include/studienplan.class.php');
+require_once('../../../include/geschlecht.class.php');
 
 $db = new basis_db();
 $user = get_uid();
@@ -940,9 +941,17 @@ echo '<tr><td>Weitere Vornamen </td><td><input type="text" id="vornamen" maxleng
 echo '<tr><td>Nachname *</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" required="required" autofocus/></td></tr>';
 echo '<tr><td>Titel(Post)</td><td><input type="text" id="titelpost" name="titelpost" maxlength="64" value="'.$titelpost.'" /></td></tr>';
 echo '<tr><td>Geschlecht *</td><td><SELECT id="geschlecht" name="geschlecht">';
-echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
-echo '<OPTION value="w" '.($geschlecht=='w'?'selected':'').'>weiblich</OPTION>';
-echo '<OPTION value="u" '.($geschlecht=='u'?'selected':'').'>unbekannt</OPTION>';
+$geschlecht_obj = new geschlecht();
+$geschlecht_obj->getAll();
+foreach ($geschlecht_obj->result as $row_geschlecht)
+{
+	if ($row_geschlecht->geschlecht == $geschlecht)
+		$selected = 'selected';
+	else
+		$selected = '';
+
+	echo '<OPTION value="'.$row_geschlecht->geschlecht.'" '.$selected.'>'.$row_geschlecht->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE].'</OPTION>';
+}
 echo '</SELECT>';
 echo '</td></tr>';
 echo '<tr><td>Geburtsdatum </td><td><input type="text" id="geburtsdatum" size="10" maxlength="10" name="geburtsdatum" value="'.$geburtsdatum_orig.'" /> (Format: dd.mm.JJJJ)</td></tr>';
diff --git a/vilesci/personen/import/mitarbeiterimport.php b/vilesci/personen/import/mitarbeiterimport.php
index 410820528..c616beb76 100644
--- a/vilesci/personen/import/mitarbeiterimport.php
+++ b/vilesci/personen/import/mitarbeiterimport.php
@@ -30,6 +30,7 @@ require_once('../../../include/kontakt.class.php');
 require_once('../../../include/adresse.class.php');
 require_once('../../../include/datum.class.php');
 require_once('../../../include/nation.class.php');
+require_once('../../../include/geschlecht.class.php');
 require_once('../../../include/'.EXT_FKT_PATH.'/generateuid.inc.php');
 
 $db = new basis_db();
@@ -932,9 +933,18 @@ echo '<input type="text" id="vornamen" maxlength="32" size="30" name="vornamen"
 echo '<tr><td>Nachname *</td><td><input type="text" maxlength="64" size="30" id="nachname" name="nachname" value="'.$nachname.'" /></td></tr>';
 echo '<tr><td>Titel(Post)</td><td><input type="text" id="titelpost" name="titelpost" maxlength="64" size="30" value="'.$titelpost.'" /></td></tr>';
 echo '<tr><td>Geschlecht *</td><td><SELECT id="geschlecht" name="geschlecht" onchange="GeschlechtChange()">';
-echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
-echo '<OPTION value="w" '.($geschlecht=='w'?'selected':'').'>weiblich</OPTION>';
-echo '<OPTION value="u" '.($geschlecht=='u'?'selected':'').'>unbekannt</OPTION>';
+$geschlecht_obj = new geschlecht();
+$geschlecht_obj->getAll();
+
+foreach($geschlecht_obj->result as $row_geschlecht)
+{
+	if($geschlecht == $row_geschlecht->geschlecht)
+		$selected = 'selected';
+	else
+		$selected = '';
+
+	echo '<OPTION value="'.$row_geschlecht->geschlecht.'" '.$selected.'>'.$row_geschlecht->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE].'</OPTION>';
+}
 echo '</SELECT>';
 echo '</td></tr>';
 echo '<tr><td>SVNR</td><td><input type="text" id="svnr" size="30" maxlength="16" name="svnr" value="'.$svnr.'" onblur="GeburtsdatumEintragen()" /></td></tr>';
diff --git a/vilesci/personen/personen_anlegen.php b/vilesci/personen/personen_anlegen.php
index 1ec897b78..8653c8633 100644
--- a/vilesci/personen/personen_anlegen.php
+++ b/vilesci/personen/personen_anlegen.php
@@ -27,6 +27,7 @@ require_once('../../include/person.class.php');
 require_once('../../include/datum.class.php');
 require_once('../../include/kontakt.class.php');
 require_once('../../include/adresse.class.php');
+require_once('../../include/geschlecht.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -39,7 +40,7 @@ loadVariables($user);
 <html>
 <head>
 	<meta charset="UTF-8">
-	<link href="../../skin/cis.css" rel="stylesheet" type="text/css">
+	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
 	<script language="Javascript">
 	function disablefields(obj)
 	{
@@ -347,9 +348,17 @@ echo '<tr><td>Vorname</td><td><input type="text" id="vorname" maxlength="32" nam
 echo '<tr><td>Nachname *</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" /></td></tr>';
 echo '<tr><td>Titel(Post)</td><td><input type="text" id="titelpost" name="titelpost" maxlength="64" value="'.$titelpost.'" /></td></tr>';
 echo '<tr><td>Geschlecht *</td><td><SELECT id="geschlecht" name="geschlecht">';
-echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
-echo '<OPTION value="w" '.($geschlecht=='w'?'selected':'').'>weiblich</OPTION>';
-echo '<OPTION value="u" '.($geschlecht=='u'?'selected':'').'>unbekannt</OPTION>';
+$geschlecht_obj = new geschlecht();
+$geschlecht_obj->getAll();
+foreach ($geschlecht_obj->result as $row_geschlecht)
+{
+	if ($geschlecht == $row_geschlecht->geschlecht)
+		$selected = 'selected';
+	else
+		$selected = '';
+
+	echo '<OPTION value="'.$row_geschlecht->geschlecht.'" '.$selected.'>'.$row_geschlecht->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE].'</OPTION>';
+}
 echo '</SELECT>';
 echo '</td></tr>';
 echo '<tr><td>SVNR</td><td><input type="text" id="svnr" size="10" maxlength="10" name="svnr" value="'.$svnr.'" onblur="GeburtsdatumEintragen()" /></td></tr>';
diff --git a/vilesci/personen/personen_details.php b/vilesci/personen/personen_details.php
index c87826a7b..d1dcd8815 100644
--- a/vilesci/personen/personen_details.php
+++ b/vilesci/personen/personen_details.php
@@ -31,7 +31,7 @@ require_once('../../include/nation.class.php');
 require_once('../../include/ort.class.php');
 require_once('../../include/akte.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
-require_once('../../include/fckeditor/fckeditor.php');
+require_once('../../include/geschlecht.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -119,7 +119,6 @@ $ort_kurzbz = (isset($_POST['ort_kurzbz'])?$_POST['ort_kurzbz']:'');
 $standort_id = (isset($_POST['standort_id'])?$_POST['standort_id']:'');
 $anmerkung = (isset($_POST['anmerkung'])?$_POST['anmerkung']:'');
 $bismelden = (isset($_POST['bismelden'])?$_POST['bismelden']:'');
-$kurzbeschreibung = (isset($_POST['kurzbeschreibung'])?$_POST['kurzbeschreibung']:'');
 $matrikelnummer = (isset($_POST['matrikelnummer'])?$_POST['matrikelnummer']:'');
 $semester = (isset($_POST['semester'])?$_POST['semester']:'');
 $verband = (isset($_POST['verband'])?$_POST['verband']:'');
@@ -128,9 +127,9 @@ $dms_id_lichtbild = '';
 
 if($uid!='')
 {
-	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid='".addslashes($uid)."'
+	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid=".$db->db_add_param($uid)."
 			UNION
-			SELECT person_id, false as mitarbeiter FROM campus.vw_student WHERE uid='".addslashes($uid)."'";
+			SELECT person_id, false as mitarbeiter FROM campus.vw_student WHERE uid=".$db->db_add_param($uid);
 
 	if($result = $db->db_query($qry))
 	{
@@ -176,7 +175,6 @@ if(isset($_POST['saveperson']))
 	$person->homepage = $homepage;
 	$person->updateamum = date('Y-m-d H:i:s');
 	$person->updatevon = $user;
-	$person->kurzbeschreibung = $kurzbeschreibung;
 	$person->new = false;
 
 	if($person->save())
@@ -344,7 +342,6 @@ if(!$error_person_save)
 	$anzahlderkinder = $person->anzahlkinder;
 	$anmerkungen = $person->anmerkungen;
 	$homepage = $person->homepage;
-	$kurzbeschreibung = $person->kurzbeschreibung;
 }
 
 $akte = new akte();
@@ -452,11 +449,19 @@ echo "
 </tr>
 <tr>
 	<td>Geschlecht</td>
-	<td><SELECT name='geschlecht'>
-			<option value='m' ".($geschlecht=='m'?'selected':'').">maennlich</option>
-			<option value='w' ".($geschlecht=='w'?'selected':'').">weiblich</option>
-			<option value='u' ".($geschlecht=='u'?'selected':'').">unbekannt</option>
-		</SELECT>
+	<td><SELECT name='geschlecht'>";
+$geschlecht_obj = new geschlecht();
+$geschlecht_obj->getAll();
+foreach ($geschlecht_obj->result as $row_geschlecht)
+{
+	if($geschlecht == $row_geschlecht->geschlecht)
+		$selected = 'selected';
+	else
+		$selected = '';
+
+	echo "<option value='".$row_geschlecht->geschlecht."' ".$selected.">".$row_geschlecht->bezeichnung_mehrsprachig_arr[DEFAULT_LANGUAGE]."</option>";
+}
+echo "		</SELECT>
 	</td>
 	<td>Familienstand</td>
 	<td><SELECT name='familienstand'>
@@ -485,19 +490,6 @@ echo "
 		<a href=\"../fhausweis/search.php?person_id=".$person_id."\">FH-Ausweis Status</a>
 	</td>
 </tr>
-<tr>
-	<td colspan=6>
-	";
-$oFCKeditor = new FCKeditor('kurzbeschreibung') ;
-$sBasePath = '../../include/fckeditor/';
-
-$oFCKeditor->BasePath	= $sBasePath ;
-$oFCKeditor->Value		= $kurzbeschreibung;
-$oFCKeditor->Create() ;
-
-echo "
-	</td>
-</tr>
 <tr>
 	<td></td>
 	<td></td>
@@ -521,7 +513,7 @@ if(isset($uid) && $uid!='')
 	<legend>Benutzerdaten</legend>
 	";
 
-	$qry = "SELECT * FROM public.tbl_benutzer WHERE uid='".addslashes($uid)."'";
+	$qry = "SELECT * FROM public.tbl_benutzer WHERE uid=".$db->db_add_param($uid);
 	if(!$result_benutzer = $db->db_query($qry))
 		die('Fehler beim Auslesen der Benutzerdaten');
 
@@ -545,7 +537,6 @@ if(isset($uid) && $uid!='')
 	echo '<br><a href="../../content/pdfExport.php?xsl=AccountInfo&xml=accountinfoblatt.xml.php&uid='.$uid.'" >AccountInfoBlatt erstellen</a>';
 	echo '<br><a href="../stammdaten/betriebsmittel_frameset.php?searchstr='.$uid.'" >Betriebsmittel verwalten</a>';
 
-
 	echo "</fieldset></td></tr>";
 
 	if($is_mitarbeiter)
diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index 051b8f6d9..88e7ef4d8 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -504,7 +504,7 @@ if ($testende)
 
 				// Setzt "teilgenommen" (Zum Reihungstest angetreten) auf TRUE
 				$teilgenommen = new reihungstest();
-				$teilgenommen->getPersonReihungstest($prestudentrolle->person_id, $_POST['reihungstest_id']);
+				$teilgenommen->getPersonReihungstest($prestudentrolle->person_id, $_POST['reihungstest_id'], $prestudentrolle->studienplan_id);
 
 				$teilgenommen->new = false;
 				$teilgenommen->teilgenommen = true;
@@ -562,10 +562,10 @@ if ($testende)
 											<tr>
 												<td style="padding-left: 8%; padding-right: 8%; padding-top: 5%; padding-bottom: 5%; font-family: verdana, sans-serif; font-size: 1em; border-bottom: 2px solid #000000;">';
 									$mailtext .= 'Der Reihungstest vom ' . $datum_obj->convertISODate($reihungstest->datum) . ' um ' . $datum_obj->formatDatum($reihungstest->uhrzeit, 'H:i') . ' Uhr ist beendet.';
-									$mailtext .= '<br> Es haben <b>'.$anzahl.'</b> Person(en) aus dem Studiengang '.$stg->kuerzel.'-'.$orgForm.' teilgenommen';
-									$mailtext .= '<br> Sie finden die Auswertung unter dem folgendem Link:';
+									$mailtext .= '<br> Es haben <b>'.$anzahl.'</b> Person(en) aus dem Studiengang '.$stg->kuerzel.'-'.$orgForm.' teilgenommen.';
 									$mailtext .= '<br><br><a href="' . APP_ROOT . 'vilesci/stammdaten/auswertung_fhtw.php?reihungstest=' . $reihungstest->reihungstest_id . '&studiengang=' . $studiengang_kz . '&orgform_kurzbz=' . $orgForm . '">Link zur Auswertung</a>';
-
+									$mailtext .= '<br><br><a href="' . APP_ROOT . 'addons/reports/cis/vorschau.php?statistik_kurzbz=BewerberReihungstestPriorisierung&debug=true">Link zur Pivot-Tabelle für die Priorisierung</a>';
+									$mailtext .= '<br><br>Reihung der BewerberInnen: Prio 1 innerhalb von 2 Werktagen, Prio 2 am 3. Werktag und Prio 3 am 4. Werktag';
 									$mailtext .= '</td>
 											</tr>
 											<tr>
@@ -643,7 +643,7 @@ if (isset($_POST['method']) && $_POST['method'] == 'addPerson')
 			if ($row->bewerbung_abgeschicktamum != '' && $row->bestaetigtam != '' && $row->studienplan_id != '')
 			{
 				$studienplan = $row->studienplan_id;
-				$break;
+				break;
 			}
 		}
 
@@ -731,6 +731,7 @@ if ($punkteUebertragen)
 		{
 			foreach ($_POST['prestudentPunkteArr'] AS $key => $array)
 			{
+				$rtpunkte = number_format(floatval(str_replace(',', '.', $array['ergebnis'])), 4);
 				$prestudentrolle = new prestudent($array['prestudent_id']);
 				$prestudentrolle->getLastStatus($array['prestudent_id'], null, 'Interessent');
 
@@ -750,7 +751,7 @@ if ($punkteUebertragen)
 					if ($setRTPunkte->punkte == '')
 					{
 						$setRTPunkte->new = false;
-						$setRTPunkte->punkte = number_format(floatval($array['ergebnis']), 4);
+						$setRTPunkte->punkte = $rtpunkte;
 						$setRTPunkte->updateamum = date('Y-m-d H:i:s');
 						$setRTPunkte->updatevon = $user;
 
@@ -765,7 +766,7 @@ if ($punkteUebertragen)
 					}
 					else
 					{
-						$msg_warning .= '<br>Der Prestudent '.$array['prestudent_id'].' hat bereits Punkte eingetragen.';
+						$msg_warning .= '<br>Der Prestudent '.$array['prestudent_id'].' hat bereits Punkte für den Studienplan '.$prestudentrolle->studienplan_id.' eingetragen.';
 					}
 				}
 				else
@@ -778,6 +779,7 @@ if ($punkteUebertragen)
 					{
 						$ort_kurzbz = $setRTPunkte->ort_kurzbz;
 					}
+					$setRTPunkte = new reihungstest();
 					$setRTPunkte->getPersonReihungstest($prestudentrolle->person_id, $_POST['reihungstest_id'], $prestudentrolle->studienplan_id);
 
 					// Check, ob Punkte schon befüllt sind
@@ -787,9 +789,10 @@ if ($punkteUebertragen)
 						$setRTPunkte->person_id = $prestudentrolle->person_id;
 						$setRTPunkte->reihungstest_id = $_POST['reihungstest_id'];
 						$setRTPunkte->anmeldedatum = '';
+						$setRTPunkte->teilgenommen = true;
 						$setRTPunkte->ort_kurzbz = $ort_kurzbz;
 						$setRTPunkte->studienplan_id = $prestudentrolle->studienplan_id;
-						$setRTPunkte->punkte = number_format(floatval($array['ergebnis']), 4);
+						$setRTPunkte->punkte = $rtpunkte;
 						$setRTPunkte->insertamum = date('Y-m-d H:i:s');
 						$setRTPunkte->insertvon = $user;
 
@@ -804,7 +807,7 @@ if ($punkteUebertragen)
 					}
 					else
 					{
-						$msg_warning .= '<br>Der Prestudent '.$array['prestudent_id'].' hat bereits Punkte eingetragen.';
+						$msg_warning .= '<br>Der Prestudent '.$array['prestudent_id'].' hat bereits Punkte für den Studienplan '.$prestudentrolle->studienplan_id.' eingetragen.';
 					}
 				}
 
@@ -818,7 +821,7 @@ if ($punkteUebertragen)
 					if ($prestudent->punkte == '')
 					{
 						$prestudent->new = false;
-						$prestudent->punkte = number_format($array['ergebnis'], 4);
+						$prestudent->punkte = $rtpunkte;
 						$prestudent->reihungstestangetreten = true;
 						$setRTPunkte->updateamum = date('Y-m-d H:i:s');
 						$setRTPunkte->updatevon = $user;
@@ -1035,7 +1038,7 @@ function getMailEmpfaenger($studiengang_kz, $studienplan_id = null, $orgform_kur
 		return false;
 }
 
-$ergebnis = '';
+$ergebnis = array();
 $gebiet = array();
 $kategorie = array();
 $erg_kat = array();
@@ -1147,12 +1150,13 @@ if (isset($_REQUEST['reihungstest']))
 			tbl_gebiet.bezeichnung AS gebiet,
 			tbl_ablauf.reihung,
 			tbl_ablauf.studiengang_kz,
-			tbl_ablauf.semester
+			tbl_ablauf.semester,
+		    tbl_ablauf.gewicht
 		FROM PUBLIC.tbl_rt_person
 		JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
 		JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
 		JOIN PUBLIC.tbl_reihungstest rt ON (tbl_rt_person.rt_id = rt.reihungstest_id)
-		JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+		JOIN PUBLIC.tbl_prestudentstatus pss USING (prestudent_id)
 		JOIN public.tbl_studiengang ON (ps.studiengang_kz = tbl_studiengang.studiengang_kz)
 		LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 		LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
@@ -1194,6 +1198,21 @@ if (isset($_REQUEST['reihungstest']))
 	{
 		$query .= " AND ps.prestudent_id=" . $db->db_add_param($prestudent_id, FHC_INTEGER);
 	}
+	if ($orgform_kurzbz != '' && $studiengang != '')
+	{
+		$query .= " AND (tbl_ablauf.studienplan_id=(
+							SELECT studienplan_id FROM lehre.tbl_studienplan 
+							JOIN lehre.tbl_studienordnung USING (studienordnung_id) 
+							WHERE studiengang_kz=".$db->db_add_param($studiengang, FHC_INTEGER)."
+							AND tbl_studienplan.orgform_kurzbz = ".$db->db_add_param($orgform_kurzbz)."
+							AND tbl_studienplan.aktiv
+							AND tbl_studienordnung.status_kurzbz='approved'
+							AND ((SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=tbl_studienordnung.gueltigvon) <= now() 
+									OR tbl_studienordnung.gueltigvon IS NULL)
+							AND ((SELECT ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=tbl_studienordnung.gueltigbis) >= now() OR tbl_studienordnung.gueltigbis IS NULL)
+							ORDER BY studienplan_id DESC LIMIT 1)
+							OR tbl_ablauf.studienplan_id IS NULL)";
+	}
 	//$query .= " AND nachname='Al-Mafrachi'";
 	$query .= " ORDER BY tbl_ablauf.studiengang_kz, tbl_ablauf.semester, reihung";
 
@@ -1209,6 +1228,11 @@ if (isset($_REQUEST['reihungstest']))
 		}
 		$gebiet[$row->gebiet_id]->name = $row->gebiet;
 		$gebiet[$row->gebiet_id]->gebiet_id = $row->gebiet_id;
+		//gewicht ist meist für alle Studiengänge gleich (Bachelor, Master und Distance haben jeweilsandere Gebiete)
+		if (!isset($gebiet[$row->gebiet_id]->gewicht))
+		{
+			$gebiet[$row->gebiet_id]->gewicht = $row->gewicht;
+		}
 	}
 
 	// Alle Ergebnisse laden
@@ -1222,6 +1246,7 @@ if (isset($_REQUEST['reihungstest']))
 			tbl_studiengang.bezeichnung AS stg_bez,
 			tbl_studienplan.orgform_kurzbz,
 			tbl_gebiet.maxpunkte,
+		    tbl_gebiet.offsetpunkte,            
 			tbl_prestudentstatus.ausbildungssemester,
 			tbl_ablauf.gewicht,
 			tbl_ort.planbezeichnung AS raum,
@@ -1313,6 +1338,7 @@ if (isset($_REQUEST['reihungstest']))
 											AND studiensemester_kurzbz = rt.studiensemester_kurzbz
 										ORDER BY registriert DESC LIMIT 1
 										)
+						    	ORDER BY registriert DESC LIMIT 1
 								)
 							AND testtool.tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
 						)
@@ -1398,13 +1424,17 @@ if (isset($_REQUEST['reihungstest']))
 	}
 	if ($orgform_kurzbz != '')
 	{
+		//$query .= " AND tbl_prestudentstatus.orgform_kurzbz=" . $db->db_add_param($orgform_kurzbz);
+		//$query .= " AND tbl_ablauf.studienplan_id = tbl_prestudentstatus.studienplan_id";
+		//$query .= " AND tbl_ablauf.studienplan_id = 5";
 		$query .= " AND tbl_studienplan.orgform_kurzbz=" . $db->db_add_param($orgform_kurzbz);
 	}
 	//$query .= " AND nachname='Al-Mafrachi'";
 	$query .= " ORDER BY nachname,
 				vorname,
 				person_id	
-	";//var_dump($query);
+	";/*print_r($query);*/
+	//echo '<pre>', var_dump($query), '</pre>';
 	if (!($result = $db->db_query($query)))
 	{
 		die($db->db_last_error());
@@ -1447,19 +1477,6 @@ if (isset($_REQUEST['reihungstest']))
 		}
 
 		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->name = $row->gebiet;
-		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punkte = (($row->punkte >= $row->maxpunkte) ? $row->maxpunkte : $row->punkte);
-		if ($row->punkte == 0 && $row->punkte != '')
-		{
-			$prozent = '0';
-		}
-		elseif ($row->punkte >= $row->maxpunkte) //wenn maxpunkte ueberschritten wurde -> 100%
-		{
-			$prozent = 100;
-		}
-		else
-		{
-			$prozent = ($row->punkte / $row->maxpunkte) * 100;
-		}
 
 		if ($row->punkte >= $row->maxpunkte)
 		{
@@ -1470,8 +1487,27 @@ if (isset($_REQUEST['reihungstest']))
 			$punkte = $row->punkte;
 		}
 
-		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent = $prozent;
+		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent = null;
 		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punkte = $punkte;
+		$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punktemitoffset = null;
+
+		// Punkte berechnen
+		if (isset($punkte))
+		{
+			//offset zur Vermeidung negativer Prozentzahlen
+			$punkte_positiv = $punkte + $row->offsetpunkte;
+			$maxpunkte_positiv = $row->maxpunkte + $row->offsetpunkte;
+			$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punktemitoffset = $punkte_positiv;
+
+			if ($row->punkte >= $row->maxpunkte)
+			{
+				$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent = 100;
+			}
+			else
+			{
+				$ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent = $maxpunkte_positiv > 0 ? $punkte_positiv / $maxpunkte_positiv * 100 : null;
+			}
+		}
 
 		// Bei Auswertungen ohne rt_id kann es vorkommen, dass Datensätze Doppelt sind
 		// Bei der Summe darf ein Gebiet jedenfalls nur einmal summiert werden
@@ -1480,14 +1516,14 @@ if (isset($_REQUEST['reihungstest']))
 		{
 			$gebiete_arr[$row->prestudent_id][] = $row->gebiet_id;
 
-			// Gesamtpunkte mit Physik
+			// Gesamtpunkte
 			if (isset($ergebnis[$row->prestudent_id]->gesamt))
 			{
-				$ergebnis[$row->prestudent_id]->gesamt += $prozent * $row->gewicht;
+				$ergebnis[$row->prestudent_id]->gesamt += $ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent * $row->gewicht;
 			}
 			else
 			{
-				$ergebnis[$row->prestudent_id]->gesamt = $prozent * $row->gewicht;
+				$ergebnis[$row->prestudent_id]->gesamt = $ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->prozent * $row->gewicht;
 			}
 
 			if (isset($ergebnis[$row->prestudent_id]->gesamtpunkte))
@@ -1499,30 +1535,36 @@ if (isset($_REQUEST['reihungstest']))
 				$ergebnis[$row->prestudent_id]->gesamtpunkte = $punkte;
 			}
 
-			// Gesamtpunkte ohne Physik
-			if ($row->gebiet_id != 10)
+			if (isset($ergebnis[$row->prestudent_id]->gesamtoffsetpunkte))
 			{
-				if (isset($ergebnis[$row->prestudent_id]->gesamt_ohne_physik))
-				{
-					$ergebnis[$row->prestudent_id]->gesamt_ohne_physik += $prozent * $row->gewicht;
-				}
-				else
-				{
-					$ergebnis[$row->prestudent_id]->gesamt_ohne_physik = $prozent * $row->gewicht;
-				}
+				$ergebnis[$row->prestudent_id]->gesamtoffsetpunkte += $ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punktemitoffset;
+			}
+			else
+			{
+				$ergebnis[$row->prestudent_id]->gesamtoffsetpunkte = $ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]->punktemitoffset;
+			}
 
-				if (isset($ergebnis[$row->prestudent_id]->gesamtpunkte_ohne_physik))
+			if (isset($row->punkte))
+			{
+				if (isset($ergebnis[$row->prestudent_id]->gesamtgewicht))
 				{
-					$ergebnis[$row->prestudent_id]->gesamtpunkte_ohne_physik += $punkte;
+					$ergebnis[$row->prestudent_id]->gesamtgewicht += $row->gewicht;
 				}
 				else
 				{
-					$ergebnis[$row->prestudent_id]->gesamtpunkte_ohne_physik = $punkte;
+					$ergebnis[$row->prestudent_id]->gesamtgewicht = $row->gewicht;
 				}
 			}
 		}
 	}
 
+	foreach ($ergebnis as $prestudentid => $erg)
+	{
+		//Berechnen Gesamtpunkte nach Formel: Summe(Punkte/Maxpunkte * Gewicht)/Summe(Gewichte) * 100
+		if (isset($erg->gesamtgewicht) && $erg->gesamtgewicht > 0)
+			$erg->gesamt /= $erg->gesamtgewicht;
+	}
+
 	$ergb = $ergebnis;
 }
 
@@ -1567,7 +1609,7 @@ if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'xls')
 	// Eigener TItel bei Bachelor-Studiengängen
 	if (isset($studiengangObj) && $studiengangObj->typ == 'b')
 	{
-		$worksheet =& $workbook->addWorksheet("Auswertung MIT Physik " . ($titel_studiengang ? $stg_arr[$_REQUEST['studiengang']] : '') . ($titel_semester ? ' ' . $semester . '.Semester' : ''));
+		$worksheet =& $workbook->addWorksheet("Auswertung " . ($titel_studiengang ? $stg_arr[$_REQUEST['studiengang']] : '') . ($titel_semester ? ' ' . $semester . '.Semester' : ''));
 	}
 	else
 	{
@@ -1659,32 +1701,33 @@ if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'xls')
 	$worksheet->mergeCells(0, 12, 1, 12);
 	$maxlength[12] = 20;
 
-	$spalte = 11;
+	$spalte = 12;
 	$zeile = 0;
 
 	foreach ($gebiet AS $gbt)
 	{
-		++$spalte;
-		$worksheet->write($zeile, ++$spalte, strip_tags($gbt->name), $format_bold_border);
-		$worksheet->mergeCells($zeile, $spalte, 0, $spalte + 1);
-		$maxlength[$spalte] = 10;
+		$worksheet->write($zeile, ++$spalte, strip_tags($gbt->name) . (	isset($gbt->gewicht) ? " (Gew: $gbt->gewicht)" : ""), $format_bold_border);
+		$worksheet->mergeCells($zeile, $spalte, 0, $spalte + 2);
+		$spalte += 2;
 	}
-	$worksheet->write($zeile, ++$spalte + 1, 'Gesamt', $format_bold_border);
-	$worksheet->mergeCells($zeile, ++$spalte, 0, $spalte + 1);
-	$maxlength[$spalte] = 12;
+	$worksheet->write($zeile, ++$spalte, 'Gesamt', $format_bold_border);
+	$worksheet->mergeCells($zeile, $spalte, 0, $spalte + 2);
 
 	$spalte = 12;
 	$zeile = 0;
 
 	foreach ($gebiet AS $gbt)
 	{
+		$maxlength[$spalte +1] = $maxlength[$spalte + 2] = $maxlength[$spalte + 3] = 14;
 		$worksheet->write($zeile + 1, ++$spalte, 'Punkte', $format_bold_border);
+		$worksheet->write($zeile + 1, ++$spalte, 'Punkte + Offset', $format_bold_border);
 		$worksheet->write($zeile + 1, ++$spalte, 'Prozent', $format_bold_border);
-		$maxlength[$spalte] = 10;
 	}
+	$maxlength[$spalte +1] = $maxlength[$spalte + 2] = 14;
+	$maxlength[$spalte + 3] = 17;
 	$worksheet->write($zeile + 1, ++$spalte, 'Punkte', $format_bold_border);
-	$worksheet->write($zeile + 1, ++$spalte, 'Prozent', $format_bold_border);
-	$maxlength[$spalte] = 10;
+	$worksheet->write($zeile + 1, ++$spalte, 'Punkte + Offset', $format_bold_border);
+	$worksheet->write($zeile + 1, ++$spalte, 'Prozent (gewichtet)', $format_bold_border);
 
 	$maxspalten = $spalte;
 
@@ -1729,6 +1772,14 @@ if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'xls')
 					{
 						$worksheet->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->punkte, $format_punkte_rot);
 					}
+					if ($erg->gebiet[$gbt->gebiet_id]->punktemitoffset != '' && $erg->gebiet[$gbt->gebiet_id]->punktemitoffset != '0')
+					{
+						$worksheet->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->punktemitoffset, $format_punkte);
+					}
+					else
+					{
+						$worksheet->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->punktemitoffset, $format_punkte_rot);
+					}
 					if ($erg->gebiet[$gbt->gebiet_id]->prozent != '0%')
 					{
 						$worksheet->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->prozent / 100, $format_prozent);
@@ -1742,10 +1793,12 @@ if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'xls')
 				{
 					$worksheet->write($zeile, ++$spalte, '');
 					$worksheet->write($zeile, ++$spalte, '');
+					$worksheet->write($zeile, ++$spalte, '');
 				}
 			}
 			$worksheet->writeNumber($zeile, ++$spalte, $erg->gesamtpunkte, $format_punkte);
-			$worksheet->writeNumber($zeile, ++$spalte, $erg->gesamt, $format_punkte);
+			$worksheet->writeNumber($zeile, ++$spalte, $erg->gesamtoffsetpunkte, $format_punkte);
+			$worksheet->writeNumber($zeile, ++$spalte, $erg->gesamt / 100, $format_prozent);
 		}
 	}
 
@@ -1755,165 +1808,6 @@ if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'xls')
 		$worksheet->setColumn($i, $i, $breite);
 	}
 
-	// Worksheet ohne Physik nur für Bachelor-Studiengänge
-	if (isset($studiengangObj) && $studiengangObj->typ == 'b')
-	{
-		$worksheetOhnePhsyik =& $workbook->addWorksheet("Auswertung OHNE Physik " . ($titel_studiengang ? $stg_arr[$_REQUEST['studiengang']] : '') . ($titel_semester ? ' ' . $semester . '.Semester' : ''));
-		$worksheetOhnePhsyik->setInputEncoding('utf-8');
-		$worksheetOhnePhsyik->setZoom(85);
-
-		$spalte = 0;
-		$zeile = 0;
-
-		$worksheetOhnePhsyik->write(0, $spalte, 'PrestudentIn_ID', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 0, 1, 0);
-		$maxlength[0] = 15;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'Nachname', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 1, 1, 1);
-		$maxlength[1] = 15;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'Vorname', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 2, 1, 2);
-		$maxlength[2] = 15;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'GebDatum', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 3, 1, 3);
-		$maxlength[3] = 10;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'G', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 4, 1, 4);
-		$maxlength[4] = 2;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'Registriert', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 5, 1, 5);
-		$maxlength[5] = 18;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'STG', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 6, 1, 6);
-		$maxlength[6] = 4;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'Studiengang', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 7, 1, 7);
-		$maxlength[7] = 25;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'S', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 8, 1, 8);
-		$maxlength[8] = 2;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'OrgForm', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 9, 1, 9);
-		$maxlength[9] = 8;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'Prio', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 10, 1, 10);
-		$maxlength[10] = 5;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'ZGV', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 11, 1, 11);
-		$maxlength[11] = 20;
-		$worksheetOhnePhsyik->write(0, ++$spalte, 'ZGV MA', $format_bold);
-		$worksheetOhnePhsyik->mergeCells(0, 12, 1, 12);
-		$maxlength[12] = 20;
-
-		$spalte = 11;
-		$zeile = 0;
-
-		foreach ($gebiet AS $gbt)
-		{
-			if ($gbt->gebiet_id == 10)
-			{
-				continue;
-			}
-			++$spalte;
-			$worksheetOhnePhsyik->write($zeile, ++$spalte, strip_tags($gbt->name), $format_bold_border);
-			$worksheetOhnePhsyik->mergeCells($zeile, $spalte, 0, $spalte + 1);
-			$maxlength[$spalte] = 10;
-		}
-		$worksheetOhnePhsyik->write($zeile, ++$spalte + 1, 'Gesamt', $format_bold_border);
-		$worksheetOhnePhsyik->mergeCells($zeile, ++$spalte, 0, $spalte + 1);
-		$maxlength[$spalte] = 12;
-
-		$spalte = 12;
-		$zeile = 0;
-
-		foreach ($gebiet AS $gbt)
-		{
-			if ($gbt->gebiet_id == 10)
-			{
-				continue;
-			}
-			$worksheetOhnePhsyik->write($zeile + 1, ++$spalte, 'Punkte', $format_bold_border);
-			$worksheetOhnePhsyik->write($zeile + 1, ++$spalte, 'Prozent', $format_bold_border);
-			$maxlength[$spalte] = 10;
-		}
-		$worksheetOhnePhsyik->write($zeile + 1, ++$spalte, 'Punkte', $format_bold_border);
-		$worksheetOhnePhsyik->write($zeile + 1, ++$spalte, 'Prozent', $format_bold_border);
-		$maxlength[$spalte] = 10;
-
-		$maxspalten = $spalte;
-
-		$zeile = 1;
-		$spalte = 0;
-
-		if (isset($ergb))
-		{
-			foreach ($ergb AS $erg)
-			{
-				$zeile++;
-				$spalte = 0;
-				$worksheetOhnePhsyik->write($zeile, $spalte, $erg->prestudent_id);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->nachname);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->vorname);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->gebdatum, $format_date);
-				if ($erg->geschlecht == 'm')
-				{
-					$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->geschlecht, $format_male);
-				}
-				else
-				{
-					$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->geschlecht, $format_female);
-				}
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->registriert, $format_registriert);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->stg_kurzbz);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->stg_bez);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->ausbildungssemester);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->orgform);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $erg->prioritaet);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $zgv_arr[$erg->zgv]);
-				$worksheetOhnePhsyik->write($zeile, ++$spalte, $zgvma_arr[$erg->zgvma]);
-				foreach ($gebiet AS $gbt)
-				{
-					if ($gbt->gebiet_id == 10)
-					{
-						continue;
-					}
-					if (isset($erg->gebiet[$gbt->gebiet_id]))
-					{
-						if ($erg->gebiet[$gbt->gebiet_id]->punkte != '' && $erg->gebiet[$gbt->gebiet_id]->punkte != '0')
-						{
-							$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->punkte, $format_punkte);
-						}
-						else
-						{
-							$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->punkte, $format_punkte_rot);
-						}
-						if ($erg->gebiet[$gbt->gebiet_id]->prozent != '0%')
-						{
-							$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->prozent / 100, $format_prozent);
-						}
-						else
-						{
-							$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gebiet[$gbt->gebiet_id]->prozent / 100, $format_prozent_rot);
-						}
-					}
-					else
-					{
-						$worksheetOhnePhsyik->write($zeile, ++$spalte, '');
-						$worksheetOhnePhsyik->write($zeile, ++$spalte, '');
-					}
-				}
-				$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gesamtpunkte_ohne_physik, $format_punkte);
-				$worksheetOhnePhsyik->writeNumber($zeile, ++$spalte, $erg->gesamt_ohne_physik, $format_punkte);
-			}
-		}
-
-		//Die Breite der Spalten setzen
-		foreach ($maxlength as $i => $breite)
-		{
-			$worksheetOhnePhsyik->setColumn($i, $i, $breite);
-		}
-	}
-
 	if (isset($erg_kat) && count($erg_kat) > 0)
 	{
 		// Creating second worksheet
@@ -2104,12 +1998,23 @@ else
 		$("#auswertung_table").tablesorter(
 		{			
 			widgets: ["zebra", "filter", "columnSelector"],
-			sortList: [[16,1],[3,0],[4,0]],
-			headers: {0: { sorter: false, filter: false}, 2: { sorter: false, filter: false}, 4: { dateFormat: "ddmmyyyy" }}
+			sortList: [[15,1],[18,1],[3,0],[4,0]],//16th (index 15) fake hidden column for correct sort with colspan
+			headers: {0: { sorter: false, filter: false}, 2: { sorter: false, filter: false}, 4: { dateFormat: "ddmmyyyy" }, 15: { sorter: false, filter: false}}
 			/*widgetOptions : {
 				columnSelector_container : $("#columnSelector"),
 				columnSelector_saveColumns: true}			*/
 		});
+		
+		//hide tablesorter filter field if column is hidden
+		for (var i = 0; i < $("#auswertung_table tbody tr:nth-child(1) td").length; i++)
+		{
+			var colnr = i + 1;
+			var cell = $("#auswertung_table tbody tr:nth-child(1) td:nth-child(" + colnr + ")");
+			if (cell.css("display") === "none")
+			{
+				$("#auswertung_table tr.tablesorter-filter-row td:nth-child(" + colnr + ")").css("display", "none");
+			}
+		}
 		/*$.tablesorter.columnSelector.attachTo( $("#auswertung_table"), "#popover-target");*/
 		
 		/*$("#columnSelector").popover(
@@ -2263,7 +2168,7 @@ else
 					}
 					else
 					{
-						$("#row_"+prestudent_id).find("td.punkte, td.col_gesamtpunkte_ohne_physik").each (function() 
+						$("#row_"+prestudent_id).find("td.punkte, td.col_gesamtpunkte").each (function() 
 						{
 						  $(this).html("");
 						});
@@ -2434,7 +2339,7 @@ else
 	function checkAllWithResult()
 	{
 		// Schleife ueber die einzelnen Elemente
-		$(".col_gesamtpunkte_ohne_physik").each(function()
+		$(".col_gesamtpunkte").each(function()
 		{
 			if ($(this).text().trim() !== "")
 			{
@@ -2469,20 +2374,10 @@ else
 		{
 			$("input.prestudentCheckbox:checked").each(function() 
 			{
-				if ($("#uebertragenOptionPhysik:checked").length === 1)
-				{
-					prestudentPunkteArr.push({
-			            prestudent_id: $(this).attr("name"), 
-						ergebnis:  $(this).parents("tr").find(".erg_gesamt_mit_physik").text()
-			        });
-				}
-				else
-				{
-					prestudentPunkteArr.push({
-			            prestudent_id: $(this).attr("name"), 
-						ergebnis:  $(this).parents("tr").find(".erg_gesamt_ohne_physik").text()
-			        });
-				}
+				prestudentPunkteArr.push({
+					prestudent_id: $(this).attr("name"), 
+					ergebnis:  $(this).parents("tr").find(".erg_gesamt").text()
+				});
 		    });
 		    
 			$(".loaderIcon").show();
@@ -2518,6 +2413,10 @@ else
 						$("#msgbox").show();
 						$("#msgbox").append(data["msg_success"]);
 					}
+					else
+					{
+						$(".loaderIcon").hide();
+					}
 					if(data["msg_warning"] !== "")
 					{
 						$("#msgbox").attr("class","alert alert-warning");
@@ -2526,6 +2425,10 @@ else
 						$("#msgbox").append(data["msg_warning"]);
 						//$("#msgbox").html(data["msg"]).delay(2000).fadeOut();
 					}
+					else
+					{
+						$(".loaderIcon").hide();
+					}
 					if(data["msg_error"] !== "")
 					{
 						$("#msgbox").attr("class","alert alert-danger");
@@ -2533,6 +2436,10 @@ else
 						$("#msgbox").show();
 						$("#msgbox").append(data["msg_error"]);
 					}
+					else
+					{
+						$(".loaderIcon").hide();
+					}
 				},
 				error: function(data)
 				{
@@ -2814,9 +2721,6 @@ else
 	echo '	<form class="form" role="form">
 			<div class="panel panel-default" id="uebertragenOptions" style="display: none">
 			 <div class="panel-body">
-				 <div class="checkbox">
-				  <label><input type="checkbox" id="uebertragenOptionPhysik" value="">Mit Physik</label>
-				</div>
 				<div class="checkbox">
 				  <label><input type="checkbox" id="uebertragenOptionGesamtpunkte" value="">"Gesamtpunkte" und "Reihungsverfahren absolviert" setzen</label>
 				</div>
@@ -2903,24 +2807,25 @@ else
 				<th title="Priorität" rowspan="2" style="width: 20px">Prio</th>
 				<th rowspan="2">Raum</th>
 				<th title="Teilgenommen" rowspan="2">TG</th>
-				<th colspan="2">Gesamt mit Physik</th>
-				<th colspan="2">Gesamt ohne Physik</th>';
+				<th style="display: none"></th>
+				<th colspan="3">Gesamt</th>';
 
 		foreach ($gebiet AS $gbt)
 		{
-			echo '<th colspan="2">' . $gbt->name . '</th>';
+			echo '<th colspan="3">' . $gbt->name . '</th>';
 		}
 
 		echo '</tr>
 			<tr>
+				<th style="display: none"></th>
 				<th><small>Punkte</small></th>
-				<th><small>Prozent</small></th>
-				<th><small>Punkte</small></th>
-				<th><small>Prozent</small></th>';
+				<th><small>Punkte mit Offset</small></th>
+				<th><small>Prozent (gewichtet)</small></th>';
 
 		foreach ($gebiet AS $gbt)
 		{
 			echo "<th><small>Punkte</small></th>";
+			echo "<th><small>Punkte mit Offset</small></th>";
 			echo "<th><small>Prozent</small></th>";
 		}
 
@@ -2957,6 +2862,8 @@ else
 						<td class='".$inaktiv."'>$erg->raum</td>
 						<td class='".$inaktiv."'>".($erg->teilgenommen == true ? "<span class='glyphicon glyphicon-ok'></span>" : "")."</td>";
 				//<td>$erg->idnachweis</td>
+				$gesamtprozent = ($erg->gesamt != '' ? number_format($erg->gesamt, 2, ',', ' ') . ' %': '');
+				echo '<td style="display: none">'. $gesamtprozent .'</td>';
 				echo '	<td style="text-align: right; padding-right: 3px" class="punkte '.$inaktiv.'" nowrap>';
 				// Punkte können nur gelöscht werden, solange "Zum Reihungstest angetreten" nicht gesetzt ist
 				if ($erg->teilgenommen == false || $rechte->isBerechtigt('admin'))
@@ -2973,25 +2880,16 @@ else
 					echo '  <span class=""><b>' . ($erg->gesamtpunkte != '' ? number_format($erg->gesamtpunkte, 2, ',', ' ') : '') . '</b></span>';
 				}
 				echo '	</td>';
-				if (!isset($erg->gesamtpunkte_ohne_physik))
-				{
-					$erg->gesamtpunkte_ohne_physik = '';
-				}
-				if (!isset($erg->gesamt_ohne_physik))
-				{
-					$erg->gesamt_ohne_physik = '';
-				}
-				echo '	<td style="text-align: right; padding-right: 3px" class="punkte '.$inaktiv.'" nowrap>
-							<b>' . ($erg->gesamt != '' ? number_format($erg->gesamt, 2, ',', ' ') : '') . '</b>
-							<span class="erg_gesamt_mit_physik" style="display: none">'.$erg->gesamt.'</span>
+
+				echo '	<td style="text-align: right; padding-right: 3px" class="col_gesamtpunkte_mit_offset '.$inaktiv.'" nowrap>
+							<b>' . ($erg->gesamtoffsetpunkte != '' ? number_format($erg->gesamtoffsetpunkte, 2, ',', ' ') : '') . '</b>
 						</td>';
-				echo '	<td style="text-align: right; padding-right: 3px" class="col_gesamtpunkte_ohne_physik '.$inaktiv.'" nowrap>
-							<b>' . ($erg->gesamtpunkte_ohne_physik != '' ? number_format($erg->gesamtpunkte_ohne_physik, 2, ',', ' ') : '') . '</b>
-						</td>';
-				echo '	<td style="text-align: right; padding-right: 3px" class="punkte '.$inaktiv.'" nowrap>
-							<b>' . ($erg->gesamt_ohne_physik != '' ? number_format($erg->gesamt_ohne_physik, 2, ',', ' ') : '') . '</b>
-							<span class="erg_gesamt_ohne_physik" style="display: none">'.$erg->gesamt_ohne_physik.'</span>
+
+				echo '	<td style="text-align: right; padding-right: 3px" class="col_gesamtpunkte punkte '.$inaktiv.'" nowrap>
+							<b>' . $gesamtprozent . '</b>
+							<span class="erg_gesamt" style="display: none">'.$erg->gesamt.'</span>
 						</td>';
+
 				foreach ($gebiet AS $gbt)
 				{
 					if (isset($erg->gebiet[$gbt->gebiet_id]))
@@ -3023,11 +2921,12 @@ else
 							echo '  <span class="">' . ($erg->gebiet[$gbt->gebiet_id]->punkte != '' ? number_format($erg->gebiet[$gbt->gebiet_id]->punkte, 2, ',', ' ') : '') . '</span>';
 						}
 						echo '</td>';
+						echo '<td ' . $style . ' class="pst_' . $erg->prestudent_id . '_gbt_' . $gbt->gebiet_id . ' punkte '.$inaktiv.'" nowrap>' . ($erg->gebiet[$gbt->gebiet_id]->punktemitoffset != '' ? number_format($erg->gebiet[$gbt->gebiet_id]->punktemitoffset, 2, ',', ' ') : '') . '</td>';
 						echo '<td ' . $style . ' class="pst_' . $erg->prestudent_id . '_gbt_' . $gbt->gebiet_id . ' punkte '.$inaktiv.'" nowrap>' . ($erg->gebiet[$gbt->gebiet_id]->prozent != '' ? number_format($erg->gebiet[$gbt->gebiet_id]->prozent, 2, ',', ' ') . ' %' : '') . '</td>';
 					}
 					else
 					{
-						echo '<td></td><td></td>';
+						echo '<td></td><td></td><td></td>';
 					}
 				}
 
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index c367d362b..4db82d102 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -2553,7 +2553,7 @@ echo '<table width="100%"><tr><td>';
 if($reihungstest_id!='')
 {
 	echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&excel=true">Excel Export</a>';
-	echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
+	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
 }
 if (defined('CAMPUS_NAME') && CAMPUS_NAME == 'FH Technikum Wien')