code cleanup

parameterized server/user/pw for both browser url calls & cli calls;
2026-10-12 15:04:04 +00:00 · 2025-07-15 09:43:38 +02:00 · 2025-07-14 17:04:56 +02:00 · 2025-07-14 16:47:41 +02:00 · 2025-07-14 15:44:27 +02:00 · 2025-06-10 11:56:11 +02:00
1188 changed files with 18823 additions and 154628 deletions
@@ -1,6 +1,5 @@
 documents/
 vendor/
-public/vendor

 /nbproject/
 .vscode
@@ -1,36 +0,0 @@
-<?php
-$filterCmptArray = array(
-	"app" => 'core',
-	'datasetName' => 'vertragsverwaltung',
-	'query' =>  '
-		SELECT
-			uid,
-			person_id,
-			vorname,
-			nachname,
-			gebdatum,
-			vertragsarten,
-			unternehmen,
-			ids,
-			aktiv
-		FROM
-			(
-			SELECT
-				b.uid , p.person_id,
-				p.vorname, p.nachname,
-				gebdatum,
-				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
-				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
-				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				b.aktiv
-			FROM
-				hr.tbl_dienstverhaeltnis d
-				JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-				JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-				JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.aktiv
-			) as vertragsdaten
-		',
-	'requiredPermissions' => 'vertrag/mitarbeiter'
-	);
@@ -3,44 +3,12 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');

 use CI3_Events as Events;

-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["slot_room"] = array(
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["ferien"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-
-
+/**
+ * NOTE(chris): example:
+	Events::on('stv_conf_student', function (&$res) {
+		$res['test'] = [
+			'title' => 'TEST',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+	});
+ */
@@ -1,56 +0,0 @@
-<?php
-
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start';
-
-$config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
-
-$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
-// used as APP_ROOT.URL_STUDENTS -> cis4
-$config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
-// used as APP_ROOT.URL_MITARBEITER -> old cis 
-$config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
-// used as APP_ROOT.URL_MITARBEITER -> old cis 
-$config['URL_ASSISTENZ'] = 'index.ci.php/Cis/Abgabetool/Assistenz';
-
-// lehre.tbl_paabgabetyp bezeichnung
-//$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
-$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['abstract','zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
-// paabgabetypen for which betreuer is benachrichtigt via sammelmail
-$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER'] = ['qualgate1', 'qualgate2', 'end'];
-// paabgabetypen for which assistenz is benachrichtigt via sammelmail
-$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ'] = ['end'];
-// paabgabetypen for which student is benachrichtigt via sammelmail -> basically all of them but still defined for consistency
-$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT'] = ['qualgate1', 'qualgate2', 'zwischen', 'note', 'abstract', 'end', 'enda'];
-//$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
-$config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
-// benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
-// wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
-$config['NONFINAL_NOTEN_ABGABETOOL'] = [9];
-$config['beurteilung_link_fallback'] = 'cis/private/lehre/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
-
-$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
-$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
-
-$config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
-
-// to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
-$config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
-// TODO: check if these links change if the file changes and how to better retrieve the link?
-$config['SIGNATUR_INFO_LINK_GERMAN'] = 'https://cis.technikum-wien.at/cms/dms.php?id=214779'; 
-$config['SIGNATUR_INFO_LINK_ENGLISH'] = 'https://cis.technikum-wien.at/cms/dms.php?id=264256';
-
-$config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
-$config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
-
-$config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;
-
-$config['MULTIEDIT_TABLE'] = true;
-
-$config['STUDENT_EDIT_PROJEKTARBEIT_TITLE'] = true;
-
-$config['CONFETTI_ON_ENDUPLOAD'] = true;
-
-
@@ -1,6 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// Define configuration parameters
-$config['timezone'] = 'Europe/Vienna';
@@ -4,12 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');


 // CMS Content Id for CIS4 Menu Root
-$config['cis_menu_root_content_id'] = 11091;
+$config['cis_menu_root_content_id'] = 11087;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
-// Vilesci CI BaseUrl
-$config['cis_vilesci_base_url'] = defined('VILESCI_ROOT') ? VILESCI_ROOT : APP_ROOT;
-$config['cis_vilesci_index_page'] = 'index.ci.php';
-// Cis CI BaseUrl
-$config['cis_base_url'] = defined('CIS_ROOT') ? CIS_ROOT : APP_ROOT;
-$config['cis_index_page'] = 'cis.php';
@@ -3,4 +3,3 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');

 $config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
-$config['infocenter_qualifikationskurs_kz'] = '10002';
@@ -1,11 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// apps for which issues should be displayed
-$config['issues_list_apps'] = array('core', 'dvuh');
-
-// functions which enable users to see issues
-$config['issues_list_functions'] = array('ass');
-
-// functions which enable users to see issues
-$config['issues_list_status'] = array('Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent');
@@ -4,9 +4,4 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 // use vuejs dev version
 $config['use_vuejs_dev_version'] = false;
 // use bundled javascript
-$config['use_bundled_javascript'] = false;
-// systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered
-$config['systemerror_mailto'] = '';
-// use fhcomplete_build_version as path element after public (requires apache mod_rewrite)
-// see <fhc_base_dir>/public/.htaccess_sample for details
-$config['use_fhcomplete_build_version_in_path'] = false;
+$config['use_bundled_javascript'] = false;
@@ -1,22 +0,0 @@
-<?php
-
-/*It defines which tags are available in LVVerwaltung and whether they are editable
-
-$config['lvverwaltung_tags'] = [
-	'tag_1' => ['readonly' => false],
-	'tag_1' => ['readonly' => true]
-];
-*/
-
-$config['lvverwaltung_tags'] = [];
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		// NOTE: 'default' & 'joins' like in stv.php config are currently not available here
-	]
-];
-*/
-
@@ -64,7 +64,7 @@ $config['navigation_header'] = array(
 				'lehrveranstaltungen' => array(
 					'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
 					'icon' => '',
-					'description' => 'Lehrveranstaltungen Templates',
+					'description' => 'Lehrveranstaltungen',
 					'sort' => 15
 				),
 				'reihungstest' => array(
@@ -81,16 +81,6 @@ $config['navigation_header'] = array(
 					'sort' => 30,
 					'requiredPermissions' => 'infocenter:r'
 				),
-				'lvverwaltung' => array(
-					'link' => site_url('LVVerwaltung'),
-					'icon' => '',
-					'description' => 'LV Verwaltung',
-					'requiredPermissions' => array(
-						'admin:r',
-						'assistenz:r'
-					),
-					'sort' => 35
-				),
 				'lehrauftrag' => array(
 					'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
 					'description' => 'Lehrauftrag',
@@ -103,7 +93,7 @@ $config['navigation_header'] = array(
 				),
 				'zverfueg' => array(
 					'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
-					'description' => 'Zeitverfügbarkeit',
+					'description' => 'Zeitverf&uuml;gbarkeit',
 					'expand' => true,
 					'sort' => 45,
 					'requiredPermissions' => array(
@@ -163,20 +153,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
-				),
-				'vertragsverwaltung' => array(
-					'link' => site_url('vertragsverwaltung'),
-					'description' => 'Vertragsverwaltung',
-					'expand' => true,
-					'sort' => 51,
-					'requiredPermissions' => 'vertrag/mitarbeiter:r'
-				),
-				'studierendenverwaltung' => array(
-					'link' => site_url('studentenverwaltung'),
-					'description' => 'Studierendenverwaltung',
-					'expand' => true,
-					'sort' => 52,
-					'requiredPermissions' => ['admin:r', 'assistenz:r']
 				)
 			)
 		),
@@ -215,14 +191,7 @@ $config['navigation_header'] = array(
                    'expand' => true,
                    'sort' => 30,
                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)
@@ -356,37 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-
-);
-
-$config['navigation_menu']['vertragsverwaltung/*'] = array(
-	'vertragsverwaltung' => array(
-		'link' => site_url('vertragsverwaltung'),
-		'description' => 'Vertragsverwaltung',
-		'icon' => 'home',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('vertrag/mitarbeiter:r')
-	)
-);
-
-$config['navigation_menu']['apps'] = [
-	'stv' => [
-		'link' => site_url('studentenverwaltung'),
-		'description' => 'Studierendenverwaltung',
-		#'icon' => 'users',
-		'requiredPermissions' => array('admin:r', 'assistenz:r')
-	],
-	'lvv' => [
-		'link' => site_url('lVVerwaltung'),
-		'description' => 'LV Verwaltung',
-		#'icon' => 'person-chalkboard',
-		'requiredPermissions' => array('admin:r', 'assistenz:r')
-	],
-	'lav' => [
-		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
-		'description' => 'Lehrauftragsverwaltung',
-		#'icon' => 'person-chalkboard',
-		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
-	]
-];
+);
@@ -1,64 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// Noten die keinen Prüfungsantritt verbrauchen. Fallback-PKs; massgeblich sind die per Bezeichnung
-// aufgelösten Noten (NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN), da die PKs je Installation abweichen.
-$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk
-
-// 'Nicht beurteilt' ist eine Altlast: formal eine Note, inhaltlich keine Leistungsfeststellung.
-// Wird weiterhin häufig vergeben und darf daher keinen Antritt kosten.
-$config['NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN'] = ['Noch nicht eingetragen', 'entschuldigt', 'Nicht beurteilt'];
-
-// Anrechnungsnoten: die Leistung wurde vorab anerkannt, der/die Studierende ist zwar Teil der
-// Lehrveranstaltung, tritt aber zu keiner Prüfung an. Solange die ZEUGNISNOTE eine davon ist, sind
-// für diese Lehrveranstaltung keine Prüfungen möglich. Auflösung wie oben über die Bezeichnung,
-// die PKs sind nur Fallback.
-$config['NOTEN_ANRECHNUNG_BEZEICHNUNGEN'] = ['angerechnet', 'intern angerechnet'];
-$config['NOTEN_ANRECHNUNG'] = [6, 16]; // tbl_note pk
-
-$config['NOTEN_OCCURANCE_LIMIT_MAP'] = [17 => 1]; // über alle Antritte hinweg nur ein entschuldigt
-
-// tbl_note pk of the 'entschuldigt' note. An entschuldigt Termin is preserved as its own dated
-// entry when a new pruefung of the same type is created (instead of being overwritten).
-$config['NOTE_ENTSCHULDIGT'] = 17;
-
-// The maximum number of attempts that count, the first attempt and the kommissionelle attempt
-// included. null derives the number from the old flags:
-//   1 (the original assessment) + TERMIN2 + TERMIN3 + KOMMPRUEF
-// The examination rules permit three attempts. With TERMIN2 and KOMMPRUEF the formula gives 3.
-// An installation with TERMIN3 gets 4, which is one more attempt in the same chain.
-$config['CIS_GESAMTNOTE_MAX_ANTRITTE'] = null;
-
-// The exam types that take place before a commission.
-$config['PRUEFUNG_KOMMISSIONELL_TYPEN'] = ['kommPruef', 'zusKommPruef'];
-
-// The type that the tool writes for the last attempt. The last attempt is always kommissionell.
-$config['PRUEFUNG_TYP_KOMMISSIONELL'] = 'kommPruef';
-
-// Exam types that never use an attempt. A zusKommPruef repeats a kommissionelle Prüfung that had
-// a procedural fault. It stands outside the attempt chain, and the student administration enters
-// it. The examination rules do not describe it.
-$config['PRUEFUNG_TYPEN_OHNE_ANTRITT'] = ['zusKommPruef'];
-
-// Spaltenaufteilung der Prüfungen in der Notentabelle:
-//   'antritt' - eine Spalte je Antrittsnummer, Datum steht in der Zelle (robust bei Einzelterminen)
-//   'datum'   - eine Spalte je Prüfungsdatum (kompakt, wenn ganze Jahrgänge am selben Tag antreten)
-// Nur die Vorgabe; im Tool umschaltbar und pro Benutzer gespeichert.
-$config['CIS_GESAMTNOTE_PRUEFUNGSSPALTEN'] = 'antritt';
-
-// Bei der Notenübernahme durch die Assistenz den ersten Antritt als eigene Prüfung anlegen.
-$config['CIS_GESAMTNOTE_ERSTANTRITT_BEI_UEBERNAHME'] = true;
-
-// availability of the two Benotungstool import flows. When both are true they are shown as
-// separate buttons/dialogs.
-$config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'] = true;  // dated import that creates a pruefung per row
-$config['CIS_GESAMTNOTE_NOTENIMPORT'] = false;     // classic note-only import (uid + note, no date)
-
-// Noteneintragungsfrist (Prüfungsordnung §1): grade/pruefung entry is only permitted up to this
-// deadline. The month/day below is applied to the studiensemester's year:
-//   Sommersemester (SSyyyy) -> deadline in the SAME calendar year   (default 15th November)
-//   Wintersemester (WSyyyy) -> deadline in the FOLLOWING calendar year (default 15th May)
-$config['CIS_GESAMTNOTE_NOTENEINTRAGUNGSFRIST'] = false; // switch to use the window enforcement
-$config['NOTENEINTRAGUNGSFRIST_SS'] = ['month' => 11, 'day' => 15]; // Sommersemester deadline (same year)
-$config['NOTENEINTRAGUNGSFRIST_WS'] = ['month' => 5,  'day' => 15];  // Wintersemester deadline (following year)
@@ -1,25 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// liste von raumtyp_kurzbz welche in raumsuche studenten angezeigt werden
-$config['roomtypes_student'] = array(
-'LAB BM/Chem',
-'xEDV 1-36',
-'xEDV 37-60',
-'EDV 60',
-'EDV-HÖPL',
-'EDV ES',
-'LAB Elek',
-'LAB ES/TK',
-'Ener-EDV',
-'Ener-Lab',
-'Ener-SEM',
-'Ener-HS',
-'HS 59-109',
-'HS 25-38',
-'HS 39-58',
-'LAB Inf',
-'LAB Robo',
-'LAB SET'
-);
@@ -1,6 +1,6 @@
 <?php

-if (! defined('BASEPATH')) exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');

 /*
 | -------------------------------------------------------------------------
@@ -51,7 +51,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 |   my-controller/my-method -> my_controller/my_method
 */
 $route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
-$route['translate_uri_dashes'] = false;
+$route['translate_uri_dashes'] = FALSE;

 // Class name conflicts
 $route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
@@ -61,129 +61,26 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';

-// Legacy CMS news routes
-$route['api/frontend/v1/Cms/getNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/getNewsItem/$1';
-$route['api/frontend/v1/Cms/storeNewsItem'] = 'api/frontend/v1/NewsAdministrationAPI/storeNewsItem';
-$route['api/frontend/v1/Cms/updateNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/updateNewsItem/$1';
-$route['api/frontend/v1/Cms/deleteNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/deleteNewsItem/$1';
+$route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';

-// Keep legacy uppercase URLs refreshable while using the canonical controller method casing
-$route['CisVue/Cms/NewsAdministration'] = 'CisVue/Cms/newsAdministration';
+// load routes from extensions
+$subdir = 'application/config/extensions';
+$dirlist = scandir($subdir);

-$route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
-$route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
-$route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
-$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
-
-$route['Cis/MyReservation'] = 'Cis/MyReservation/index/$1';
-
-//Route for Zeitsperrenma
-$route['Cis/Zeitsperrenma/.*'] = 'Cis/Zeitsperrenma/index/$1';
-//Route für Zeitsperren
-$route['Cis/Zeitsperren/.*'] = 'Cis/Zeitsperren/index/$1';
-
-$route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
-$route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
-$route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
-$route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
-$route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
-$route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
-
-// Studierendenverwaltung App Routes
-$route['studvw'] = 'studentenverwaltung/index';
-$route['studvw/.*'] = 'studentenverwaltung/index';
-// Old routes
-$route['studentenverwaltung'] = 'redirect/301/studvw';
-$route['studentenverwaltung/(:any)'] = 'redirect/301/studvw/stdsem/$1';
-$route['studentenverwaltung/(:any)/(prestudent|student|person|search)/(:any)'] = 'redirect/301/studvw/stdsem/$1/$2/$3';
-$route['studentenverwaltung/(:any)/prestudent/(:any)/tab/:any'] = 'redirect/301/studvw/stdsem/$1/prestudent/$2';
-$route['studentenverwaltung/(:any)/search/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/search/$2/$3';
-$route['studentenverwaltung/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/stg/$2';
-
-// Studierendenverwaltung List Routes
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/incoming/1'] = 'api/frontend/v1/stv/students/getIncoming/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/outgoing/1'] = 'api/frontend/v1/stv/students/getOutgoing/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/shared_studies/1'] = 'api/frontend/v1/stv/students/getGemeinsamestudien/$1';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsSpezialgruppe/$1/$2/$3/$4';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgformSpezialgruppe/$1/$3/$2/$4/$5';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/prestudent/(:any)'] = 'api/frontend/v1/stv/students/getPrestudent/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/student/(:any)'] = 'api/frontend/v1/stv/students/getStudent/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/person/(:any)'] = 'api/frontend/v1/stv/students/getPerson/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/index';
-
-// Lvverwaltung List Routes
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/le/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLe/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/lv/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLv/$1/$2';
-
-
-// load routes from extensions, also look for environment-specific configs
-$subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
-
-foreach($subdirs as $subdir)
+if ($dirlist)
 {
-	if(is_dir($subdir))
+	$files = array_diff($dirlist, array('.','..'));
+
+	foreach ($files as &$item)
 	{
-		$dirlist = scandir($subdir);
-		if ($dirlist)
+		if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
 		{
-			$files = array_diff($dirlist, array('.','..'));
+			$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';

-			foreach ($files as &$item)
+			if (file_exists($routes_file))
 			{
-				if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
-				{
-					$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
-
-					if (file_exists($routes_file))
-					{
-						require($routes_file);
-					}
-				}
+				require($routes_file);
 			}
 		}
 	}
-}
+}
@@ -1,874 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-$config['person'] = [
-	'primarykey' => 'person_id',
-	'table' => 'public.tbl_person',
-	'searchfields' => [
-		'uid' => [
-			'comparison' => 'equals',
-			'field' => 'uid',
-			'join' => [
-				'table' => "public.tbl_benutzer",
-				'using' => "person_id"
-			],
-			'1-n' => true
-		],
-		'vorname' => [
-			'alias' => ['firstname'],
-			'comparison' => 'similar',
-			'field' => 'vorname'
-		],
-		'nachname' => [
-			'alias' => ['lastname', 'surename'],
-			'comparison' => 'similar',
-			'field' => 'nachname'
-		],
-		'name' => [
-			'comparison' => 'similar',
-			'field' => "(vorname || ' ' || nachname)"
-		],
-		'email' => [
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_person.person_id"
-			],
-			"1-n" => true
-		],
-		'tel' => [
-			'alias' => ['phone', 'telefon'],
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
-			],
-			"1-n" => true
-		],
-		'preid' => [
-			'alias' => ['prestudent_id'],
-			'comparison' => 'equal-int',
-			'field' => 'prestudent_id',
-			'join' => [
-				'table' => "public.tbl_prestudent",
-				'using' => "person_id"
-			],
-			'1-n' => true
-		],
-		'pid' => [
-			'alias' => ['person_id'],
-			'comparison' => 'equal-int',
-			'field' => 'person_id'
-		]
-	],
-	'resultfields' => [
-		"ARRAY( SELECT uid FROM public.tbl_benutzer WHERE person_id = p.person_id ) AS uids",
-		"p.person_id",
-		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"CASE
-			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-			ELSE NULL END
-			AS photo_url"
-	],
-	'resultjoin' => "
-		JOIN public.tbl_person p USING (person_id)"
-];
-
-$config['student'] = [
-	'primarykey' => 'student_uid',
-	'table' => 'public.tbl_student',
-	'searchfields' => [
-		'uid' => [
-			'comparison' => 'equals',
-			'field' => 'student_uid'
-		],
-		'vorname' => [
-			'alias' => ['firstname'],
-			'comparison' => 'similar',
-			'field' => 'vorname',
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'nachname' => [
-			'alias' => ['lastname', 'surename'],
-			'comparison' => 'similar',
-			'field' => 'nachname',
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'name' => [
-			'comparison' => 'similar',
-			'field' => "(vorname || ' ' || nachname)",
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'email' => [
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_kontakt",
-					'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
-				]
-			],
-			"1-n" => true
-		],
-		'tel' => [
-			'alias' => ['phone', 'telefon'],
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_kontakt",
-					'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
-				]
-			],
-			"1-n" => true
-		],
-		'stg' => [
-			'alias' => ['studiengang'],
-			'comparison' => 'equals',
-			'field' => "typ || kurzbz",
-			'join' => [
-				[
-					'table' => "public.tbl_prestudent",
-					'using' => "prestudent_id"
-				],
-				[
-					'table' => "public.tbl_studiengang",
-					'on' => "tbl_studiengang.studiengang_kz = tbl_prestudent.studiengang_kz"
-				]
-			]
-		],
-		'preid' => [
-			'alias' => ['prestudent_id'],
-			'comparison' => 'equal-int',
-			'field' => 'prestudent_id'
-		],
-		'pid' => [
-			'alias' => ['person_id'],
-			'comparison' => 'equal-int',
-			'field' => 'person_id',
-			'join' => [
-				'table' => "public.tbl_prestudent",
-				'using' => "prestudent_id"
-			]
-		]
-	],
-	'resultfields' => [
-		"s.student_uid AS uid",
-		"s.matrikelnr",
-		"p.person_id",
-		"(p.vorname || ' ' || p.nachname) AS name",
-		"(s.student_uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"CASE
-			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-			ELSE NULL END
-			AS photo_url",
-		"b.aktiv"
-	],
-	'resultjoin' => "
-		JOIN public.tbl_student s USING (student_uid)
-		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
-		JOIN public.tbl_person p USING(person_id)"
-];
-
-$prestudent_sort = [
-	"Student",
-	"Incoming",
-	"Outgoing",
-	"Diplomand",
-	"Unterbrecher",
-	"Aufgenommener",
-	"Wartender",
-	"Bewerber",
-	"Interessent",
-	"Abgewiesener",
-	"Absolvent",
-	"Abbrecher",
-	"Ausserordentlicher",
-	"Praktikant"
-];
-$prestudent_sort_array = "array['" . implode("','", $prestudent_sort) . "']";
-$config['prestudent'] = [
-	'primarykey' => 'prestudent_id',
-	'table' => 'public.tbl_prestudent',
-	'searchfields' => [
-		'uid' => [
-			'comparison' => 'equals',
-			'field' => 'student_uid',
-			'join' => [
-				'table' => "public.tbl_student",
-				'using' => "prestudent_id"
-			]
-		],
-		'vorname' => [
-			'alias' => ['firstname'],
-			'comparison' => 'similar',
-			'field' => 'vorname',
-			'join' => [
-				'table' => "public.tbl_person",
-				'using' => "person_id"
-			]
-		],
-		'nachname' => [
-			'alias' => ['lastname', 'surename'],
-			'comparison' => 'similar',
-			'field' => 'nachname',
-			'join' => [
-				'table' => "public.tbl_person",
-				'using' => "person_id"
-			]
-		],
-		'name' => [
-			'comparison' => 'similar',
-			'field' => "(vorname || ' ' || nachname)",
-			'join' => [
-				'table' => "public.tbl_person",
-				'using' => "person_id"
-			]
-		],
-		'email' => [
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
-			],
-			"1-n" => true
-		],
-		'tel' => [
-			'alias' => ['phone', 'telefon'],
-			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
-			],
-			"1-n" => true
-		],
-		'stg' => [
-			'alias' => ['studiengang'],
-			'comparison' => 'equals',
-			'field' => "typ || kurzbz",
-			'join' => [
-				'table' => "public.tbl_studiengang",
-				'using' => "studiengang_kz"
-			]
-		],
-		'preid' => [
-			'alias' => ['prestudent_id'],
-			'comparison' => 'equal-int',
-			'field' => 'prestudent_id'
-		],
-		'pid' => [
-			'alias' => ['person_id'],
-			'comparison' => 'equal-int',
-			'field' => 'person_id',
-			'join' => [
-				'table' => "public.tbl_person",
-				'using' => "person_id"
-			]
-		]
-	],
-	'resultfields' => [
-		"ps.prestudent_id",
-		"ps.studiengang_kz",
-		"s.matrikelnr",
-		"p.person_id",
-		"b.uid",
-		"(p.vorname || ' ' || p.nachname) AS name",
-		"(b.uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"CASE
-			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-			ELSE NULL END
-			AS photo_url",
-		"UPPER(sg.typ || sg.kurzbz) AS stg_kuerzel",
-		"sg.bezeichnung",
-		"(
-			SELECT bezeichnung_mehrsprachig[(TABLE lang)]
-			FROM public.tbl_status
-			WHERE status_kurzbz = public.get_rolle_prestudent(ps.prestudent_id, NULL)
-			LIMIT 1
-		) AS status",
-		"COALESCE(
-			(
-				SELECT COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz)
-				FROM public.tbl_prestudentstatus pss
-				LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
-				WHERE pss.prestudent_id=ps.prestudent_id
-				ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
-				LIMIT 1
-			),
-			sg.orgform_kurzbz
-		) AS orgform",
-		"b.aktiv",
-		"array_position(" . $prestudent_sort_array . ", public.get_rolle_prestudent(ps.prestudent_id, NULL)) AS sort"
-	],
-	'resultjoin' => "
-		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
-		LEFT JOIN public.tbl_student s ON (ps.prestudent_id = s.prestudent_id)
-		LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
-		JOIN public.tbl_person p ON (p.person_id = ps.person_id)
-		LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)"
-];
-
-$config['employee'] = [
-	'alias' => ['ma', 'mitarbeiter'],
-	'primarykey' => 'mitarbeiter_uid',
-	'table' => 'public.tbl_mitarbeiter',
-	'searchfields' => [
-		'uid' => [
-			'alias' => ['mitarbeiter_uid'],
-			'comparison' => 'equals',
-			'field' => "mitarbeiter_uid"
-		],
-		'vorname' => [
-			'alias' => ['firstname'],
-			'comparison' => 'similar',
-			'field' => "vorname",
-			'join' => [
-				[
-					'table' => "public.tbl_benutzer",
-					'on' => "uid = mitarbeiter_uid"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'nachname' => [
-			'alias' => ['lastname', 'surename'],
-			'comparison' => 'similar',
-			'field' => "nachname",
-			'join' => [
-				[
-					'table' => "public.tbl_benutzer",
-					'on' => "uid = mitarbeiter_uid"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'name' => [
-			'comparison' => 'similar',
-			'field' => "(vorname || ' ' || nachname)",
-			'join' => [
-				[
-					'table' => "public.tbl_benutzer",
-					'on' => "uid = mitarbeiter_uid"
-				],
-				[
-					'table' => "public.tbl_person",
-					'using' => "person_id"
-				]
-			]
-		],
-		'email' => [
-			'comparison' => 'similar',
-			'field' => "COALESCE(alias, uid) || '" . '@' . DOMAIN . "'",
-			'join' => [
-				'table' => "public.tbl_benutzer",
-				'on' => "uid = mitarbeiter_uid"
-			]
-		],
-		'tel' => [
-			'alias' => ['phone', 'telefon'],
-			'comparison' => 'similar',
-			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
-			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
-			],
-			"1-n" => true
-		],
-		'pid' => [
-			'alias' => ['person_id'],
-			'comparison' => 'equal-int',
-			'field' => "person_id",
-			'join' => [
-				'table' => "public.tbl_benutzer",
-				'on' => "uid = mitarbeiter_uid"
-			]
-		],
-		'oe' => [
-			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
-			'comparison' => 'vector',
-			'field' => "fts_bezeichnung",
-			'join' => [
-				[
-					'table' => "public.tbl_benutzerfunktion",
-					'on' => "mitarbeiter_uid = uid
-						AND funktion_kurzbz = 'oezuordnung'
-						AND (datum_von IS NULL OR datum_von <= NOW())
-						AND (datum_bis IS NULL OR datum_bis >= NOW())"
-				],
-				[
-					'table' => "public.tbl_organisationseinheit",
-					'using' => "oe_kurzbz"
-				]
-			],
-			'1-n' => true
-		],
-		'kst' => [
-			'comparison' => 'vector',
-			'field' => "fts_bezeichnung",
-			'join' => [
-				[
-					'table' => "public.tbl_benutzerfunktion",
-					'on' => "mitarbeiter_uid = uid
-						AND funktion_kurzbz = 'kstzuordnung'
-						AND (datum_von IS NULL OR datum_von <= NOW())
-						AND (datum_bis IS NULL OR datum_bis >= NOW())"
-				],
-				[
-					'table' => "public.tbl_organisationseinheit",
-					'using' => "oe_kurzbz"
-				]
-			],
-			'1-n' => true
-		]
-	],
-	'resultfields' => [
-		"b.uid",
-		"p.person_id",
-		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY(
-			SELECT
-				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
-			FROM public.tbl_benutzerfunktion bf
-			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-			WHERE bf.funktion_kurzbz = 'oezuordnung'
-				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				AND bf.uid = b.uid
-			GROUP BY o.bezeichnung, ot.bezeichnung
-		) AS organisationunit_name",
-		"COALESCE(b.alias, b.uid) || '" . '@' . DOMAIN . "' AS email",
-		"TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, '')) AS phone",
-		"'" . base_url("/cis/public/bild.php?src=person&person_id=") . "' || p.person_id AS photo_url",
-		"ARRAY(
-			SELECT
-				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
-			FROM public.tbl_benutzerfunktion bf
-			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-			WHERE bf.funktion_kurzbz = 'kstzuordnung'
-				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				AND bf.uid = b.uid
-			GROUP BY o.bezeichnung, ot.bezeichnung
-		) AS standardkostenstelle"
-	],
-	'resultjoin' => "
-		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid)
-		JOIN public.tbl_person p USING(person_id)
-		LEFT JOIN (
-			SELECT kontakt, standort_id
-			FROM public.tbl_kontakt
-			WHERE kontakttyp = 'telefon'
-		) k ON (k.standort_id = m.standort_id)"
-];
-
-// TODO(chris): move to searchpv21.php
-$config['unassigned_employee'] = $config['employee'];
-$config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
-$config['unassigned_employee']['prepare'] = "unassigned_employee AS (
-	SELECT tbl_mitarbeiter.*
-	FROM public.tbl_mitarbeiter
-	LEFT JOIN public.tbl_benutzerfunktion ON (
-		uid = mitarbeiter_uid
-		AND funktion_kurzbz = 'kstzuordnung'
-		AND (datum_von IS NULL OR datum_von <= NOW())
-		AND (datum_bis IS NULL OR datum_bis >= NOW())
-	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
-	UNION
-	SELECT tbl_mitarbeiter.*
-	FROM public.tbl_mitarbeiter
-	LEFT JOIN public.tbl_benutzerfunktion ON (
-		uid = mitarbeiter_uid
-		AND funktion_kurzbz = 'oezuordnung'
-		AND (datum_von IS NULL OR datum_von <= NOW())
-		AND (datum_bis IS NULL OR datum_bis >= NOW())
-	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
-)";
-$config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
-	kontakttyp = 'telefon' 
-	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
-";
-$config['unassigned_employee']['renderer'] = 'employee';
-
-$config['organisationunit'] = [
-	'alias' => ['ou', 'organisationseinheit', 'oe'],
-	'primarykey' => 'oe_kurzbz',
-	'table' => 'public.tbl_organisationseinheit',
-	'searchfields' => [
-		'uid' => [
-			'comparison' => 'equals',
-			'field' => 'uid',
-			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
-				SELECT oe_kurzbz, vorname, nachname, uid
-				FROM public.tbl_benutzerfunktion
-				JOIN public.tbl_benutzer USING (uid)
-				JOIN public.tbl_person USING (person_id)
-				WHERE funktion_kurzbz = 'Leitung'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND tbl_benutzer.aktiv = TRUE
-			)",
-			'join' => [
-				'table' => "organisationunit_leader",
-				'using' => "oe_kurzbz"
-			],
-			'1-n' => true
-		],
-		'vorname' => [
-			'alias' => ['firstname'],
-			'comparison' => 'similar',
-			'field' => 'vorname',
-			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
-				SELECT oe_kurzbz, vorname, nachname, uid
-				FROM public.tbl_benutzerfunktion
-				JOIN public.tbl_benutzer USING (uid)
-				JOIN public.tbl_person USING (person_id)
-				WHERE funktion_kurzbz = 'Leitung'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND tbl_benutzer.aktiv = TRUE
-			)",
-			'join' => [
-				'table' => "organisationunit_leader",
-				'using' => "oe_kurzbz"
-			],
-			'1-n' => true
-		],
-		'nachname' => [
-			'alias' => ['lastname', 'surename'],
-			'comparison' => 'similar',
-			'field' => 'nachname',
-			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
-				SELECT oe_kurzbz, vorname, nachname, uid
-				FROM public.tbl_benutzerfunktion
-				JOIN public.tbl_benutzer USING (uid)
-				JOIN public.tbl_person USING (person_id)
-				WHERE funktion_kurzbz = 'Leitung'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND tbl_benutzer.aktiv = TRUE
-			)",
-			'join' => [
-				'table' => "organisationunit_leader",
-				'using' => "oe_kurzbz"
-			],
-			'1-n' => true
-		],
-		'name' => [
-			'comparison' => 'similar',
-			'field' => "(vorname || ' ' || nachname)",
-			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
-				SELECT oe_kurzbz, vorname, nachname, uid
-				FROM public.tbl_benutzerfunktion
-				JOIN public.tbl_benutzer USING (uid)
-				JOIN public.tbl_person USING (person_id)
-				WHERE funktion_kurzbz = 'Leitung'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND tbl_benutzer.aktiv = TRUE
-			)",
-			'join' => [
-				'table' => "organisationunit_leader",
-				'using' => "oe_kurzbz"
-			],
-			'1-n' => true
-		],
-		'oe' => [
-			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
-			'comparison' => 'vector',
-			'field' => "fts_bezeichnung"
-		],
-		'kurzbz' => [
-			'alias' => ['oe_kurzbz'],
-			'comparison' => 'equals',
-			'field' => "oe_kurzbz"
-		]
-	],
-	'resultfields' => [
-		"oe.oe_kurzbz",
-		"('[' || type.bezeichnung || '] ' || oe.bezeichnung) AS name",
-		"oe_parent.oe_kurzbz AS parentoe_kurzbz",
-		"(CASE WHEN oe_parent.bezeichnung IS NOT NULL THEN '[' || type_parent.bezeichnung || '] ' || oe_parent.bezeichnung END) AS parentoe_name",
-		"ARRAY(
-			SELECT JSON_BUILD_OBJECT('uid', b.uid, 'vorname', p.vorname, 'nachname', p.nachname, 'name', (p.vorname || ' ' || p.nachname))
-			FROM public.tbl_benutzerfunktion bf
-			JOIN public.tbl_benutzer b USING (uid)
-			JOIN public.tbl_person p USING (person_id)
-			WHERE funktion_kurzbz = 'Leitung'
-			AND (datum_von IS NULL OR datum_von <= NOW())
-			AND (datum_bis IS NULL OR datum_bis >= NOW())
-			AND b.aktiv = TRUE
-			AND oe_kurzbz = oe.oe_kurzbz
-		) AS leaders",
-		"(
-			SELECT COUNT(*)
-			FROM public.tbl_benutzerfunktion
-			WHERE funktion_kurzbz = 'oezuordnung'
-			AND (datum_von IS NULL OR datum_von <= NOW())
-			AND (datum_bis IS NULL OR datum_bis >= NOW())
-			AND oe_kurzbz = oe.oe_kurzbz
-		) AS number_of_people",
-		"(CASE WHEN oe.mailverteiler THEN oe.oe_kurzbz || '" . '@' . DOMAIN . "' END) AS mailgroup"
-	],
-	'resultjoin' => "
-		JOIN public.tbl_organisationseinheit oe
-			USING (oe_kurzbz)
-		JOIN public.tbl_organisationseinheittyp type
-			USING (organisationseinheittyp_kurzbz)
-		LEFT JOIN public.tbl_organisationseinheit oe_parent
-			ON (oe_parent.oe_kurzbz = oe.oe_parent_kurzbz)
-		LEFT JOIN public.tbl_organisationseinheittyp type_parent
-			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
-];
-
-$config['room'] = [
-	'alias' => ['raum'],
-	'primarykey' => 'ort_kurzbz',
-	'table' => 'public.tbl_ort',
-	'searchfields' => [
-		'name' => [
-			'comparison' => 'similar',
-			'field' => 'ort_kurzbz'
-		]
-	],
-	'resultfields' => [
-		"ort.ort_kurzbz",
-		"ort.gebteil AS building",
-		"ort.ausstattung AS equipment",
-		"ort.stockwerk AS floor",
-		"ort.dislozierung AS room_number",
-		"ort.content_id",
-		"address.ort AS city",
-		"address.plz AS zip",
-		"address.strasse AS street",
-		"ort.max_person",
-		"ort.arbeitsplaetze AS workplaces"
-	],
-	'resultjoin' => "
-		JOIN public.tbl_ort ort
-			USING (ort_kurzbz)
-		LEFT JOIN public.tbl_standort
-			USING (standort_id)
-		LEFT JOIN public.tbl_adresse address
-			USING (adresse_id)"
-];
-$sprache = getUserLanguage();
-$config['cms'] = [
-	'primarykey' => 'contentsprache_id',
-	'table' => 'campus.tbl_contentsprache',
-	'prepare' => "
-		cms_auth (content_id) AS (
-			SELECT content_id
-			FROM campus.tbl_content c
-			WHERE NOT EXISTS (SELECT 1 FROM campus.tbl_contentgruppe g WHERE g.content_id=c.content_id)
-			UNION
-			SELECT content_id
-			FROM public.vw_gruppen g
-			JOIN campus.tbl_contentgruppe c USING (gruppe_kurzbz)
-			WHERE uid = (TABLE auth)
-		),
-		cms_active (content_id, template_kurzbz) AS (
-			SELECT content_id, template_kurzbz
-			FROM cms_auth
-			JOIN campus.tbl_content USING (content_id)
-			WHERE aktiv = TRUE
-		),
-		cms_active_redirect (content_id) AS (
-			SELECT content_id
-			FROM cms_active
-			WHERE template_kurzbz = 'redirect'
-		),
-		cms_active_redirect_linked (content_id) AS (
-			SELECT content_id
-			FROM cms_active_redirect
-			JOIN campus.tbl_contentsprache USING (content_id)
-			WHERE LEFT((xpath('string(/content/url)', content))[1]::text, 1) <> '#'
-		),
-		cms_active_others (content_id) AS (
-			SELECT content_id
-			FROM cms_active
-			WHERE template_kurzbz IN ('contentmittitel', 'contentohnetitel', 'contentmittitel_filterwidget')
-		)
-	",
-	'searchfields' => [
-		'content' => [
-			'alias' => ['inhalt'],
-			'comparison' => "vector",
-			'field' => "(
-				setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') 
-				|| 
-				setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')
-			)"
-		],
-		'content_id' => [
-			'alias' => ['id'],
-			'comparison' => "equal-int",
-			'field' => "content_id"
-		],
-		'lang' => [
-			'alias' => ['language', 'sprache'],
-			'comparison' => "equals",
-			'field' => "sprache"
-		]
-	],
-	'resultfields' => [
-		"contentsprache.content_id",
-		"content.template_kurzbz",
-		"contentsprache.version",
-		"contentsprache.sprache AS language",
-		"contentsprache.titel AS title",
-		"contentsprache.content",
-		"(xpath('string(/content/url)', contentsprache.content))[1] AS content_url"
-	],
-	'resultjoin' => "
-		JOIN campus.tbl_contentsprache contentsprache
-			USING (contentsprache_id)
-		JOIN campus.tbl_content content
-			USING (content_id)
-		WHERE content_id IN (
-			SELECT content_id 
-			FROM cms_active_redirect_linked 
-			UNION 
-			SELECT content_id 
-			FROM cms_active_others
-		)
-		AND version = campus.get_highest_content_version(content_id)
-		AND contentsprache.sprache = '{$sprache}'"
-];
-
-$config['dms'] = [
-	'primarykey' => 'dms_id, version',
-	'table' => 'campus.tbl_dms_version',
-	'searchfields' => [
-		'keywords' => [
-			'alias' => ['keyword', 'keywords', 'schlagwort', 'schlagworte'],
-			'comparison' => "vector",
-			'field' => "(to_tsvector('simple', COALESCE(schlagworte, '')))"
-		]
-	],
-	'resultfields' => [
-		"v.dms_id",
-		"v.version",
-		"v.filename",
-		"v.mimetype",
-		"v.name",
-		"v.beschreibung AS description",
-		"v.schlagworte AS keywords"
-	],
-	'resultjoin' => "
-		JOIN campus.tbl_dms_version v
-			USING (dms_id, version)
-		WHERE cis_suche = TRUE
-			AND version=(SELECT MAX(version) FROM campus.tbl_dms_version WHERE dms_id=v.dms_id)
-			AND NOT EXISTS (
-				SELECT
-					1
-				FROM
-					fue.tbl_projekt_dokument p
-				WHERE p.dms_id = v.dms_id
-			) AND (
-				NOT EXISTS (
-					WITH RECURSIVE categories (kategorie_kurzbz) AS (
-						SELECT
-							kategorie_kurzbz
-						FROM
-							campus.tbl_dms c
-						WHERE c.dms_id = v.dms_id
-						UNION ALL
-						SELECT
-							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
-						FROM
-							categories
-							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
-					)
-					SELECT
-						1
-					FROM
-						categories
-					JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
-					UNION
-					SELECT
-						1
-					FROM
-						categories
-						JOIN campus.tbl_dms_kategorie USING (kategorie_kurzbz)
-					WHERE
-						berechtigung_kurzbz IS NOT NULL
-				) OR EXISTS (
-					WITH RECURSIVE categories (kategorie_kurzbz) AS (
-						SELECT
-							kategorie_kurzbz
-						FROM
-							campus.tbl_dms c
-						WHERE c.dms_id = v.dms_id
-						UNION ALL
-						SELECT
-							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
-						FROM
-							categories
-							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
-					)
-					SELECT
-						1
-					FROM
-						categories
-						JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
-						JOIN public.tbl_benutzergruppe USING(gruppe_kurzbz)
-					WHERE
-						uid = (TABLE auth)
-				)
-			)"
-];
@@ -1,49 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-$CI =& get_instance();
-
-
-$config['employee'] = $CI->config->item('employee', 'search');
-$config['employee']['resultjoin'] = "
-		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
-		JOIN public.tbl_person p USING(person_id)
-		LEFT JOIN (
-			SELECT kontakt, standort_id
-			FROM public.tbl_kontakt
-			WHERE kontakttyp = 'telefon'
-		) k ON (k.standort_id = m.standort_id)";
-
-$config['student'] = $CI->config->item('student', 'search');
-unset($config['student']['searchfields']['email']);
-unset($config['student']['searchfields']['tel']);
-$config['student']['resultfields'] = [
-	"s.student_uid AS uid",
-	"s.matrikelnr AS personenkennzeichen",
-	"p.person_id",
-	"p.matr_nr AS matrikelnummer",
-	"(p.vorname || ' ' || p.nachname) AS name",
-	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
-	"CASE
-		WHEN (p.foto_sperre = false AND p.foto IS NOT NULL) THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-		ELSE NULL END
-		AS photo_url",
-	"b.aktiv"
-];
-$config['student']['resultjoin'] = "
-		JOIN public.tbl_student s USING (student_uid)
-		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid AND b.aktiv = true)
-		JOIN public.tbl_person p USING(person_id)";
-
-$config['organisationunit'] = $CI->config->item('organisationunit', 'search');
-$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true AND organisationseinheittyp_kurzbz <> \'Container\')';
-$config['organisationunit']['table'] = 'active_organisationseinheit';
-
-$config['room'] = $CI->config->item('room', 'search');
-
-$config['cms'] = $CI->config->item('cms', 'search');
-
-$config['dms'] = $CI->config->item('dms', 'search');
@@ -1,35 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-/*
- * TODO: 2025-07-21 ma0080 bare integer comparision results in db error
- *       if searchstring is numeric but out of range of int, think about 
- *       more sophisticated solution using column data type - quick fix 
- *       convert field and search string to text
- */
-$config['equal-int'] = [
-	'priority' => 4,
-	'rank' => "0",
-	'compare' => "{field}::text = {word}::text",
-	'force_integer' => true
-];
-
-$config['equals'] = [
-	'priority' => 3,
-	'rank' => "0",
-	'compare' => "LOWER({field}) = {word}"
-];
-
-$config['similar'] = [
-	'priority' => 2,
-	'rank' => "(COALESCE({field}, '') <->> {word})",
-	'compare' => "COALESCE({field}, '') %> {word}",
-	'compare_boolean' => "COALESCE({field}, '') ILIKE {like:word}"
-];
-
-$config['vector'] = [
-	'priority' => 1,
-	'rank' => "ts_rank({field}, plainto_tsquery('simple', {word}))",
-	'compare' => "plainto_tsquery('simple', {word}) @@ {field}"
-];
-
@@ -1,49 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-$CI =& get_instance();
-
-
-$config['student'] = $CI->config->item('student', 'search');
-$config['student']['searchfields']['pkz'] = [
-	'alias' => ['personenkennzeichen', 'personalid'],
-	'comparison' => 'equals',
-	'field' => 'matrikelnr'
-];
-$config['student']['searchfields']['matrnr'] = [
-	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
-	'comparison' => 'equals',
-	'field' => 'matr_nr',
-	'join' => [
-		[
-			'table' => "public.tbl_prestudent",
-			'using' => "prestudent_id"
-		],
-		[
-			'table' => "public.tbl_person",
-			'using' => "person_id"
-		]
-	]
-];
-
-$config['prestudent'] = $CI->config->item('prestudent', 'search');
-$config['prestudent']['searchfields']['pkz'] = [
-	'alias' => ['personenkennzeichen', 'personalid'],
-	'comparison' => 'equals',
-	'field' => 'matrikelnr',
-	'join' => [
-		'table' => "public.tbl_student",
-		'using' => "prestudent_id"
-	]
-];
-$config['prestudent']['searchfields']['matrnr'] = [
-	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
-	'comparison' => 'equals',
-	'field' => 'matr_nr',
-	'join' => [
-		'table' => "public.tbl_person",
-		'using' => "person_id"
-	]
-];
@@ -168,40 +168,3 @@ $config['stgkz_blacklist_wiederholung'] = [];
 * @var array           An array of noten ids
 */
 $config['note_blacklist_wiederholung'] = [];
-
-/**
- *  Enable/disable the Abmeldung StG process
- *
- * @var bool
- */
-$config['abmeldung_stg_enabled'] = true;
-
-/**
- *  Enable/disable the Abmeldung process
- *
- * @var bool
- */
-$config['abmeldung_enabled'] = true;
-
-/**
- *  Enable/disable the Unterbrecher process
- *
- * @var bool
- */
-$config['unterbrechung_enabled'] = true;
-
-/**
- *  Enable/disable the Wiederholer process
- *
- * @var bool
- */
-$config['wiederholung_enabled'] = true;
-
-/**
- * Modal with Infotext of TLC
- * if true, there will be shown an info modal in the studentsView after the first button ABMELDUNG
- *
- * @var boolean
- */
-$config['showInfoModalAbmeldung'] = true;
-
@@ -1,27 +1,5 @@
 <?php

-$config['number_displayed_past_studiensemester_default'] = 5;
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		'default' => "SQL SELECT statement for value",
-		'joins' => [
-			// additional joins needed for the SELECT statement above
-			[
-				'tablename',
-				'join condition', // single fieldname for USING or full condition for ON
-				'LEFT|RIGHT', // optional - join type
-				'after_xxx|before_xxx|end' // optional - position in query
-			]
-			// ...
-		]
-	]
-];
-*/
-
 $config['tabs'] =
 	[
 		'details' => [
@@ -74,27 +52,9 @@ $config['tabs'] =
 					],
 				],
 			],
-		],
-		'exemptions' => [
-			//if true, Anrechnungen can be added and edited in tab Anrechnungen
-			'editableAnrechnungen' => false,
-		],
-		'notes' => [
-			//if true, the count of Messages will be shown in the header of the Tab Messages
-			'showCountNotes' => true,
-
-			//if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'
-			'showErweitert' => false,
-
-			//notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
-			'notizLayout' => 'popupModal'
-		],
-		'combinePeople' => [
-			//multitab should only be shown with this length of selection
-			'validCountMulti' => 2,
-		],
+		]
 	];
-
+	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
 $fieldsZgvDoktor = ['zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', 'zgvdoktor_erfuellt', 'zgvdoktor_code'];

@@ -114,71 +74,3 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 		$fieldsZgvDoktor
 	);
 }
-
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] =
-	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR')
-	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR
-	: '0.0';
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] =
-	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER')
-	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER
-	: '0.0';
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
-
-$config['student_tab_order'] = [
-	'details',
-	'notes',
-	'messages',
-	'contact',
-	'prestudent',
-	'status',
-	'documents',
-	'archive',
-	'banking',
-	'grades',
-	'exam',
-	'exemptions',
-	'projektarbeit',
-	'finalexam',
-	'mobility',
-	'jointstudies',
-	'admissionDates',
-	'groups',
-	'functions',
-	'coursedates',
-	'resources',
-];
-$config['students_tab_order'] = [
-	'banking',
-	'status',
-	'messages',
-	'groups',
-	'finalexam',
-	'combinePeople',
-	'archive',
-];
-
-$config['stv_prestudent_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => false],
-	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => false],
-	'hinweis_kf' => ['readonly' => false],
-	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => false],
-	'finished_stg' => ['readonly' => false],
-	'finished_kf' => ['readonly' => false],
-	'inwork_kf' => ['readonly' => false],
-	'dd_auto' => ['readonly' => true],
-	'wh_auto' => ['readonly' => true],
-	'prewh_auto' => ['readonly' => true],
-	'out_auto' => ['readonly' => true],
-	'zgv_auto' => ['readonly' => true],
-	'unterbrecher_auto' => ['readonly' => true],
-	'stbtr_erh_auto' => ['readonly' => true],
-	'jgv_auto' => ['readonly' => true],
-	'in_auto' => ['readonly' => true],
-	'preabbr_auto' => ['readonly' => true],
-];
-
-$config['userAutomatedTags'] = 'sftest';
@@ -0,0 +1,7 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+// broaden the allowed URI characters just for tests
+$config['permitted_uri_chars'] = 'a-z A-Z 0-9~%.:_\-';
+// ensure we read REQUEST_URI
+$config['uri_protocol']       = 'REQUEST_URI';
@@ -1,11 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-// changing the color theme
-
-$config['theme_name']='default';
-$config['theme_css']= "public/css/theme/default.css";
-$config['theme_logo']= "public/images/logo_fh-complete_300x46.png";
-$config['theme_modes']=['light','dark'];
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['stv'] = [
-	"library" => "treemenu/StudVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];
-$config['lvv'] = [
-	"library" => "treemenu/LvVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['root'] = [
-	'stg' => [
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		]
-	]
-];
-
-$config['root']['stg']['orgform'] = $config['root']['stg'];
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['root'] = [
-	'stg' => [
-		'prestudent' => [
-			'stdsem' => [
-				'interessenten' => [
-					'bewerbungnichtabgeschickt',
-					'bewerbungabgeschickt',
-					'zgv',
-					'statusbestaetigt' => [
-						'statusbestaetigtrtnichtangemeldet',
-						'statusbestaetigtrtangemeldet'
-					],
-					'reihungstestnichtangemeldet',
-					'reihungstestangemeldet'
-				],
-				'bewerber' => [
-					'bewerberrtnichtangemeldet',
-					'bewerberrtangemeldet' => [
-						'bewerberrtangemeldetteilgenommen',
-						'bewerberrtangemeldetnichtteilgenommen'
-					]
-				],
-				'aufgenommen',
-				'warteliste',
-				'absage',
-				'incoming'
-			]
-		],
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		]
-	],
-	'inout' => [
-		'incoming',
-		'outgoing',
-		'shared_studies'
-	]
-];
-
-// copy stg tree into stg/orgforms
-$config['root']['stg']['orgform'] = $config['root']['stg'];
@@ -1,76 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Abgabetool extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => self::PERM_LOGGED,
-			'Mitarbeiter' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'Assistenz' => array('basis/abgabe_assistenz:rw'),
-			'Student' =>  array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'Deadlines' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		// TODO: routing from index based on berechtigung?
-
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
-		}
-	}
-
-	public function Student($student_uid_prop = '')
-	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
-		}
-	}
-
-	public function Mitarbeiter()
-	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
-		}
-	}
-
-	public function Assistenz($stg_kz_prop = '')
-	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
-		}
-	}
-	
-	public function Deadlines()
-	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
-		}
-	}
-}
@@ -40,7 +40,7 @@ class Auth extends FHC_Controller

 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/Cis4'));
+			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
 		}
 		else
 		{
@@ -72,7 +72,6 @@ class Auth extends FHC_Controller
 	{
 		$this->load->library('AuthLib');
 		$this->authlib->logout();
-		setcookie('fhclogout', 'fhclogout', 0, '/');
-		redirect(base_url('/cis/private/logout.php'), 'refresh');
+		redirect('/Cis/Auth/login', 'refresh');
 	}
 }
@@ -1,44 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Compat extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct([
-			'ci' => ['basis/cis:r'],
-			'legacy' => ['basis/cis:r'],
-			
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * @access public
-	 * @return void 
-	 */
-	public function ci()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-	/**
-	 * @access public
-	 * @return void
-	 */
-	public function legacy()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-}
@@ -72,7 +72,7 @@ class Documents extends Auth_Controller

 		$stgs = [];
 		$stsemArray = [];
-		$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
+		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class LvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'LvPlan']);
-	}
-}
@@ -26,6 +26,16 @@ class MyLv extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLv']);
+		
+		$viewData = array(
+
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
+	}
+
+	public function Info($studien_semester,$lvid)
+	{
+		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
 	}
 }
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class MyLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{		
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLvPlan']);
-	}
-}
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class MyReservation extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{		
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyReservation']);
-	}
-}
@@ -1,34 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-/**
- *
- */
-class OtherLvPlan extends Auth_Controller
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'index' => ['basis/other_lv_plan:r']
-        ]);
-
-        // Load Config
-        $this->load->config('calendar');
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * @return void
-     */
-    public function index()
-    {
-        $this->load->view('CisRouterView/CisRouterView.php', ['route' => 'OtherLvPlan']);
-    }
-}
@@ -55,7 +55,10 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}

 	/**
@@ -65,13 +68,15 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
+		$viewData = array ('uid' => $uid);
+		
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}

 	/**
-	 * checks whether a specific userID is a student or not (foreword declaration of the function isStudent in Student_model.php)
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
-	 * @param  $uid the userID used to check if it is a student
+	 * @param  $uid the userID used to check if it is a mitarbeiter
 	 * @return boolean 
 	 */
 	public function isStudent($uid)
@@ -101,7 +106,7 @@ class Profil extends Auth_Controller
 	}

 	/**
-	 * gets the adressen that are marked as zustell from the currently logged in user
+	 * gets the adressen that are marked as zustell from the currenlty logged in user
 	 * @access public
 	 * @return array a list of adresse_id's 
 	 */
@@ -244,23 +249,23 @@ class Profil extends Auth_Controller
 		$this->GemeindeModel->addDistinct();
 		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
-			if (isset($zip) && $zip > 999 && $zip < 32000) {
+				if (isset($zip) && $zip > 999 && $zip < 32000) {

-				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
-				if (isError($gemeinde_res)) {
-					show_error("error while trying to query bis.tbl_gemeinde");
+						$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+						if (isError($gemeinde_res)) {
+								show_error("error while trying to query bis.tbl_gemeinde");
+						}
+						$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+						$gemeinde_res = array_map(function ($obj) {
+								return $obj->name;
+						}, $gemeinde_res);
+						echo json_encode($gemeinde_res);
+
+				} else {
+						echo json_encode(error("ortschaftskennziffer code was not valid"));
 				}
-				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-				$gemeinde_res = array_map(function ($obj) {
-					return $obj->name;
-				}, $gemeinde_res);
-				echo json_encode($gemeinde_res);
-
-			} else {
-				echo json_encode(error("ortschaftskennziffer code was not valid"));
-			}
 		} else {
-			echo json_encode(error("Nation was not 'A' (Austria)"));
+				echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}

@@ -732,4 +737,6 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+
 }
@@ -9,21 +9,54 @@ if (!defined('BASEPATH'))
 class ProfilUpdate extends Auth_Controller
 {

+	public static $STATUS_PENDING = NULL;
+	public static $STATUS_ACCEPTED = NULL;
+	public static $STATUS_REJECTED = NULL;
+
+	public static $TOPICS = [];
+
+
 	public function __construct()
 	{
 		parent::__construct([
 			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'show' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r', 'basis/cis:r'],
-			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
+			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+			'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'show' => ['basis/cis:r'],
+
+			'insertProfilRequest' => ['basis/cis:rw'],
+			'updateProfilRequest' => ['basis/cis:rw'],
+			'deleteProfilRequest' => ['basis/cis:rw'],
+			'selectProfilRequest' => ['basis/cis:r'],
+			'insertFile' => ['basis/cis:rw'],
+			'getProfilRequestFiles' => ['basis/cis:r'],
+			'getStatus' => ['basis/cis:r'],
+			'getTopic' => ['basis/cis:r'],
 		]);

+		$this->load->config('cis');
+
 		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
+		$this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');

 		// Load language phrases
 		$this->loadPhrases(
 			array(
+				'ui',
+				'global',
+				'person',
+				'profil',
 				'profilUpdate'
 			)
 		);
@@ -31,10 +64,32 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->library('DmsLib');
 		$this->load->library('PermissionLib');

+		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+
+		// setup the ProfilUpdate states
+		$this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
+		$status_kurzbz = $this->ProfilUpdateStatusModel->load();
+		if (hasData($status_kurzbz)) {
+			list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
+
+			self::$STATUS_PENDING = $status_pending->status_kurzbz;
+			self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
+			self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
+		}
+		// setup the ProfilUpdate topics
+		$this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
+		$topic_kurzbz = $this->ProfilUpdateTopicModel->load();
+
+		if (hasData($topic_kurzbz)) {
+			foreach (getData($topic_kurzbz) as $topic) {
+				self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
+			}
+		}
 	}

+
 	public function index()
 	{
 		$this->load->view('Cis/ProfilUpdate');
@@ -45,14 +100,129 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate', ['profil_update_id' => $profil_update_id]);
 	}

+	public function getStatus()
+	{
+		echo json_encode([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
+	}
+
+	public function getTopic()
+	{
+		echo json_encode(self::$TOPICS);
+	}
+
+	private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
+	{
+		if($this->config->item('cis_send_profil_update_mails') === false)
+		{
+			return;
+		}
+
+		$this->load->helper('hlp_sancho_helper');
+		$email = $uid . "@" . DOMAIN;
+
+
+		function languageQuery($language)
+		{
+			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+		}
+		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
+		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+		if (isError($status_translation)) {
+			show_error($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
+		}
+		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
+		if (isset($status_translation)) {
+			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+			if (!$mail_res) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+			}
+		}
+
+	}
+
+
+	private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
+	{
+		if($this->config->item('cis_send_profil_update_mails') === false)
+		{
+			return;
+		}
+
+		$this->load->helper('hlp_sancho_helper');
+		$emails = [];
+
+		$isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if (isError($isMitarbeiter_res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+		}
+		$isMitarbeiter_res = getData($isMitarbeiter_res);
+
+		//! if the $uid is a mitarbeiter and student, only the hr is notified by email
+		if ($isMitarbeiter_res) {
+			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+			//? use constant variable MAIL_GST to mail to the personalverwaltung
+			$this->MitarbeiterModel->addSelect([TRUE]);
+			$this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+			//? check if the the userID is a mitarbeiter and if the benutzer is active
+			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
+			if (isError($res)) {
+				show_error("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
+			}
+			if (hasData($res)) {
+				array_push($emails, MAIL_GST);
+			} else {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+			}
+		} else {
+			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
+			$isStudent_res = $this->StudentModel->isStudent($uid);
+			if (isError($isStudent_res)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
+			}
+			$isStudent_res = getData($isStudent_res);
+			if ($isStudent_res) {
+				//? Send email to the Studiengangsassistentinnen
+				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				//* check if the benutzer itself is active
+				//* check if the student status is Student or Diplomand (active students)
+				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
+				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
+				if (isError($res)) {
+					show_error(getData($res));
+				} else {
+					$res = hasData($res) ? getData($res) : [];
+					foreach ($res as $emailObj) {
+						array_push($emails, $emailObj->email);
+					}
+				}
+			}
+		}
+		$mail_res = [];
+		//? sending email
+		foreach ($emails as $email) {
+			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
+		}
+		foreach ($mail_res as $m_res) {
+			if (!$m_res) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+			}
+		}
+
+	}
+
+
 	public function show($dms_id)
 	{
+
 		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
 		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;

 		//? checks if an profil update exists with the dms_id requested from the user
-		if ($profil_update)
-		{
+		if ($profil_update) {
 			$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
 			$is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));

@@ -60,8 +230,7 @@ class ProfilUpdate extends Auth_Controller
 				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
 				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
 				$this->uid == $profil_update->uid
-			)
-			{
+			) {
 				// Get file to be downloaded from DMS
 				$newFilename = $this->uid . "/document_" . $dms_id;
 				$download = $this->dmslib->download($dms_id);
@@ -70,17 +239,576 @@ class ProfilUpdate extends Auth_Controller

 				// Download file
 				$this->outputFile(getData($download));
-			}
-			else
-			{
+
+
+			} else {
 				show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
 				return;
 			}
-		}
-		else
-		{
+
+		} else {
 			show_error($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
 			return;
 		}
+
 	}
-}
+
+
+	public function insertFile($replace)
+	{
+		$replace = json_decode($replace);
+
+		if (!count($_FILES)) {
+			echo json_encode([]);
+			return;
+		}
+
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		if (isset($replace)) {
+			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+			if (isError($profilUpdate)) {
+				return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
+			}
+			//? get the attachmentID
+			$dms_id = hasData($profilUpdate) ? getData($profilUpdate)[0]->attachment_id : null;
+
+			//? delete old dms_file of Profil Update
+			$this->deleteOldVersionFile($dms_id);
+		}
+
+
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+
+		$res = [];
+
+		for ($i = 0; $i < $file_count; $i++) {
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+
+			$dms = [
+				"kategorie_kurzbz" => "profil_aenderung",
+				"version" => 0,
+				"name" => $_FILES['files']['name'],
+				"mimetype" => $_FILES['files']['type'],
+				"beschreibung" => $this->uid . " Profil Änderung",
+				"insertvon" => $this->uid,
+				"insertamum" => "NOW()",
+			];
+
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+
+			$tmp_res = hasData($tmp_res) ? getData($tmp_res) : null;
+			array_push($res, $tmp_res);
+		}
+
+		echo json_encode($res);
+	}
+
+
+	public function selectProfilRequest()
+	{
+		$_GET = json_decode($this->input->raw_input_stream, true);
+		$uid = $this->input->get('uid');
+		$id = $this->input->get('id');
+		$whereClause = ['uid' => $this->uid];
+
+		if (isset($uid))
+			$whereClause['uid'] = $uid;
+		if (isset($id))
+			$whereClause['id'] = $id;
+
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+		$res = hasData($res) ? getData($res) : null;
+		echo json_encode($res);
+
+	}
+
+
+	public function getProfilRequestFiles()
+	{
+		$id = json_decode($this->input->raw_input_stream);
+
+		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+		$attachmentID = $this->ProfilUpdateModel->load([$id]);
+		if (isError($attachmentID)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
+		}
+		//? get the attachmentID
+		$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
+
+		//? get the name to the file
+		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
+		$attachment = $this->DmsVersionModel->load([$dms_id, 0]);
+		if (isError($attachment)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
+		}
+		$attachment = hasData($attachment) ? getData($attachment) : null;
+		//? returns {name:..., dms_id:...}
+		echo json_encode($attachment);
+	}
+
+	public function insertProfilRequest()
+	{
+
+		$json = json_decode($this->input->raw_input_stream);
+
+		$payload = $json->payload;
+		$identifier = property_exists($json->payload, "kontakt_id") ? "kontakt_id" : (property_exists($json->payload, "adresse_id") ? "adresse_id" : null);
+
+		$data = ["topic" => $json->topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
+
+		//? insert fileID in the dataset if sent with post request
+		if (isset($json->fileID)) {
+			$data['attachment_id'] = $json->fileID;
+
+		}
+
+		//? loops over all updateRequests from a user to validate if the new request is valid
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
+		if (isError($res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
+		}
+		$res = hasData($res) ? getData($res) : null;
+
+		//? the user cannot delete a zustelladresse/kontakt
+		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
+			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+			return;
+		}
+
+		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+		if (isset($payload->delete) && $identifier == "adresse_id") {
+			$adr = $this->AdresseModel->load($payload->$identifier);
+			$adr = getData($adr)[0];
+			if ($adr->heimatadresse) {
+				echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+				return;
+			}
+		}
+
+		if ($res) {
+			$pending_changes = array_filter($res, function ($element) {
+				return $element->status == (self::$STATUS_PENDING ?: "Pending");
+			});
+
+			foreach ($pending_changes as $update_request) {
+				$existing_change = $update_request->requested_change;
+
+				//? the user can add as many new kontakte/adressen as he likes
+				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
+					//? the kontakt_id / adresse_id of a change has to be unique 
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
+					return;
+				}
+
+				//? if it is not updating any kontakt/adresse, the topic has to be unique
+				elseif (!$identifier && $update_request->topic == $json->topic) {
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
+					return;
+				}
+			}
+		}
+
+		$insertID = $this->ProfilUpdateModel->insert($data);
+
+		if (isError($insertID)) {
+			show_error(getData($insertID));
+		} else {
+			$insertID = hasData($insertID) ? getData($insertID) : null;
+
+			//? sends emails to the correspondents of the $uid
+			$this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $json->topic);
+			echo json_encode(success($insertID));
+		}
+	}
+
+	public function updateProfilRequest()
+	{
+		$json = json_decode($this->input->raw_input_stream);
+
+		$updateData = ["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
+		if (isset($json->fileID)) {
+			$updateData['attachment_id'] = json_decode($json->fileID);
+		}
+		$updateID = $this->ProfilUpdateModel->update([$json->ID], $updateData);
+		//? insert fileID in the dataset if sent with post request
+
+		if (isError($updateID)) {
+			//catch error
+		} else {
+			$updateID = hasData($updateID) ? getData($updateID)[0] : null;
+			//TODO: should an email be sent to the responsable people when the user changes his profil update
+			echo json_encode(success($updateID));
+		}
+	}
+
+	public function deleteProfilRequest()
+	{
+
+		$json = json_decode($this->input->raw_input_stream);
+		$delete_res = $this->ProfilUpdateModel->delete([$json]);
+		echo json_encode($delete_res);
+	}
+
+
+	public function getProfilUpdateWithPermission($status = null)
+	{
+		// early return if no status has been passed as argument
+		if (!isset($status)) {
+			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+			return;
+		}
+
+		// get the sprache of the user
+		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
+		$sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
+
+		if (isset($sprachenIndex) && isset($status)) {
+			// get the corresponding status kurz_bz primary key out of the translation
+			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
+			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
+			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
+
+			echo json_encode($res);
+		}
+	}
+
+
+
+	private function getOE_from_student($student_uid)
+	{
+
+		//? returns the oe_einheit eines Studenten 
+		$query = "SELECT public.tbl_studiengang.oe_kurzbz
+		FROM public.tbl_student
+		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+		WHERE public.tbl_student.student_uid = ?;";
+
+		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+		if (!isSuccess($res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
+		}
+		$res = hasData($res) ? getData($res) : [];
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
+	}
+
+
+	public function acceptProfilRequest()
+	{
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
+
+		//? fetching person_id using UID
+		$personID = $this->PersonModel->getByUid($uid);
+		$personID = hasData($personID) ? getData($personID)[0]->person_id : null;
+		$status_message = $this->input->post('status_message', true);
+		$topic = $this->input->post('topic', true);
+
+		//! somehow the xss check converted boolean false to empty string
+		$requested_change = $this->input->post('requested_change');
+
+		//! check for required information
+		if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
+		}
+
+		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+
+		//? check if the permissions are set correctly
+		if (
+			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+		) {
+
+			if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
+				$insertID = $this->handleAdresse($requested_change, $personID);
+				$insertID = hasData($insertID) ? getData($insertID) : null;
+				if (isset($insertID)) {
+					$requested_change['adresse_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
+						return;
+					}
+				}
+
+			} else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
+				$insertID = $this->handleKontakt($requested_change, $personID);
+				$insertID = hasData($insertID) ? getData($insertID) : null;
+				if (isset($insertID)) {
+					$requested_change['kontakt_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
+						return;
+					}
+				}
+
+
+			} else {
+				switch ($topic) {
+					// mapping phrasen to database columns to make the update with the correct column names
+					case self::$TOPICS['Titel']:
+						$topic = "titelpre";
+						break;
+					case self::$TOPICS['Postnomen']:
+						$topic = "titelpost";
+						break;
+					case self::$TOPICS['Vorname']:
+						$topic = "vorname";
+						break;
+					case self::$TOPICS['Nachname']:
+						$topic = "nachname";
+						break;
+					default:
+						show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
+						return;
+				}
+
+				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
+				if (isError($result)) {
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
+					return;
+				}
+			}
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
+
+			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
+		} else {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+		}
+
+
+	}
+
+	public function denyProfilRequest()
+	{
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
+		$topic = $this->input->post('topic', true);
+		$status_message = $this->input->post('status_message', true);
+
+		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+
+		if (
+			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+		) {
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
+			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
+		} else {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+		}
+
+
+	}
+
+	private function updateRequestedChange($id, $requested_change)
+	{
+		return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
+	}
+
+	private function setStatusOnUpdateRequest($id, $status, $status_message)
+	{
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
+	}
+
+	private function deleteOldVersionFile($dms_id)
+	{
+		if (!isset($dms_id)) {
+			return;
+		}
+
+		//? collect all the results of the deleted versions in an array 
+		$res = array();
+
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
+		if (isset($dmsVersions)) {
+			$zwischen_res = array_map(function ($item) {
+				return $item->version;
+			}, $dmsVersions);
+			foreach ($zwischen_res as $version) {
+				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
+			}
+		} else {
+			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
+		}
+
+		//? returns a result for each deleted dms_file
+		return $res;
+	}
+
+
+	private function handleKontakt($requested_change, $personID)
+	{
+		$kontakt_id = $requested_change["kontakt_id"];
+		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["kontakt_id"]);
+
+
+		//! ADD
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+			//? removes add flag
+			unset($requested_change['add']);
+			$requested_change['person_id'] = $personID;
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
+			$insertID = $this->KontaktModel->insert($requested_change);
+			$insert_kontakt_id = $insertID;
+			if (isError($insert_kontakt_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
+			}
+			$insert_kontakt_id = hasData($insert_kontakt_id) ? getData($insert_kontakt_id) : null;
+			if ($insert_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
+			}
+
+
+		}
+		//! DELETE
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+			$this->KontaktModel->delete($kontakt_id);
+		}
+		//! UPDATE
+		else {
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+
+			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
+
+			if (isError($update_kontakt_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
+			}
+			$update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
+			if ($update_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
+			}
+		}
+		return isset($insertID) ? $insertID : null;
+	}
+
+	private function handleAdresse($requested_change, $personID)
+	{
+
+		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
+		$adr_kurzbz = hasData($adr_kurzbz) ? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
+		//? replace the address_typ with its correct kurzbz foreign key
+		$requested_change['typ'] = $adr_kurzbz;
+
+		$adresse_id = $requested_change["adresse_id"];
+		//? removes the adresse_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["adresse_id"]);
+
+
+		//! ADD
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+
+			//? removes add flag
+			unset($requested_change['add']);
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
+			$requested_change['person_id'] = $personID;
+			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
+			$insertID = $this->AdresseModel->insert($requested_change);
+			$insert_adresse_id = $insertID;
+			if (isError($insert_adresse_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
+			}
+			$insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
+			if ($insert_adresse_id) {
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
+			}
+
+		}
+		//! DELETE
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+			$this->AdresseModel->delete($adresse_id);
+		}
+		//! UPDATE
+		else {
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			if (isError($update_adresse_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+			}
+			$update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
+			if ($update_adresse_id) {
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
+			}
+		}
+		return isset($insertID) ? $insertID : null;
+	}
+
+
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+	{
+		if ($zustellung) {
+			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+			if (!isSuccess($zustellKontakteArray)) {
+				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
+			}
+			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
+
+			if ($zustellung && count($zustellKontakteArray) > 0) {
+				$zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
+					return $kontakt->kontakt_id != $kontakt_id;
+				});
+				foreach ($zustellKontakteArray as $kontakt) {
+					$this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
+				}
+
+			}
+		}
+	}
+
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+	{
+		if ($zustellung) {
+			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
+			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+			if (!isSuccess($zustellAdressenArray)) {
+				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
+			}
+			$zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
+
+			if ($zustellung && count($zustellAdressenArray) > 0) {
+
+				$zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
+
+					return $adresse->adresse_id != $adresse_id;
+				});
+				foreach ($zustellAdressenArray as $adresse) {
+					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
+				}
+
+			}
+		}
+	}
+
+
+}
@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class ProjektabgabeUebersicht extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'ProjektabgabeUebersicht']);
-	}
-}
@@ -14,7 +14,7 @@ class Pub extends Auth_Controller
 	{
 		parent::__construct(
 		    array(
-			'bild' => ['basis/cis:r', 'assistenz:r']
+			'bild' => ['basis/cis:r']
 		    )
 		);
 	}
@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Raumsuche extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Raumsuche']);
-	}
-}
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class StgOrgLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'StgOrgLvPlan']);
-	}
-}
@@ -1,37 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Studium extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r'],
-			
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * index loads the Studium view
-	 * @access public
-	 * @return void 
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'studium']);
-	}
-
-
-
-}
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
 *
 */
-class Benotungstool extends Auth_Controller
+class Stundenplan extends Auth_Controller
 {
 	/**
 	 * Constructor
@@ -13,10 +13,8 @@ class Benotungstool extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => array('lehre/benotungstool:rw', 'lehre/benotungstool_assistenz:rw')
+			'index' => ['basis/cis:r']
 		]);
-
-		$this->_ci =& get_instance();
 	}

 	// -----------------------------------------------------------------------------------------------------------------
@@ -27,11 +25,11 @@ class Benotungstool extends Auth_Controller
 	 */
 	public function index()
 	{
+		
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Stundenplan']);
 	}
-	
-}
+}
@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['cis/eigene_zeitsperren:r'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * index loads the view Zeitsperren
-	 * @access public
-	 * @return void
-	 */
-	public function index()
-	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'zeitsperren']);
-	}
-}
@@ -1,31 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Zeitsperrenma extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['cis/andere_zeitsperren:r']
-		]);
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Zeitsperrenma']);
-	}
-}
@@ -1,7 +1,6 @@
 <?php

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 /**
 *
@@ -14,13 +13,10 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-			array(
-				'index' => 'basis/cis:r'
-			)
+		    array(
+			'index' => 'basis/cis:r'
+		    )
 		);
-
-		// Load Config
-		$this->load->config('calendar');
 	}

 	// -----------------------------------------------------------------------------------------------------------------
@@ -31,6 +27,15 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'FhcDashboard']);
+		$this->load->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+		
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
-}
+}
@@ -17,15 +17,14 @@ class Cms extends Auth_Controller
 		    array(
 			'content' => 'basis/cis:r',
 			'getNews' => 'basis/cis:r',
+			'getNewsRowCount' => 'basis/cis:r',
 			'getRoomInformation' => 'basis/cis:r',
-			'news' => 'basis/cis:r',
-			'newsAdministration' => ['basis/news:r'],
+			'news' => 'basis/cis:r'
 		    )
 		);

 		// Loads Libraries
 		$this->load->library('CmsLib');
-		$this->load->library('PermissionLib');

 		// Loads phrases system
 		$this->loadPhrases([
@@ -84,26 +83,13 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{	
-		$this->load->view('CisRouterView/CisRouterView.php', [
-			'route' => 'News',
-		]);
+		$viewData = array();
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
 	}
 	
-	public function newsAdministration()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', [
-			'route' => 'NewsAdministration',
-		]);
-	}
-
-	public function getRoomInformation($ort_kurzbz)
-	{
-		// Load Config
-		$this->load->config('calendar');
-
+	public function getRoomInformation($ort_kurzbz){
 		$viewData = array(
-			'ort_kurzbz' => $ort_kurzbz,
-			'timezone' => $this->config->item('timezone')
+			'ort_kurzbz' => $ort_kurzbz
 		);
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'CmsRoom']);
 	}
@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'dashboard/benutzer:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$this->load->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
+	}
+}
@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class LVVerwaltung extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-
-		$router = load_class('Router');
-		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
-		parent::__construct($permissions);
-
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$this->load->view('LVVerwaltung', [
-			'permissions' => [
-				'lehre/lehrveranstaltung' => $this->permissionlib->isBerechtigt('lehre/lehrveranstaltung'),
-				'lv-plan/gruppenentfernen' => $this->permissionlib->isBerechtigt('lv-plan/gruppenentfernen'),
-				'lv-plan/lektorentfernen' => $this->permissionlib->isBerechtigt('lv-plan/lektorentfernen'),
-			],
-			'variables' => [
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
-			],
-			'configs' => [
-				'showVertragsdetails' => defined('FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN') && FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN,
-				'showGewichtung' => defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG,
-				'lehreinheitAnmerkungDefault' => defined('LEHREINHEIT_ANMERKUNG_DEFAULT') ? LEHREINHEIT_ANMERKUNG_DEFAULT : '',
-				'lehreinheitRaumtypDefault' => defined('DEFAULT_LEHREINHEIT_RAUMTYP') ? DEFAULT_LEHREINHEIT_RAUMTYP : '',
-				'lehreinheitRaumtypAlternativeDefault' => defined('DEFAULT_LEHREINHEIT_RAUMTYP_ALTERNATIV') ? DEFAULT_LEHREINHEIT_RAUMTYP_ALTERNATIV : ''
-			]
-		]);
-
-	}
-}
@@ -1,37 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class NeueNachricht extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$typeid = $this->input->post('typeid');
-		$ids = ($this->input->post('ids') && strpos($this->input->post('ids'), ',')) 
-			? explode(',', $this->input->post('ids'))
-			: $this->input->post('ids');
-
-		//now working
-		$this->load->view('Nachrichten', [
-			'permissions' => [
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-			],
-			'ids' => $ids,
-			'typeid' => $typeid
-		]);
-	}
-}
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller redirects urls to another location. This is mainly used
- * with the $routes config
- */
-class Redirect extends CI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * Main function to handle all redirects.
-	 *
-	 * @param string				$method - the redirect code (30x)
-	 * @param array					$params - the url to redirect to
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params)
-	{
-		redirect($params, 'location', $method);
-	}
-}
@@ -28,14 +28,10 @@ class Studentenverwaltung extends Auth_Controller
 				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz', 'suid'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
-				'student/editBakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editBakkZgv') ?: array(),
-				'student/editMakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editMakkZgv') ?: array(),
-				'student/editDokZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editDokZgv') ?: array(),
-				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
@@ -43,5 +39,3 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
-
-
@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Vertragsverwaltung extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
-		#$permissions[$router->method] = ['admin:rw'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$this->load->view('Vertragsverwaltung', [
-			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
-			]
-		]);
-	}
-}
@@ -20,10 +20,6 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');

 class AuthInfo extends FHCAPI_Controller
 {
-	protected $uid;
-	protected $pid;
-	protected $isMitarbeiter;
-	protected $isStudent;

 	/**
 	 * Object initialization
@@ -32,16 +28,10 @@ class AuthInfo extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getAuthUID' => self::PERM_LOGGED,
-			'getAuthInfo' => self::PERM_LOGGED,
 		]);

-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-		$this->isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($this->uid)) ?? false;
-		$this->isStudent = getData($this->StudentModel->isStudent($this->uid)) ?? false;
 	}

 	//------------------------------------------------------------------------------------------------------------------
@@ -57,14 +47,6 @@ class AuthInfo extends FHCAPI_Controller
 		$this->terminateWithSuccess(['uid'=>$this->uid]);
 	}
 	
-	public function getAuthInfo()
-	{
-		$data = (object) array(
-				'uid' => $this->uid,
-				'isMitarbeiter' => $this->isMitarbeiter,
-				'isStudent' => $this->isStudent
-		);
-		$this->terminateWithSuccess($data);
-	}
+	
 }

@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class Benutzer extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getUserData' => self::PERM_LOGGED,
-		]);
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getUserData()
-	{
-		$uid = $this->input->get("uid") ?? getAuthUID();
-		$this->BenutzerModel->addSelect("uid, person_id, insertamum");
-		$userResult = $this->BenutzerModel->load(["uid" => $uid]);
-		$userData = $this->getDataOrTerminateWithError($userResult);
-		$this->terminateWithSuccess($userData);
-	}
-}
-
@@ -17,8 +17,27 @@
 */

 if (! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * @SWG\Info(
+ *     title="Bookmark API",
+ *     version="1.0.0"
+ * )
+ */
+
+/**
+ * @SWG\Swagger(
+ *     schemes={"https"},
+ *     basePath="/fhcompletecis4/cis.php/api/frontend/v1/Bookmark/"
+ * )
+ */
+
+/**
+ * @SWG\SecurityScheme(
+ *     securityDefinition="basicAuth",
+ *     type="basic"
+ * )
+ */

-use \DateTime as DateTime;

 class Bookmark extends FHCAPI_Controller
 {
@@ -30,162 +49,228 @@ class Bookmark extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
-			'delete' => self::PERM_LOGGED,
-			'insert' => self::PERM_LOGGED,
+            'delete' => self::PERM_LOGGED,
+            'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
-			'changeOrder' => self::PERM_LOGGED
-		]);
+			'test_true' => self::PERM_LOGGED
+        ]);

 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');

 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+
 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

 	
-	/**
-	 * gets the bookmarks associated to a user
+    /**
+	 * gets the bookmarks associated to a user 
 	 * @access public
 	 * @return void
+	 * @SWG\Get(
+	 *      path="/getBookmarks",
+	 *      security={{"basicAuth":{}}},
+	 *      tags={"bookmarks"},
+	 *      summary="Get user's bookmarks",
+	 *      description="Returns all bookmarks associated with the authenticated user.",
+	 *      @SWG\Response(
+	 *          response=200,
+	 *          description="List of bookmarks"
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=401,
+	 *          description="Unauthorized"
+	 *      )
+	 *  )
 	 */
 	public function getBookmarks()
 	{
-		$this->BookmarkModel->addOrder("sort");
+        $this->BookmarkModel->addOrder("bookmark_id");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);

-		$bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);

-		$this->terminateWithSuccess($bookmarks);
-	}
+        $this->terminateWithSuccess($bookmarks);
+    }

-	/**
-	 * deletes bookmark from associated user
+    /**
+	 * deletes bookmark from associated user 
 	 * @access public
 	 * @return void
+	 * @SWG\Post(
+	 *      path="/delete/{bookmark_id}",
+	 *      security={{"basicAuth":{}}},
+	 *      tags={"bookmarks"},
+	 *      summary="Delete a bookmark",
+	 *      description="Deletes a bookmark if the user is the owner or an admin.",
+	 *      @SWG\Parameter(
+	 *          name="bookmark_id",
+	 *          in="path",
+	 *          required=true,
+	 *          type="integer"
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=200,
+	 *          description="Bookmark deleted successfully"
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=403,
+	 *          description="Forbidden - not the owner"
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=404,
+	 *          description="Bookmark not found"
+	 *      )
+	 *  )
 	 */
-	public function delete($bookmark_id)
+    public function delete($bookmark_id)
 	{
-		$bookmark = $this->BookmarkModel->load($bookmark_id);
+        $bookmark = $this->BookmarkModel->load($bookmark_id);

-		$bookmark = current($this->getDataOrTerminateWithError($bookmark));
+        $bookmark = current($this->getDataOrTerminateWithError($bookmark));

-		// only delete bookmark if the user is the owner of the bookmark
-		if ($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')) {
-			$delete_result = $this->BookmarkModel->delete($bookmark_id);
+        // only delete bookmark if the user is the owner of the bookmark
+        if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){

-			$delete_result = $this->getDataOrTerminateWithError($delete_result);
+            $delete_result = $this->BookmarkModel->delete($bookmark_id);

-			$this->terminateWithSuccess($delete_result);
-		} else {
-			$this->_outputAuthError(['delete' => ['admin:rw']]);
-		}
-	}
+            $delete_result = $this->getDataOrTerminateWithError($delete_result);

-	/**
-	 * inserts new bookmark into the bookmark table
+            $this->terminateWithSuccess($delete_result);
+        }else{
+            $this->_outputAuthError(['delete' => ['admin:rw']]);
+        }
+    }
+
+    /**
+	 * inserts new bookmark into the bookmark table 
 	 * @access public
 	 * @return void
+	 * @SWG\Post(
+	 *      path="/insert",
+	 *      security={{"basicAuth":{}}},
+	 *      tags={"bookmarks"},
+	 *      summary="Insert a new bookmark",
+	 *      @SWG\Parameter(
+	 *           name="body",
+	 *           in="body",
+	 *           required=true,
+	 *           @SWG\Schema(
+	 *               type="object",
+	 *               required={"url", "title"},
+	 *               @SWG\Property(
+	 *                   property="url",
+	 *                   type="string",
+	 *                   example="https://github.com/swagger-api/swagger-codegen"
+	 *               ),
+	 *               @SWG\Property(
+	 *                   property="title",
+	 *                   type="string",
+	 *                   example="Swagger Codegen"
+	 *               ),
+	 *               @SWG\Property(
+	 *                   property="tag",
+	 *                   type="string",
+	 *                   example="API"
+	 *               )
+	 *           )
+	 *       ),
+	 *       @SWG\Response(
+	 *           response=201,
+	 *           description="Bookmark created"
+	 *       ),
+	 *       @SWG\Response(
+	 *           response=400,
+	 *           description="Validation error"
+	 *       )
+	 *  )
 	 */
-	public function insert()
+    public function insert()
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());

-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag); // convert PHP array to JSON string
-		}
-		$sort = $this->input->post('sort', true);
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);
+        $tag = $this->input->post('tag', true);

-		$insert_into_result = $this->BookmarkModel->insert([
-			'uid' => $this->uid,
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'insertvon' => $this->uid,
-			'updateamum' => null,
-			'updatevon' => null,
-			'sort' => $sort
-		]);
+        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);

-		$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);

-		$this->terminateWithSuccess($insert_into_result);
-	}
+        $this->terminateWithSuccess($insert_into_result);
+
+    }

 	/**
-	 * updates bookmark in the bookmark table
-	 * @access public
-	 * @return void
+	 * @SWG\Post(
+	 *      path="/update/{bookmark_id}",
+	 *      security={{"basicAuth":{}}},
+	 *      tags={"bookmarks"},
+	 *      summary="Update a bookmark",
+	 *      description="Updates a bookmark's URL and title for the given ID.",
+	 *      @SWG\Parameter(
+	 *          name="bookmark_id",
+	 *          in="path",
+	 *          required=true,
+	 *          type="integer",
+	 *          description="ID of the bookmark to update"
+	 *      ),
+	 *      @SWG\Parameter(
+	 *          name="body",
+	 *          in="body",
+	 *          required=true,
+	 *          @SWG\Schema(
+	 *              type="object",
+	 *              required={"url", "title"},
+	 *              @SWG\Property(
+	 *                  property="url",
+	 *                  type="string",
+	 *                  example="https://updated-url.com"
+	 *              ),
+	 *              @SWG\Property(
+	 *                  property="title",
+	 *                  type="string",
+	 *                  example="Updated Title"
+	 *              )
+	 *          )
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=200,
+	 *          description="Bookmark updated"
+	 *      ),
+	 *      @SWG\Response(
+	 *          response=400,
+	 *          description="Validation error"
+	 *      )
+	 * )
 	 */
-	public function update($bookmark_id)
+    public function update($bookmark_id)
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());

-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag);
-		}
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);

 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');

-		$update_result = $this->BookmarkModel->update($bookmark_id, [
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'updateamum' => $now
-		]);
+        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);

-		$update_result = $this->getDataOrTerminateWithError($update_result);
+        $update_result = $this->getDataOrTerminateWithError($update_result);

-		$this->terminateWithSuccess($update_result);
-	}
+        $this->terminateWithSuccess($update_result);

-	/**
-	 * changes sort of two bookmarks in the bookmark table
-	 * @access public
-	 * @return void
-	 */
-	public function changeOrder($bookmark_id1, $bookmark_id2)
-	{
-		$update_result = [];
-
-		$result1 = $this->BookmarkModel->load($bookmark_id1);
-		$data1 = $this->getDataOrTerminateWithError($result1);
-		$sort1 = current($data1)->sort;
-
-		$result2 = $this->BookmarkModel->load(["bookmark_id"=>$bookmark_id2]);
-		$data2 = $this->getDataOrTerminateWithError($result2);
-		$sort2 = current($data2)->sort;
-
-		$update_result1 = $this->BookmarkModel->update($bookmark_id1, [
-			'sort' => $sort2
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result1);
-
-		$update_result2 = $this->BookmarkModel->update($bookmark_id2, [
-			'sort' => $sort1
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result2);
-
-		$this->terminateWithSuccess($update_result);
-	}
+    }
 }

@@ -27,7 +27,7 @@ class Cis4FhcApi extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'dashboardViewData' => self::PERM_LOGGED,
+			'getViewData' => self::PERM_LOGGED,
 		]);
 		
 	}
@@ -36,22 +36,17 @@ class Cis4FhcApi extends FHCAPI_Controller
 	// Public methods

 	/**
-     * retrieves view data for dashboard view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function dashboardViewData()
+	 * fetches ViewData
+	 */
+	public function getViewData()
 	{
 		$this->load->model('person/Person_model','PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];

-		$this->load->config('calendar');
-
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id,
-			'timezone' => $this->config->item('timezone'),
+			'person_id' => $personData->person_id
 		);

 		$this->terminateWithSuccess($viewData);
@@ -16,13 +16,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');


 class CisMenu extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -32,113 +31,28 @@ class CisMenu extends FHCAPI_Controller
 			'getMenu' => self::PERM_LOGGED,
 		]);

-
+		

 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	/**
+    /**
 	 * fetches the menu for CIS from the database based on the userLanguage
 	 */
-	public function getMenu()
+    public function getMenu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
 		$this->load->config('cis');
-		$cis4_content_id = $this->config->item('cis_menu_root_content_id');
-		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(), getUserLanguage());
+		$cis4_content_id =$this->config->item('cis_menu_root_content_id');
+		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
 		$result = $this->getDataOrTerminateWithError($result);
 		$menu = $result->childs ?? [];
-
-		$menu = $this->generateUrlsForMenuItems($menu);
 		$this->terminateWithSuccess($menu);
-	}
+    }

-	private function generateUrlsForMenuItems($menuItems)
-	{
-		return array_map(
-			function ($menuItem) {
-				return $this->generateUrlForMenuItem($menuItem);
-			},
-			$menuItems
-		);
-	}
-
-	private function generateUrlForMenuItem($menuItem)
-	{
-		if(!isset($menuItem->url))
-		{
-			$menuItem->url = $this->menuItemUrlHelper($menuItem);
-			unset($menuItem->content);
-		}
-
-		if ($menuItem->childs && count($menuItem->childs)) {
-			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
-		}
-
-		return $menuItem;
-	}
-
-	private function menuItemUrlHelper($menuItem)
-	{
-		if ($menuItem->template_kurzbz !== 'redirect') {
-			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
-		}
-
-		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		$this->menuItemUrlTargetHelper($menuItem, $doc);
-
-		if (!$urlElem) {
-			return '';
-		}
-
-		$url = $urlElem->textContent;
-
-		if (strpos($url, '../cms/news.php') !== false) {
-			$newsRegex = '/^\.\.\/cms\/news\.php/';
-			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
-		}
-
-		if (strpos($url, '../cms/content.php?') !== false) {
-			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
-			$matches = [];
-			preg_match($contentRegex, $url, $matches);
-			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
-		}
-
-		if (strpos($url, '../index.ci.php') !== false) {
-			$indexRegex = '/^\.\.\/index\.ci\.php/';
-			$url = preg_replace($indexRegex, site_url(), $url);
-		}
-
-		if (strpos($url, '../') !== false) {
-			$relativeRegex = '/^\.\.\//';
-			$url = preg_replace($relativeRegex, base_url(), $url);
-		}
-
-		return $url;
-	}
-
-	private function menuItemUrlTargetHelper($menuItem, $xmldoc)
-	{
-		if($menuItem->template_kurzbz === 'redirect')
-		{
-			$targetElem = $xmldoc->getElementsByTagName('target')->item(0);
-			$target = ($targetElem) ? $targetElem->textContent : '';
-			if(!in_array($target, array('_self', '_top', '_blank')))
-			{
-				$target = '_self';
-			}
-			$menuItem->target = $target;
-		}
-	}
+	
+	
 }

@@ -36,15 +36,14 @@ class Cms extends FHCAPI_Controller
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
            'content' => self::PERM_LOGGED,
-			'newsForWidget' => self::PERM_LOGGED,
+			'news' => self::PERM_LOGGED,
+			'getNewsRowCount' => self::PERM_LOGGED,
 			'getNews' => self::PERM_LOGGED,

 		]);

 		$this->load->model('content/News_model', 'NewsModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		
+
 		// setting up the papgination_size
 		$this->page_size = 10;

@@ -60,6 +59,7 @@ class Cms extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods

+
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

@@ -106,7 +106,7 @@ class Cms extends FHCAPI_Controller
 		$this->terminateWithSuccess($content_id);
 	}

-	public function newsForWidget()
+	public function news()
 	{

 		// form validation
@@ -118,7 +118,7 @@ class Cms extends FHCAPI_Controller
 		$this->load->model('content/news_model', 'NewsModel');
 		
 		$limit =  $this->input->get('limit',TRUE);
-
+		
 		//query the news
 		$news = $this->NewsModel->getAll($limit);

@@ -157,7 +157,23 @@ class Cms extends FHCAPI_Controller
        
 	}

-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = false, $titel = '', $edit = false, $sichtbar = true)
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		
+		$this->load->model('content/News_model','NewsModel');
+
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		
+		$num_rows = $this->getDataOrTerminateWithError($num_rows);
+		
+		$this->terminateWithSuccess($num_rows);
+		
+	}
+
+
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
 		//form validation
 		$this->load->library('form_validation');
@@ -177,45 +193,15 @@ class Cms extends FHCAPI_Controller

 		// default value for the page_size is 10
 		$page_size = $page_size ?? 10;
-
-		$passedSichtbar = $this->input->get('published', true);
-		if($passedSichtbar !== null)
-		{
-			$sichtbar = $passedSichtbar;
-		}
 		
-		$filterForDegreePrograms = false;
-		$entitledDegreePrograms = [];
-		$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
-		if(isError($student))
-		{
-			$this->terminateWithError(getError($student));
-		}
-		if(hasData($student))
-		{
-			$student = current(getData($student));
-
-			$degreeProgramSemesterDataResult = $this->PrestudentModel->getStudiengaengAndAusbildungssemesterByStudentUid(getAuthUID());
-			$degreeProgramSemesterData = $this->getDataOrTerminateWithError($degreeProgramSemesterDataResult)[0];
-			if ($degreeProgramSemesterData) {
-				$studiengang_kz = isset($degreeProgramSemesterData->studiengang_kz) ? $degreeProgramSemesterData->studiengang_kz : null;
-				$semester = isset($degreeProgramSemesterData->ausbildungssemester) ? $degreeProgramSemesterData->ausbildungssemester : null;
-			}
-
-			$mischen = true;
-		} else {
-			$filterForDegreePrograms = true;
-			$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
-			array_push($entitledDegreePrograms, 0);
-		}
-
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size, $sprache, $filterForDegreePrograms, $entitledDegreePrograms, true);
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size, $sprache);
 		$news = $this->getDataOrTerminateWithError($news);

-		$this->addMeta('row_count', $news["row_count"] ?? 0);
-		$this->terminateWithSuccess($news["content"]);
+		$this->addMeta('phrases', json_decode($this->p->getJson()));
+		$this->terminateWithSuccess($news);

 	}

 	
 }
+
@@ -43,8 +43,7 @@ class Documents extends FHCAPI_Controller
 		parent::__construct([
 			'permissionAlternativeFormat' => self::PERM_LOGGED,
 			'archive' => ['admin:rw', 'assistenz:rw'],
-			'archiveSigned' => ['admin:rw', 'assistenz:rw'],
-			'download' => ['admin:rw', 'assistenz:rw']
+			'archiveSigned' => ['admin:rw', 'assistenz:rw']
 		]);

 		// Load Phrases
@@ -67,7 +66,7 @@ class Documents extends FHCAPI_Controller
 	}

 	/**
-	 * Archive a not signed document.
+	 * Download a not signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -80,7 +79,7 @@ class Documents extends FHCAPI_Controller
 	}

 	/**
-	 * Archive a signed document.
+	 * Download a signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -92,42 +91,6 @@ class Documents extends FHCAPI_Controller
 		return $this->_archive($xml, $xsl, getAuthUID());
 	}

-	/**
-	 *
-	 * @return void
-	 */
-	public function download($xml, $xsl, $sign_user = null)
-	{
-		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
-
-		$akteData = $akteData['akteData'];
-		$exportData = $akteData['exportData'];
-
-		/**
-		 *				[
-					'vorlage' => $vorlage,
-					'xml_data' => $data,
-					'oe_kurzbz' => $xsl_oe_kurzbz,
-					'version' => $version,
-					'outputformat' => $outputformat,
-					'sign_user' => $sign_user
-				]
-		 */
-
-		// Output
-		$result = $this->documentexportlib->showContent(
-			$akteData['akteData']['inhalt'],
-			$exportData['vorlage'],
-			$exportData['xml_data'],
-			$exportData['oe_kurzbz'],
-			$exportData['version'],
-			$exportData['outputformat'],
-			$exportData['sign_user']
-		);
-
-		$this->terminateWithSuccess(true);
-	}
-
 	/**
 	 * Helper function for archive() and archiveSigned()
 	 *
@@ -137,36 +100,16 @@ class Documents extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	private function _archive($xml, $xsl, $sign_user = null)
-	{
-		$akteData = $this->_getAkteExportData($xml, $xsl, $sign_user);
-
-		$this->load->model('crm/Akte_model', 'AkteModel');
-		$result = $this->AkteModel->insert($akteData['akteData']);
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
-
-	/**
-	 * @param string				$xml
-	 * @param string				$xsl
-	 * @param string				$sign_user (optional)
-	 *
-	 * @return array with Akte data and export data
-	 */
-	private function _getAkteExportData($xml, $xsl, $sign_user = null)
+	public function _archive($xml, $xsl, $sign_user = null)
 	{
 		if (!$xml || !$xsl) {
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
-				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
-				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}

@@ -220,7 +163,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -228,13 +171,12 @@ class Documents extends FHCAPI_Controller
 		$studiengang_kz = null;
 		if ($akteData['uid']) {
 			$this->load->model('crm/Student_model', 'StudentModel');
-			$this->StudentModel->addSelect('tbl_student.*, UPPER(typ || kurzbz) AS kuerzel');
 			$this->StudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 			$result = $this->StudentModel->load([$akteData['uid']]);
 			$student = current($this->getDataOrTerminateWithError($result));

 			$ss = $this->input->post_get('ss');
-
+			
 			if ($ss !== null) {
 				$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 				$result = $this->PrestudentstatusModel->getLastStatus($student->prestudent_id, $ss);
@@ -250,9 +192,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));

 				$studiengang_kz = $res->studiengang_kz;
@@ -334,10 +273,9 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
-
+				
 				$studiengang_kz = $prestudent->studiengang_kz;
 				$akteData['person_id'] = $prestudent->person_id;
 				$akteData['titel'] = mb_substr($xsl . "_" . $prestudent->kuerzel, 0, 64);
@@ -380,10 +318,9 @@ class Documents extends FHCAPI_Controller

 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			$access_rights = current($this->getDataOrTerminateWithError($result));
-			// TODO: was bedeutet wenn keine berechtigung?
 			if (!$access_rights || !$access_rights->berechtigung)
 				return show_404();
-
+			
 			$allowed = false;
 			foreach ($access_rights->berechtigung as $access_right) {
 				if ($this->permissionlib->isBerechtigt($access_right)) {
@@ -445,10 +382,6 @@ class Documents extends FHCAPI_Controller
 			'betreuerart_kurzbz',
 			'studiensemester_kurzbz'
 		] as $key) {
-			if (in_array($xsl, array('Ausbildungsver', 'AusbVerEng')) && $key === 'uid')
-			{
-				continue;
-			}
 			$value = $this->input->post_get($key);
 			if ($value !== null)
 				$params .= '&' . $key . '=' . urlencode($value);
@@ -461,11 +394,11 @@ class Documents extends FHCAPI_Controller

 		if (!$vorlage->archivierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_archive"));
-
+		
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));

-
+		
 		$this->load->library('DocumentExportLib');

 		// XML Data
@@ -480,17 +413,10 @@ class Documents extends FHCAPI_Controller
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);

-		return [
-			'akteData' => $akteData,
-			'exportData' =>
-				[
-					'vorlage' => $vorlage,
-					'xml_data' => $data,
-					'oe_kurzbz' => $xsl_oe_kurzbz,
-					'version' => $version,
-					'outputformat' => $outputformat,
-					'sign_user' => $sign_user
-				]
-		];
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->insert($akteData);
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(true);
 	}
 }
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about languages
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class Language extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => self::PERM_LOGGED
-		]);
-
-		// Load models
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-	}
-
-	public function get()
-	{
-		$this->SpracheModel->addOrder('sprache');
-
-		$result = $this->SpracheModel->load();
-		$data = $this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($data);
-	}
-}
@@ -18,9 +18,10 @@

 if (! defined('BASEPATH')) exit('No direct script access allowed');

+
 class Lehre extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -30,57 +31,40 @@ class Lehre extends FHCAPI_Controller
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
-			'semesterAverageGrade' => self::PERM_LOGGED,
-			'getZugewieseneLv' => self::PERM_LOGGED,
-			'getLeForLv' => self::PERM_LOGGED
 		]);

-		$this->load->library('PhrasesLib');
+		

-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'abgabetool'
-			)
-		);
-
-		$this->load->helper('hlp_sancho_helper');
-
-		require_once(FHCPATH . 'include/studiengang.class.php');
-		require_once(FHCPATH . 'include/student.class.php');
-		require_once(FHCPATH . 'include/projektarbeit.class.php');
-		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	/**
+    /**
 	 * constructs the emails of the groups from a lehrveranstaltung
 	 */
-	public function lvStudentenMail()
+    public function lvStudentenMail()
 	{
-		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        
+        // return early if the required parameter is missing
+        if(!isset($lehreinheit_id))
+        {
+            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+        }

-		// return early if the required parameter is missing
-		if(!isset($lehreinheit_id))
-		{
-			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-		}
+        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+        
+        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);

-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
-
-		$studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);

 		//convert array of objects into array of strings
 		$studentenMails = array_map(function($element){
 			return $element->mail;
 		}, $studentenMails);

-		$this->terminateWithSuccess($studentenMails);
+        $this->terminateWithSuccess($studentenMails);
 	}

 	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
@@ -90,13 +74,13 @@ class Lehre extends FHCAPI_Controller
 		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);

 		$result = current($this->getDataOrTerminateWithError($result));
-
+		
 		$this->terminateWithSuccess($result);
 	}

 	/**
 	 * fetches all Pruefungen of a student for a specific lehrveranstaltung
-	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
+	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database 
 	 * @param mixed $lehrveranstaltung_id
 	 * @return void
 	 */
@@ -110,90 +94,10 @@ class Lehre extends FHCAPI_Controller

 		$this->terminateWithSuccess($result);
 	}
+	

-	/**
-	 * calculates and returns the grade average and weighted average for a specific semester
-	 * @param string $studiensemester_kurzbz
-	 * @return void
-	 */
-
-	public function semesterAverageGrade($studiensemester_kurzbz)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$semesterLvs = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
-
-		if (isError($semesterLvs))
-			return $this->outputJsonError(getError($semesterLvs));
-
-		$semesterLvsData = getData($semesterLvs);
-
-		$doGradesExist = false;
-		$sum = 0;
-		$count = 0;
-		$sumWeighted = 0;
-		$sumEcts = 0;
-
-		foreach ($semesterLvsData as $lv) {
-			if (!$lv->znote || $lv->znote < 1 || $lv->znote > 5)
-				continue;
-
-			$doGradesExist = true;
-
-			$sum += $lv->znote;
-			$count++;
-			$sumWeighted += $lv->znote * floatval($lv->ects);
-			$sumEcts += floatval($lv->ects);
-		}
-
-		$averageGrade = null;
-		$weightedAverageGrade = null;
-		if ($doGradesExist) {
-			$averageGrade = $sum/$count;
-			$weightedAverageGrade = $sumWeighted/$sumEcts;
-		}
-
-		$this->terminateWithSuccess(['average_grade' => $averageGrade, 'weighted_average_grade' => $weightedAverageGrade]);
-	}
-
-	/**
-	 * fetches all assigned lehrveranstaltungen of a mitarbeiter for a given semester
-	 * @param mixed $uid
-	 * @param mixed $sem_kurzbz
-	 * @return void
-	 */
-	public function getZugewieseneLv() {
-		$uid = $this->input->get("uid",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		// TODO: error messages
-
-		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if (!isset($uid) || isEmptyString($uid))
-			$uid = getAuthUID();
-
-		// querying other ma_uids data requires admin permission
-		if($uid !== getAuthUID()) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
-		}
-
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getLeForLv() {
-		$lv_id = $this->input->get("lv_id",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-//		$this->terminateWithSuccess($this->LehreinheitModel->getLesForLv($lv_id, $sem_kurzbz));
-		$this->terminateWithSuccess($this->LehreinheitModel->getAllLehreinheitenForLvaAndMaUid($lv_id, getAuthUID(), $sem_kurzbz));
-	}
+	

+	
 }
+
@@ -1,420 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Lehrveranstaltung extends FHCAPI_Controller
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getByEmp' => ['admin:r', 'assistenz:r'],
-			'getByLe' => ['admin:r', 'assistenz:r'],
-			'getByLv' => ['admin:r', 'assistenz:r'],
-			'getByStg' => ['admin:r', 'assistenz:r'],
-			'getByStgOrgform' => ['admin:r', 'assistenz:r'],
-			'loadByLV' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_setAuthUID();
-
-		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
-	}
-
-	public function getByEmp($studiensemester_kurzbz = null, $mitarbeiter_uid = null, $stg_kz = null)
-	{
-
-		if (is_null($mitarbeiter_uid))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz);
-		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-
-		$tree = [];
-
-		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
-		{
-			$lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid);
-			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-			if (!isset($lehrveranstaltung->_children))
-			{
-				$lehrveranstaltung->_children = $lehreinheiten_data;
-			}
-			$tree[] = $lehrveranstaltung;
-		}
-
-		$this->terminateWithSuccess($tree);
-	}
-
-	public function getByLe($studiensemester_kurzbz = null, $lehreinheit_id = null)
-	{
-		if (is_null($lehreinheit_id))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-
-		$lehreinheiten = $this->_ci->LehreinheitModel->getByLeStudiensemester($lehreinheit_id, $studiensemester_kurzbz);
-		$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-		$this->terminateWithSuccess($lehreinheiten_data);
-	}
-
-	public function getByLv($studiensemester_kurzbz = null, $lehrveranstaltung_id = null)
-	{
-		if (is_null($lehrveranstaltung_id))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-		$tree = [];
-
-		$this->_ci->LehrveranstaltungModel->addSelect('studiengang_kz');
-		$lv = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
-		$lv = $this->getDataOrTerminateWithError($lv);
-
-		if (empty($lv))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$lehrveranstaltungen_data = array();
-		foreach ($this->_loadLvRows(current($lv)->studiengang_kz, $studiensemester_kurzbz) as $row)
-		{
-			if ((string)$row->lehrveranstaltung_id === (string)$lehrveranstaltung_id)
-			{
-				$lehrveranstaltungen_data[] = $row;
-				break;
-			}
-		}
-
-		if (empty($lehrveranstaltungen_data))
-		{
-
-			$this->_ci->LehrveranstaltungModel->addSelect('
-				tbl_lehrveranstaltung.*,
-				tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
-				lehrveranstaltung_id,
-				lehrtyp_kurzbz,
-				studiengang_kz as lv_studiengang_kz,
-				UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang,
-				semester as semester,
-				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-				ects as lv_ects,
-				lehreverzeichnis as lv_lehreverzeichnis,
-				planfaktor as lv_planfaktor,
-				planlektoren as lv_planlektoren,
-				planpersonalkosten as lv_planpersonalkosten,
-				plankostenprolektor as lv_plankostenprolektor,
-				tbl_lehrveranstaltung.orgform_kurzbz as orgform_kurzbz,
-				tbl_lehrveranstaltung.sprache as sprache,
-				lehrform_kurzbz as lv_lehrform_kurzbz,
-				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
-				semesterstunden as lv_semesterstunden,
-			');
-			$this->_ci->LehrveranstaltungModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-			$lehrveranstaltungen = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
-			$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		}
-
-		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
-		{
-			$lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
-			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-			if (!isset($lehrveranstaltung->_children))
-			{
-				$lehrveranstaltung->_children = $lehreinheiten_data;
-			}
-			$tree[] = $lehrveranstaltung;
-		}
-
-		$counter = 0;
-		$this->assignUniqueIndex($tree, $counter);
-		$this->terminateWithSuccess($tree);
-	}
-
-	public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
-	{
-		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, null);
-	}
-
-	public function getByStgOrgform($studiensemester_kurzbz = null, $stg_kz = null, $orgform = null, $semester = null)
-	{
-		$orgform_kurzbz = $this->getOrgformKurzbz($orgform);
-		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz);
-	}
-
-	private function _getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz)
-	{
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if (!is_null($semester) && !ctype_digit((string)$semester))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-		$lehrveranstaltungen_data = $this->_loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
-
-		$tree = [];
-		foreach ($lehrveranstaltungen_data as $row)
-		{
-			$rowData = $row;
-
-			$lehreinheiten_data = $this->_ci->LehreinheitModel->getByLvidStudiensemester($row->lehrveranstaltung_id, $studiensemester_kurzbz);
-
-			if (hasData($lehreinheiten_data))
-			{
-				$lehreinheiten = getData($lehreinheiten_data);
-
-				if (!isset($row->_children))
-				{
-					$row->_children = $lehreinheiten;
-				}
-				else
-				{
-					if (!is_array($row->_children))
-					{
-						$row->_children = [$row->_children];
-					}
-					$row->_children = array_merge($row->_children, $lehreinheiten);
-				}
-			}
-
-			if (!isEmptyString($row->studienplan_lehrveranstaltung_id_parent))
-			{
-				$child = $this->_ci->StudienplanModel->loadStudienplanLehrveranstaltung($row->studienplan_lehrveranstaltung_id_parent);
-
-				if (hasData($child))
-				{
-					$child = getData($child)[0];
-					$searchId = $child->lehrveranstaltung_id;
-
-					foreach ($lehrveranstaltungen_data as &$searchParent)
-					{
-						if ($searchParent->lehrveranstaltung_id === $searchId)
-						{
-							if (!isset($searchParent->_children))
-							{
-								$searchParent->_children = [];
-							}
-
-							if (is_array($searchParent->_children))
-							{
-								$searchParent->_children[] = $row;
-							}
-							else
-							{
-								$searchParent->_children = [$searchParent->_children, $row];
-							}
-							break;
-						}
-					}
-
-				}
-			}
-			else
-			{
-				$tree[] = $rowData;
-			}
-		}
-
-		$counter = 0;
-		$this->assignUniqueIndex($tree, $counter);
-		$this->terminateWithSuccess($tree);
-	}
-
-
-	public function loadByLV($lehrveranstaltung_id = null)
-	{
-		if (is_null($lehrveranstaltung_id) || !ctype_digit((string)$lehrveranstaltung_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->_ci->LehrveranstaltungModel->addSelect('lehrveranstaltung_id, lehrform_kurzbz, lehre, bezeichnung as lvbezeichnung, sprache');
-		$lehrveranstaltung_result = $this->_ci->LehrveranstaltungModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung_id));
-		$lehrveranstaltung_result = $this->getDataOrTerminateWithError($lehrveranstaltung_result);
-		$lehrveranstaltung = $lehrveranstaltung_result[0];
-
-		$this->_ci->LehreinheitModel->addSelect('lehrveranstaltung_id_kompatibel');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung_kompatibel', 'lehrveranstaltung_id');
-		$lehrfaecher = $this->_ci->LehreinheitModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung->lehrveranstaltung_id));
-
-		$lehrfaecher_array = [];
-		if (hasData($lehrfaecher))
-			$lehrfaecher_array = array_merge($lehrfaecher_array, array_column(getData($lehrfaecher), 'lehrveranstaltung_id_kompatibel'));
-
-		$lehrfaecher_array[] = $lehrveranstaltung->lehrveranstaltung_id;
-
-		$this->_ci->LehrveranstaltungModel->addDistinct('lehrfach_id');
-		$this->_ci->LehrveranstaltungModel->addSelect("tbl_lehrveranstaltung.lehrveranstaltung_id, CONCAT(tbl_lehrveranstaltung.bezeichnung || '(' || tbl_lehrveranstaltung.oe_kurzbz || ')') as lehrfach");
-		$this->_ci->LehrveranstaltungModel->db->where_in('tbl_lehrveranstaltung.lehrveranstaltung_id', $lehrfaecher_array);
-		$lehrfaecher_result = $this->_ci->LehrveranstaltungModel->load();
-
-		$lehrfaecher_array = hasData($lehrfaecher_result) ? getData($lehrfaecher_result) : array();
-
-		$lehrveranstaltung->lehrfaecher = $lehrfaecher_array;
-		$this->terminateWithSuccess($lehrveranstaltung);
-	}
-
-	/*
-	 * (david) ggf. im naechsten release
-	 * public function loadByOrganization($oe_kurzbz)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$lehrveranstaltungen = $this->LehrveranstaltungModel->getLvsByOrganization($oe_kurzbz);
-		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		$tree = [];
-
-		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
-		{
-			$lehreinheiten = $this->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
-			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-			if (!isset($lehrveranstaltung->_children))
-			{
-
-				$lehrveranstaltung->_children = $lehreinheiten_data;
-			}
-			$tree[] = $lehrveranstaltung;
-		}
-		$this->terminateWithSuccess($tree);
-	}*/
-
-	/*public function loadByFachbereich($fachbereich, $mitarbeiter_uid = null)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->LehreinheitModel->getLvsByFachbereich($fachbereich, $studiensemester_kurzbz, $mitarbeiter_uid);
-	}*/
-
-	private function _loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester = null, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
-
-		$studienplan_ids = array();
-		$only_ids = array();
-		$placeholders = array();
-
-		if (hasData($studienplan_data))
-		{
-			foreach (getData($studienplan_data) as $studienplan) {
-				$placeholders[] = "(?, ?)";
-				$studienplan_ids[] = $studienplan->studienplan_id;
-				$studienplan_ids[] = $studienplan->semester;
-				$only_ids[] = $studienplan->studienplan_id;
-			}
-		}
-
-		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
-		return hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
-	}
-
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid)
-			show_error('User authentification failed');
-	}
-
-	private function assignUniqueIndex(&$nodes, &$counter)
-	{
-		foreach ($nodes as &$node)
-		{
-			$node->uniqueindex = $counter++;
-			if (!empty($node->_children) && is_array($node->_children))
-			{
-				$this->assignUniqueIndex($node->_children, $counter);
-			}
-		}
-	}
-
-	protected function getStudiengangKz($studiengang_typ_kurzbz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return null;
-
-		return current($data)->studiengang_kz;
-	}
-
-	private function getStudiensemesterKurzbz($studiensemester_kurzbz = null)
-	{
-		if (!is_null($studiensemester_kurzbz))
-		{
-			$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere([
-				'LOWER(studiensemester_kurzbz)' => strtolower($studiensemester_kurzbz)
-			]);
-
-			if (isError($studiensemester_result) || !hasData($studiensemester_result))
-				$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-			return getData($studiensemester_result)[0]->studiensemester_kurzbz;
-		}
-
-		$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-	}
-
-	protected function getOrgformKurzbz($orgform_kurzbz)
-	{
-		if ($orgform_kurzbz === null)
-			return null;
-
-		$this->load->model('codex/Orgform_model', 'OrgformModel');
-		$result = $this->OrgformModel->loadWhere([
-			'LOWER(orgform_kurzbz) =' => strtolower($orgform_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		return current($data)->orgform_kurzbz;
-	}
-}
@@ -36,8 +36,7 @@ class LvMenu extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLvMenu' => self::PERM_LOGGED,
-			'getMultipleLvMenu' => self::PERM_LOGGED
+			'getLvMenu' => self::PERM_LOGGED
 		]);

 		$this->load->model("ressource/Mitarbeiter_model");
@@ -52,7 +51,7 @@ class LvMenu extends FHCAPI_Controller

 		$this->load->library("PermissionLib", null, 'PermissionLib');

-		$this->load->library("PhrasesLib", null, 'PhrasesLib');
+		$this->load->library("PhrasesLib");
 		$this->loadPhrases(array('global', 'lehre'));
 	}

@@ -62,23 +61,24 @@ class LvMenu extends FHCAPI_Controller

 	/**
 	 * alternative function to get multiple lvMenus with a single http request
-	 * not yet working as intended as the menu_lv.inc.php scripts called by the
-	 * lvMenuBuild event have logic coupled to require_once import which results in
-	 * a wrong logic after the first invocation -> faulty results for lvinfo, moodle
-	 * and several others
 	 */
-	public function getMultipleLvMenu(){
-		$lvMenuOptionList = $this->input->post('lvMenuOptionList', true);
+	public function getMultipleLvMenu($lvMenuOptionList){
 		$result =[];
 		foreach($lvMenuOptionList as $lvMenuOptions){
-			$lvMenu = $this->getLvMenuInternal($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
-			
+			$lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+			if(isError($lvMenu)){
+				// TODO: some lvMenu threw an error, handle error here
+			}
 			$result[$lvMenuOptions['lvid']]=$lvMenu;
 		}
 		$this->terminateWithSuccess($result);
 	}
-	
-	private function getLvMenuInternal($lvid, $studiensemester_kurzbz) {
+
+	/**
+	 * 
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{

 		// return early if parameters are missing
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
@@ -89,14 +89,14 @@ class LvMenu extends FHCAPI_Controller

 		// get the user
 		if (!$user=getAuthUID())
-			$this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
+		    $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));

 		// check if is_lector
 		$is_lector = false;
 		$mares = $this->Mitarbeiter_model->isMitarbeiter($user);
 		if(hasData($mares))
 		{
-			$is_lector = getData($mares);
+		    $is_lector = getData($mares);
 		}

 		// definition of user_is_allowed_to_upload
@@ -105,7 +105,7 @@ class LvMenu extends FHCAPI_Controller

 		// load lehrveranstaltung
 		$lvres = $this->Lehrveranstaltung_model->load($lvid);
-		if(!hasData($lvres))
+		if(!hasData($lvres)) 
 		{
 			$this->terminateWithError('LV ' . $lvid . ' not found.');
 		}
@@ -124,7 +124,7 @@ class LvMenu extends FHCAPI_Controller
 		$stgres = $this->Studiengang_model->load(strval($studiengang_kz));
 		if(!hasData($stgres))
 		{
-			$this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
+		    $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
 		}
 		$stg = (getData($stgres))[0];
 		$kurzbz = strtoupper($stg->typ . $stg->kurzbz);
@@ -139,7 +139,7 @@ class LvMenu extends FHCAPI_Controller
 			$angemeldet = false;

 			$lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
-				$lvid, $user, $angezeigtes_stsem
+			    $lvid, $user, $angezeigtes_stsem
 			);

 			if(hasData($lesres) && count(getData($lesres)) > 0)
@@ -148,7 +148,7 @@ class LvMenu extends FHCAPI_Controller

 		// lehrfach
 		$lehrfach_id='';
-
+		
 		if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
 		{
 			// Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
@@ -211,8 +211,8 @@ class LvMenu extends FHCAPI_Controller
 		foreach($fbs as $row)
 		{
 			$lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
-			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz)
-				|| $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
+			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz) 
+			    || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
 			{
 				$user_is_allowed_to_upload=true;
 			}
@@ -224,21 +224,21 @@ class LvMenu extends FHCAPI_Controller
 		$menu = array();

 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
-
+		
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid);
-
+		
 		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
-
+		
 		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
-
+		

 		// Addons Menu Logic
 		// ##########################################################################################		
@@ -269,21 +269,19 @@ class LvMenu extends FHCAPI_Controller
 			'lehrfach_id'=>$lehrfach_id,
 			'lektor_der_lv'=>$lektor_der_lv,
 			'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
-			'permissionLib' => &$this->PermissionLib,
-			'phrasesLib' => &$this->PhrasesLib
 		];
-
-		Events::trigger('lvMenuBuild',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
+		
+		Events::trigger('lvMenuBuild', 
+						// passing $menu per reference
+						function & () use (&$menu) {
+							return $menu;
+						},
+						$params
 		);

 		// Menu sortieren
 		// ##########################################################################################
-
+		
 		foreach ($menu as $key => $row){

 			// removes menu points that are not needed in the c4 lvUebersicht
@@ -291,7 +289,7 @@ class LvMenu extends FHCAPI_Controller
 				unset($menu[$key]);
 				continue;
 			}
-
+			
 			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];

@@ -299,18 +297,11 @@ class LvMenu extends FHCAPI_Controller

 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);

-
-		return $menu;
-	}
-	
-	/**
-	 * 
-	 */
-	public function getLvMenu($lvid, $studiensemester_kurzbz)
-	{
-		$menu = $this->getLvMenuInternal($lvid, $studiensemester_kurzbz);
+		// HTTP response
+		// ##########################################################################################
 		
 		$this->terminateWithSuccess($menu);
+
 	}

 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){
@@ -340,7 +331,6 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_lvinfo',
 				'position'=>'10',
 				'name'=>$this->p->t('lehre', 'lehrveranstaltungsinformation'),
-				'phrase' => 'lehre/lehrveranstaltungsinformation',
 				'icon'=>'../../../skin/images/button_lvinfo.png',
 				'link'=>'',
 				'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
@@ -359,7 +349,6 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_feedback',
 				'position'=>'60',
 				'name'=>$this->p->t('lehre', 'feedback'),
-				'phrase' => 'lehre/feedback',
 				'c4_icon'=> base_url('skin/images/button_feedback.png'),
 				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
 			);
@@ -377,10 +366,8 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
-					'phrase' => 'lehre/gesamtnote',
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
-					'c4_link'=> site_url('Cis/Benotungstool/'.urlencode($lvid).'/'.urlencode($angezeigtes_stsem))
-					//'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
@@ -391,7 +378,6 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
-					'phrase'=>'lehre/gesamtnote',
 					'c4_icon'=>base_url('skin/images/button_endnote.png'),
 					'c4_link'=>'#',
 					'c4_linkList'=>[[$this->p->t('lehre', 'noteneingabedeaktiviert'),'#']],
@@ -464,7 +450,6 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_mailanstudierende',
 				'position'=>'100',
 				'name'=>$this->p->t('lehre', 'mail'),
-				'phrase' => 'lehre/mail',
 				'c4_icon'=>base_url('skin/images/button_feedback.png'),
 				'c4_icon2' => 'fa-regular fa-envelope',
 				'c4_link'=>$mailto,
@@ -489,7 +474,6 @@ class LvMenu extends FHCAPI_Controller
 						'id'=>'core_menu_abmeldung',
 						'position'=>'120',
 						'name'=>$this->p->t('lehre', 'abmelden'),
-						'phrase'=>'lehre/abmelden',
 						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
 						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
 					);
@@ -524,7 +508,6 @@ class LvMenu extends FHCAPI_Controller
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse',
 				'position' => '128',
 				'name' => $this->p->t('lehre', 'anrechnung'),
-				'phrase' => 'lehre/anrechnung',
 				'c4_icon' => base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
@@ -542,11 +525,10 @@ class LvMenu extends FHCAPI_Controller
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
 				'position' => '128',
 				'name' => $this->p->t('lehre', 'anrechnungen'),
-				'phrase' => 'lehre/anrechnung',
 				'c4_icon'=> base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
 			);
 		}
    }
-}
+}
@@ -1,530 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-use CI3_Events as Events;
-use \DateTime as DateTime;
-use \DateTimeZone as DateTimeZone;
-
-class LvPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-
-		parent::__construct([
-			'getRoomplan' => self::PERM_LOGGED,
-			'Stunden' => self::PERM_LOGGED,
-			'getReservierungen' => self::PERM_LOGGED,
-			'LvPlanEvents' => self::PERM_LOGGED,
-			'eventsPersonal' => self::PERM_LOGGED,
-			'eventsLv' => self::PERM_LOGGED,
-			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
-			'studiensemesterDateInterval' => self::PERM_LOGGED,
-			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'eventsStgOrg' => self::PERM_LOGGED,
-			'fetchFerienEvents' => self::PERM_LOGGED,
-			'getStudiengaenge' => self::PERM_LOGGED,
-			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
-			'compactibleEventTypes' => self::PERM_LOGGED,
-			'getLeEvents' => self::PERM_LOGGED,
-			'getLvEvents' => self::PERM_LOGGED,
-		]);
-
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
-
-        $this->load->library('form_validation');
-		$this->load->library('PhrasesLib');
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * fetches LvPlan and Moodle events together
-	 * @access public
-	 *
-	 */
-	public function LvPlanEvents()
-	{
-		$hasLv = $this->input->post('lv_id');
-
-		return $hasLv ? $this->eventsLv() : $this->eventsPersonal();
-	}
-
-	/**
-	 * fetches LvPlan, Moodle and Ferien events together for the logged in user
-	 *
-	 * @access public
-	 */
-	public function eventsPersonal()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's events if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
-
-		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
-
-		$lvplanEvents = $this->getDataOrTerminateWithError($result);
-
-		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
-
-		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
-
-
-		$this->terminateWithSuccess(array_merge(
-			$lvplanEvents,
-			$moodleEvents,
-			$ferienEvents
-		));
-	}
-
-	/**
-	 * fetches LvPlan for studiengang / semester / verband / gruppe
-	 *
-	 * @access public
-	 */
-	public function eventsStgOrg()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-			$stgOrgEvents = [];
-			$ferienEvents = [];
-		} else {
-			$start_date = $this->input->post('start_date', true);
-			$end_date = $this->input->post('end_date', true);
-			$stg_kz = $this->input->post('stg_kz', true);
-			$sem = $this->input->post('sem', true);
-			$verband = $this->input->post('verband', true);
-			$gruppe = $this->input->post('gruppe', true);
-
-			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
-			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
-			$ferienEvents = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess(array_merge(
-			$stgOrgEvents,
-			$ferienEvents
-		));
-	}
-
-	/**
-	 * fetches LvPlan and Ferien events together for the lv
-	 *
-	 * @access public
-	 */
-	public function eventsLv()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-		$lv_id = $this->input->post('lv_id', true);
-
-		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsLv($lv_id, $start_date, $end_date);
-		$lvplanEvents = $this->getDataOrTerminateWithError($result);
-
-		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-
-		$this->terminateWithSuccess(array_merge(
-			$lvplanEvents,
-			$ferienEvents
-		));
-	}
-
-	public function getLeEvents($le_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-
-		if (is_null($le_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLE($le_id, $start_date, $end_date, $stundenplan);
-		$lvplanEvents = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($lvplanEvents);
-	}
-
-	public function getLvEvents($lv_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-		if (is_null($lv_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLV($lv_id, $start_date, $end_date, $stundenplan);
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
-		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
-		$this->terminateWithSuccess($studiensemester);
-	}
-
-	public function getLvPlanForStudiensemester($studiensemester, $lvid)
-	{
-		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
-		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
-		$timespan_start = new DateTime($studiensemester_result->start);
-		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'), date_format($timespan_ende, 'Y-m-d'), $lvid);
-		$this->terminateWithSuccess($lvplan);
-
-	}
-
-
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function Stunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$stunden = $this->StundeModel->load();
-
-		$stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$this->terminateWithSuccess($stunden);
-	}
-
-	/**
-	 * fetches room events from a certain date
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function getRoomplan()
-	{
-		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required");
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$ort_kurzbz = $this->input->post('ort_kurzbz', true);
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-
-		// get data
-		$this->load->library('StundenplanLib');
-
-		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
-
-		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
-		$this->terminateWithSuccess($roomplan_data);
-	}
-
-	/**
-	 * gets the reservierungen of a room if the ort_kurzbz parameter is
-	 * supplied otherwise gets the reservierungen of the lvplan of a student
-	 * @access public
-	 *
-	 * @param string	$ort_kurzbz
-	 * @return void
-	 */
-	public function getReservierungen($ort_kurzbz = null)
-	{
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's reservierungen if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
-
-		// get data
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
-
-		$result = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
-		$result = $this->LehreinheitModel->load($lehreinheit_id);
-		$result = current($this->getDataOrTerminateWithError($result))->studiensemester_kurzbz;
-		$this->terminateWithSuccess($result);
-	}
-
-	/**
-	 * get details for a lv
-	 * @access public
-	 *
-	 * @param integer		$lehrveranstaltung_id
-	 * @return void
-	 */
-	public function getLv($lehrveranstaltung_id)
-	{
-		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0 && $lehrveranstaltung_id !== '0')
-			return show_404();
-
-		// Load Phrases
-		$this->loadPhrases(['lehre']);
-
-		// Validation
-		$this->form_validation->set_data([
-			'lehrveranstaltung_id' => $lehrveranstaltung_id
-		]);
-
-		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung_id'), 'integer');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// Get Data
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-
-		$result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
-
-		$result = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess(current($result));
-	}
-
-	public function getStudiengaenge()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
-	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$where = [
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-		];
-
-		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
-			$where['semester'] = $semester;
-		}
-		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
-			$where['verband'] = $verband;
-		}
-
-		$this->LehrverbandModel->addOrder('studiengang_kz');
-		$this->LehrverbandModel->addOrder('semester');
-		$this->LehrverbandModel->addOrder('verband');
-		$this->LehrverbandModel->addOrder('gruppe');
-		$result = $this->LehrverbandModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Checks if the current user has permission to view other users' timetables
-	 *
-	 * @return void
-	 */
-	public function permissionOtherLvPlan()
-	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
-	}
-
-	/**
-	 * get event types which can be compacted in lv plan display
-	 *
-	 * @return void
-	 */
-	public function compactibleEventTypes()
-	{
-		$this->terminateWithSuccess(["lehreinheit", "reservierung", "ferien", "moodle"]);
-	}
-
-	/**
-	 * fetch moodle events
-	 *
-	 * @param string		$start_date
-	 * @param string		$end_date
-	 * @return array
-	 */
-	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
-	{
-		if ($uid && $uid !== getAuthUID()) {
-			return [];
-		}
-
-		$this->load->config('calendar');
-
-		$tz = new DateTimeZone($this->config->item('timezone'));
-
-		$start = new DateTime($start_date);
-		$start->setTimezone($tz);
-
-		$end = new DateTime($end_date);
-		$end->setTimezone($tz);
-		$end->modify('+1 day -1 second');
-
-		$moodle_events = [];
-
-		Events::trigger(
-			'moodleCalendarEvents',
-			function &() use (&$moodle_events) {
-				return $moodle_events;
-			},
-			[
-				'start_date' => $start->format('c'),
-				'end_date' => $end->format('c'),
-				'username' => $uid ?? getAuthUID()
-			]
-		);
-
-		return $moodle_events;
-	}
-
-	/**
-	 * fetch ferien events
-	 *
-	 * @param string		$start_date
-	 * @param string		$end_date
-	 * @return array
-	 */
-	private function fetchFerienEvents($start_date, $end_date, $uid = null)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
-
-		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
-		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
-		if ($currentStudiensemester) {
-			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
-
-			$studiengang = $this->StudentLehrverbandModel->loadWhere([
-				"student_uid" => $uid ?? getAuthUID(),
-				"studiensemester_kurzbz" => $studentsemester_kurzbz
-			]);
-			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
-			if ($studiengang)
-				$studiengang_kz = current($studiengang)->studiengang_kz;
-			else
-				$studiengang_kz = 0;
-		} else {
-			$studiengang_kz = 0;
-		}
-
-		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
-		return $this->getDataOrTerminateWithError($ferienEvents);
-	}
-}
@@ -1,167 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MaZeitsperren extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getAllActiveZeitsperren' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getAllZeitsperrenFixeMa' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getAllZeitsperrenLector' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getAllZeitsperrenOes' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getZeitsperrenAss' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getStgLectors' => self::PERM_LOGGED,
-			'loadZeitsperrenLectorStg' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'loadZeitsperrenMa' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getDetailsMa' => self::PERM_LOGGED
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'zeitsperren'
-		]);
-
-		// Load models
-		$this->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-	}
-
-	//only user with zeitsperren
-	public function getAllActiveZeitsperren($days)
-	{
-		$result = $this->ZeitsperreModel->getZeitsperrenForNextDays($days);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	//TODO: check query: more results after join with hr-table
-	//all fixe Ma
-	public function getAllZeitsperrenFixeMa($days)
-	{
-		$von = date('Y-m-d');
-		$bis = date('Y-m-d', strtotime("+{$days} days"));
-		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, true, false, null, false);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAllZeitsperrenLector($days)
-	{
-		$von = date('Y-m-d');
-		$bis = date('Y-m-d', strtotime("+{$days} days"));
-		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, true, null, false);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getZeitsperrenAss($days)
-	{
-		$von = date('Y-m-d');
-		$bis = date('Y-m-d', strtotime("+{$days} days"));
-		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, false, null, true);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAllZeitsperrenOes($days, $oe)
-	{
-		if(!$oe)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'OE Kurzbezeichnung']), self::ERROR_TYPE_GENERAL);
-		}
-		$von = date('Y-m-d');
-		$bis = date('Y-m-d', strtotime("+{$days} days"));
-		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, false, $oe, false);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function loadZeitsperrenLectorStg($days, $stg)
-	{
-		if(!$stg)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
-		}
-		if(!is_numeric($stg))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_paramNoNumber', ['param'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$von = date('Y-m-d');
-		$bis = date('Y-m-d', strtotime("+{$days} days"));
-		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, true, false, false, $stg);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getStgLectors()
-	{
-		$sql = "
-			select
-				studiengang_kz,
-				kurzbz,
-				kurzbzlang,
-				typ,
-				bezeichnung,
-				kurzbzlang || ' (' || bezeichnung || ')' AS label,
-				aktiv
-			from
-				public.tbl_studiengang
-			where 
-				typ in ('b','m')
-			order by typ asc, kurzbz Asc
-			";
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function loadZeitsperrenMa($days, $uid)
-	{
-		if ($uid === null || $uid === '')
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mitarbeiter UID']), self::ERROR_TYPE_GENERAL);
-		}
-		$result = $this->ZeitsperreModel->getZeitsperrenForNextDays($days, $uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getDetailsMa($uid)
-	{
-		if ($uid === null || $uid === '')
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mitarbeiter UID']), self::ERROR_TYPE_GENERAL);
-		}
-		$this->load->model('person/Person_model', 'PersonModel');
-		$result = $this->PersonModel->getFullName($uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-}
-
@@ -1,948 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class NewsAdministrationAPI extends FHCAPI_Controller
-{
-	/**
-	 * News API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getNews' => 'basis/news:r',
-			'getNewsItem' => 'basis/news:r',
-			'storeNewsItem' => 'basis/news:w',
-			'updateNewsItem' => 'basis/news:w',
-			'deleteNewsItem' => 'basis/news:w'
-		]);
-
-		$this->load->model('content/Content_model', 'ContentModel');
-		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
-		$this->load->model('content/News_model', 'NewsModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		$this->loadPhrases([
-			'global'
-		]);
-
-		$this->load->library('CmsLib');
-
-		$this->load->helper('hlp_sancho_helper');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $titel = '', $active = true, $sichtbar = true)
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('page','Page','required|is_natural');
-		$this->form_validation->set_rules('page_size', 'PageSize', 'is_natural');
-		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$page = intval($this->input->get('page', true));
-		$page_size = intval($this->input->get('page_size', true));
-		$sprache = $this->input->get('sprache', true);
-		if(!$sprache)
-		{
-			$sprache = getUserLanguage();
-		}
-
-		// default value for the page_size is 10
-		$page_size = $page_size ?? 10;
-
-		$passedSichtbar = $this->input->get('published', true);
-		if($passedSichtbar !== null)
-		{
-			$sichtbar = $passedSichtbar;
-		}
-
-		$passedIsActive = $this->input->get('isActive', true);
-		if ($passedIsActive !== null)
-		{
-			$isActive = filter_var(
-				$passedIsActive,
-				FILTER_VALIDATE_BOOLEAN,
-				FILTER_NULL_ON_FAILURE
-			);
-			if ($isActive !== null)
-			{
-				$active = $isActive;
-			}
-		}
-
-		$degreeProgramShortCode = $this->input->get('degreeProgramShortCode', true);
-		if ($degreeProgramShortCode !== null && $degreeProgramShortCode !== '')
-		{
-			if (!ctype_digit((string)$degreeProgramShortCode))
-			{
-				$this->terminateWithValidationErrors([
-					'degreeProgramShortCode' => 'A valid degree program is required'
-				]);
-			}
-			$studiengang_kz = $degreeProgramShortCode;
-		}
-
-		$passedSemester = $this->input->get('semester', true);
-		if ($passedSemester !== null && $passedSemester !== '')
-		{
-			if (
-				!ctype_digit((string)$passedSemester)
-				|| (int)$passedSemester < 1
-				|| (int)$passedSemester > 8
-			)
-			{
-				$this->terminateWithValidationErrors([
-					'semester' => 'A valid semester is required'
-				]);
-			}
-			$semester = filter_var($passedSemester, FILTER_VALIDATE_INT);
-		}
-
-		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
-
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, false, $titel, true, $sichtbar, $page, $page_size, $sprache, true, $entitledDegreePrograms, $active);
-		$news = $this->getDataOrTerminateWithError($news);
-
-		$this->addMeta('row_count', $news["row_count"] ?? 0);
-		$this->terminateWithSuccess($news["content"]);
-	}
-
-	/**
-	 * Returns one news entry with all available language versions for editing.
-	 *
-	 * @return void
-	 */
-	public function getNewsItem($newsId)
-	{
-		if (!is_numeric($newsId) || (int)$newsId < 1)
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'A valid news ID is required'
-			]);
-		}
-		
-		$newsId = (int)$newsId;
-		$newsResult = $this->NewsModel->load($newsId);
-
-		if (isError($newsResult))
-		{
-			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
-		}
-
-		if (!hasData($newsResult))
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'The requested news entry does not exist'
-			]);
-		}
-
-		$news = current(getData($newsResult));
-		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
-		
-		if (!in_array($news->studiengang_kz, $entitledDegreePrograms)) {
-			$this->terminateWithError('You are not entitled to access this news entry', self::ERROR_TYPE_PERMISSION);
-		}
-		$translationsResult = $this->ContentspracheModel->loadWhere([
-			'content_id' => $news->content_id
-		]);
-
-		if (isError($translationsResult))
-		{
-			$this->terminateWithError(getError($translationsResult), self::ERROR_TYPE_DB);
-		}
-
-		$languages = [];
-
-		foreach ((array)getData($translationsResult) as $translation)
-		{
-			$languages[$translation->sprache] = true;
-		}
-
-		$translations = [];
-
-		foreach (array_keys($languages) as $language)
-		{
-			$contentResult = $this->ContentModel->getContent(
-				$news->content_id,
-				$language,
-				null,
-				null,
-				false
-			);
-
-			if (isError($contentResult))
-			{
-				$this->terminateWithError(getError($contentResult), self::ERROR_TYPE_DB);
-			}
-
-			$content = getData($contentResult);
-			$document = new DOMDocument('1.0', 'UTF-8');
-
-			if ($content->content !== '' && $document->loadXML($content->content) === false)
-			{
-				$this->terminateWithError(
-					'The stored news content is invalid',
-					self::ERROR_TYPE_GENERAL
-				);
-			}
-
-			$author = $document->getElementsByTagName('verfasser')->item(0);
-			$title = $document->getElementsByTagName('betreff')->item(0);
-			$text = $document->getElementsByTagName('text')->item(0);
-
-			$translations[] = [
-				'language' => $language,
-				'author' => $author ? $author->nodeValue : '',
-				'title' => $title ? $title->nodeValue : '',
-				'text' => $text ? str_replace('dms.php', APP_ROOT . 'cms/dms.php', $text->nodeValue) : '',
-				'isPublished' => (bool)$content->sichtbar
-			];
-		}
-
-		$this->terminateWithSuccess([
-			'newsId' => (int)$news->news_id,
-			'visibleFrom' => $news->datum,
-			'visibleTo' => $news->datum_bis,
-			'degreeProgramShortCode' => $news->studiengang_kz,
-			'semester' => $news->semester,
-			'translations' => $translations
-		]);
-	}
-
-	/**
-	 * Creates a news entry and all supplied translations.
-	 *
-	 * @return void
-	 */
-	public function storeNewsItem()
-	{
-		$this->load->library('form_validation');
-		$postData = $this->input->post(null, true);
-		$this->form_validation->set_data(is_array($postData) ? $postData : []);
-		$this->form_validation->set_rules('visibleFrom', 'Visible from', 'required|is_valid_date');
-		$this->form_validation->set_rules('visibleTo', 'Visible to', 'is_valid_date');
-		$this->form_validation->set_rules(
-			'degreeProgramShortCode',
-			'Degree program',
-			'required|is_natural'
-		);
-		$this->form_validation->set_rules(
-			'semester',
-			'Semester',
-			'is_natural_no_zero|less_than_equal_to[8]'
-		);
-
-		$errors = $this->form_validation->run() === false
-			? $this->form_validation->error_array()
-			: [];
-		$visibleFrom = $this->input->post('visibleFrom', true);
-		$visibleTo = $this->input->post('visibleTo', true);
-		$translations = $this->input->post('translations', true);
-
-		if (
-			is_string($visibleFrom)
-			&& is_string($visibleTo)
-			&& $visibleTo !== ''
-			&& is_valid_date($visibleFrom)
-			&& is_valid_date($visibleTo)
-			&& new DateTime($visibleTo) < new DateTime($visibleFrom)
-		)
-		{
-			$errors['visibleTo'] = 'Visible to must not be before Visible from';
-		}
-
-		if (!is_array($translations) || count($translations) === 0)
-		{
-			$errors['translations'] = 'At least one translation is required';
-		}
-		else
-		{
-			foreach ($translations as $index => $translation)
-			{
-				if (!is_array($translation))
-				{
-					$errors['translations.' . $index] = 'Each translation must be an object';
-				}
-			}
-		}
-
-		if (count($errors) > 0)
-		{
-			$this->terminateWithValidationErrors($errors);
-		}
-
-
-		$this->_ensureUserIsEntitledForDegreeProgram($this->input->post('degreeProgramShortCode', true));
-
-		$degreeProgramShortCode = $this->input->post('degreeProgramShortCode', true);
-		$semester = $this->input->post('semester', true);
-		$semester = $semester === '' ? null : $semester;
-		$visibleTo = $visibleTo === '' ? null : $visibleTo;
-
-		$studiengang = $this->_getStudiengang($degreeProgramShortCode);
-
-		$data = [
-			'studiengang_kz' => $degreeProgramShortCode,
-			'semester' => $semester,
-			'datum' => $visibleFrom,
-			'datum_bis' => $visibleTo,
-			'translations' => []
-		];
-
-		foreach ($translations as $index => $translation)
-		{
-			$data['translations'][$index] = [
-				'sprache' => $translation['language'] ?? '',
-				'verfasser' => $translation['author'] ?? '',
-				'betreff' => $translation['title'] ?? '',
-				'text' => $translation['text'] ?? '',
-				'sichtbar' => isset($translation['isPublished']) ? (bool)$translation['isPublished'] : false
-			];
-		}
-
-		$this->_validateLanguages($data['translations']);
-
-		foreach ($data['translations'] as $index => $translation)
-		{
-			$data['translations'][$index]['content'] = $this->_buildNewsXml($translation);
-		}
-
-		$uid = getAuthUID();
-		$now = date('Y-m-d H:i:s');
-
-		if ($this->db->trans_begin() === false)
-		{
-			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
-		}
-
-		$contentResult = $this->ContentModel->insert([
-			'template_kurzbz' => 'news',
-			'oe_kurzbz' => $studiengang->oe_kurzbz,
-			'aktiv' => true,
-			'menu_open' => false,
-			'insertamum' => $now,
-			'insertvon' => $uid
-		]);
-		$contentId = (int)$this->_getInsertedIdOrRollback($contentResult);
-
-		$newsResult = $this->NewsModel->insert([
-			'uid' => $uid,
-			'studiengang_kz' => $data['studiengang_kz'],
-			'semester' => $data['semester'],
-			'datum' => $data['datum'],
-			'datum_bis' => $data['datum_bis'],
-			'content_id' => $contentId,
-			'insertamum' => $now,
-			'insertvon' => $uid,
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-		$newsId = (int)$this->_getInsertedIdOrRollback($newsResult);
-
-		foreach ($data['translations'] as $translation)
-		{
-			$translation['content'] = $this->formatContentURLsToRelative($translation['content']);
-
-			$translationResult = $this->ContentspracheModel->insert([
-				'sprache' => $translation['sprache'],
-				'content_id' => $contentId,
-				'version' => 1,
-				'sichtbar' => $translation['sichtbar'],
-				'content' => $translation['content'],
-				'titel' => $translation['betreff'],
-				'insertamum' => $now,
-				'insertvon' => $uid,
-				'updateamum' => $now,
-				'updatevon' => $uid
-			]);
-
-			$this->_getInsertedIdOrRollback($translationResult);
-		}
-
-		$newsItemResult = $this->NewsModel->load($newsId);
-		$newsItem = $this->getDataOrTerminateWithError($newsItemResult);
-		$newsItem = $newsItem[0];
-
-		$this->_sendNewsItemTranslationRequiredMail(
-			$newsItem
-		);
-
-		if ($this->db->trans_status() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		if ($this->db->trans_commit() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-		
-		$this->terminateWithSuccess($newsId);
-	}
-
-	/**
-	 * Updates a news entry and its supplied translations.
-	 *
-	 * @return void
-	 */
-	public function updateNewsItem($newsId)
-	{
-		if (!is_numeric($newsId) || (int)$newsId < 1)
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'A valid news ID is required'
-			]);
-		}
-
-		$newsId = (int)$newsId;
-		$existingNewsResult = $this->NewsModel->load($newsId);
-
-		if (isError($existingNewsResult))
-		{
-			$this->terminateWithError(getError($existingNewsResult), self::ERROR_TYPE_DB);
-		}
-
-		if (!hasData($existingNewsResult))
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'The requested news entry does not exist'
-			]);
-		}
-
-		$existingNews = current(getData($existingNewsResult));
-
-		$this->_ensureUserIsEntitledForDegreeProgram($existingNews->studiengang_kz);
-
-		$this->load->library('form_validation');
-		$postData = $this->input->post(null, true);
-		$this->form_validation->set_data(is_array($postData) ? $postData : []);
-		$this->form_validation->set_rules('visibleFrom', 'Visible from', 'required|is_valid_date');
-		$this->form_validation->set_rules('visibleTo', 'Visible to', 'is_valid_date');
-		$this->form_validation->set_rules(
-			'degreeProgramShortCode',
-			'Degree program',
-			'required|is_natural'
-		);
-		$this->form_validation->set_rules(
-			'semester',
-			'Semester',
-			'is_natural_no_zero|less_than_equal_to[8]'
-		);
-
-		$errors = $this->form_validation->run() === false
-			? $this->form_validation->error_array()
-			: [];
-		$visibleFrom = $this->input->post('visibleFrom', true);
-		$visibleTo = $this->input->post('visibleTo', true);
-		$translations = $this->input->post('translations', true);
-
-		if (
-			is_string($visibleFrom)
-			&& is_string($visibleTo)
-			&& $visibleTo !== ''
-			&& is_valid_date($visibleFrom)
-			&& is_valid_date($visibleTo)
-			&& new DateTime($visibleTo) < new DateTime($visibleFrom)
-		)
-		{
-			$errors['visibleTo'] = 'Visible to must not be before Visible from';
-		}
-
-		if (!is_array($translations) || count($translations) === 0)
-		{
-			$errors['translations'] = 'At least one translation is required';
-		}
-		else
-		{
-			foreach ($translations as $index => $translation)
-			{
-				if (!is_array($translation))
-				{
-					$errors['translations.' . $index] = 'Each translation must be an object';
-				}
-			}
-		}
-
-		if (count($errors) > 0)
-		{
-			$this->terminateWithValidationErrors($errors);
-		}
-
-		$degreeProgramShortCode = $this->input->post('degreeProgramShortCode', true);
-		$semester = $this->input->post('semester', true);
-		$semester = $semester === '' ? null : $semester;
-		$visibleTo = $visibleTo === '' ? null : $visibleTo;
-
-		$studiengang = $this->_getStudiengang($degreeProgramShortCode);
-
-		$data = [
-			'studiengang_kz' => $degreeProgramShortCode,
-			'semester' => $semester,
-			'datum' => $visibleFrom,
-			'datum_bis' => $visibleTo,
-			'translations' => []
-		];
-
-		foreach ($translations as $index => $translation)
-		{
-			$data['translations'][$index] = [
-				'sprache' => $translation['language'] ?? '',
-				'verfasser' => $translation['author'] ?? '',
-				'betreff' => $translation['title'] ?? '',
-				'text' => $translation['text'] ?? '',
-				'sichtbar' => isset($translation['isPublished']) ? (bool)$translation['isPublished'] : false
-			];
-		}
-
-		$this->_validateLanguages($data['translations']);
-
-		foreach ($data['translations'] as $index => $translation)
-		{
-			$data['translations'][$index]['content'] = $this->_buildNewsXml($translation);
-		}
-
-		$uid = getAuthUID();
-		$now = date('Y-m-d H:i:s');
-
-		if ($this->db->trans_begin() === false)
-		{
-			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
-		}
-
-		$contentResult = $this->ContentModel->update($existingNews->content_id, [
-			'oe_kurzbz' => $studiengang->oe_kurzbz,
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-
-		if (isError($contentResult))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($contentResult), self::ERROR_TYPE_DB);
-		}
-
-		$newsResult = $this->NewsModel->update($newsId, [
-			'studiengang_kz' => $data['studiengang_kz'],
-			'semester' => $data['semester'],
-			'datum' => $data['datum'],
-			'datum_bis' => $data['datum_bis'],
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-
-		if (isError($newsResult))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
-		}
-
-		$existingTranslationsResult = $this->ContentspracheModel->loadWhere([
-			'content_id' => $existingNews->content_id
-		]);
-
-		if (isError($existingTranslationsResult))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($existingTranslationsResult), self::ERROR_TYPE_DB);
-		}
-
-		$existingTranslations = [];
-
-		foreach ((array)getData($existingTranslationsResult) as $existingTranslation)
-		{
-			$language = $existingTranslation->sprache;
-
-			if (
-				!isset($existingTranslations[$language])
-				|| (int)$existingTranslation->version > (int)$existingTranslations[$language]->version
-			)
-			{
-				$existingTranslations[$language] = $existingTranslation;
-			}
-		}
-
-		$submittedLanguages = array_column($data['translations'], 'sprache');
-		$this->db->where('content_id', $existingNews->content_id);
-		$this->db->where_not_in('sprache', $submittedLanguages);
-
-		if ($this->db->delete('campus.tbl_contentsprache') === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		foreach ($data['translations'] as $translation)
-		{
-			$translation['content'] = $this->formatContentURLsToRelative($translation['content']);
-			$translationData = [
-				'sichtbar' => $translation['sichtbar'],
-				'content' => $translation['content'],
-				'titel' => $translation['betreff'],
-				'updateamum' => $now,
-				'updatevon' => $uid
-			];
-
-			$existingTranslation = $existingTranslations[$translation['sprache']] ?? null;
-
-			if ($existingTranslation)
-			{
-				$translationResult = $this->ContentspracheModel->update(
-					$existingTranslation->contentsprache_id,
-					$translationData
-				);
-			}
-			else
-			{
-				$translationResult = $this->ContentspracheModel->insert([
-					'sprache' => $translation['sprache'],
-					'content_id' => $existingNews->content_id,
-					'version' => 1,
-					'insertamum' => $now,
-					'insertvon' => $uid
-				] + $translationData);
-			}
-
-			$this->_getInsertedIdOrRollback($translationResult);
-		}
-
-		if ($this->db->trans_status() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		if ($this->db->trans_commit() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		$this->terminateWithSuccess($newsId);
-	}
-
-	/**
-	 * Deletes one news entry and its linked content.
-	 *
-	 * @return void
-	 */
-	public function deleteNewsItem($newsId)
-	{
-		if (!is_numeric($newsId) || (int)$newsId < 1)
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'A valid news ID is required'
-			]);
-		}
-
-		$newsId = (int)$newsId;
-		$newsResult = $this->NewsModel->load($newsId);
-
-		if (isError($newsResult))
-		{
-			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
-		}
-
-		if (!hasData($newsResult))
-		{
-			$this->terminateWithValidationErrors([
-				'newsId' => 'The requested news entry does not exist'
-			]);
-		}
-
-		$news = current(getData($newsResult));
-
-	
-		$this->_ensureUserIsEntitledForDegreeProgram($news->studiengang_kz);
-
-		if ($this->db->trans_begin() === false)
-		{
-			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
-		}
-
-		$newsDeleteResult = $this->NewsModel->delete($newsId);
-
-		if (isError($newsDeleteResult))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($newsDeleteResult), self::ERROR_TYPE_DB);
-		}
-
-		$this->db->where('content_id', $news->content_id);
-
-		if ($this->db->delete('campus.tbl_contentsprache') === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		$contentDeleteResult = $this->ContentModel->delete($news->content_id);
-
-		if (isError($contentDeleteResult))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($contentDeleteResult), self::ERROR_TYPE_DB);
-		}
-
-		if ($this->db->trans_status() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		if ($this->db->trans_commit() === false)
-		{
-			$error = $this->db->error();
-			$this->db->trans_rollback();
-			$this->terminateWithError($error, self::ERROR_TYPE_DB);
-		}
-
-		$this->terminateWithSuccess($newsId);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Loads the requested Studiengang or reports a validation error.
-	 *
-	 * @param integer $studiengangKz
-	 * @return stdClass
-	 */
-	private function _getStudiengang($studiengangKz)
-	{
-		$result = $this->StudiengangModel->load($studiengangKz);
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-		}
-
-		if (!hasData($result))
-		{
-			$this->terminateWithValidationErrors([
-				'studiengang_kz' => 'The requested Studiengang does not exist'
-			]);
-		}
-
-		$studiengaenge = getData($result);
-
-		return current($studiengaenge);
-	}
-
-	/**
-	 * Ensures that all supplied languages exist in tbl_sprache.
-	 *
-	 * @param array $translations
-	 * @return void
-	 */
-	private function _validateLanguages($translations)
-	{
-		$languages = [];
-
-		foreach ($translations as $translation)
-		{
-			$languages[] = $translation['sprache'];
-		}
-
-		$result = $this->SpracheModel->loadMultiple($languages);
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-		}
-
-		$existingLanguages = [];
-
-		foreach ((array)getData($result) as $language)
-		{
-			$existingLanguages[$language->sprache] = true;
-		}
-
-		$errors = [];
-
-		foreach ($translations as $index => $translation)
-		{
-			if (!isset($existingLanguages[$translation['sprache']]))
-			{
-				$errors['translations.' . $index . '.sprache'] = 'The requested language does not exist';
-			}
-		}
-
-		if (count($errors) > 0)
-		{
-			$this->terminateWithValidationErrors($errors);
-		}
-	}
-
-	private function _ensureUserIsEntitledForDegreeProgram($degreeProgramShortCode)
-	{
-		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news:w");
-		if (!is_array($entitledDegreePrograms))
-		{
-			$this->terminateWithError('Failed to retrieve entitled degree programs for the user', self::ERROR_TYPE_GENERAL);
-		}
-		
-		if (!in_array($degreeProgramShortCode, $entitledDegreePrograms)) {
-			$this->terminateWithError("User is not entitled for the specified degree program");
-		}
-	}
-	/**
-	 * Returns an inserted identifier or rolls the transaction back on error.
-	 *
-	 * @param stdClass $result
-	 * @return mixed
-	 */
-	private function _getInsertedIdOrRollback($result)
-	{
-		if (isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-		}
-
-		return getData($result);
-	}
-
-	/**
-	 * Builds the XML format consumed by existing news readers.
-	 *
-	 * @param array $translation
-	 * @return string
-	 */
-	private function _buildNewsXml($translation)
-	{
-		$document = new DOMDocument('1.0', 'UTF-8');
-		$news = $document->createElement('news');
-		$document->appendChild($news);
-
-		$this->_appendCdataElement($document, $news, 'verfasser', $translation['verfasser']);
-		$this->_appendCdataElement($document, $news, 'betreff', $translation['betreff']);
-		$this->_appendCdataElement($document, $news, 'text', $translation['text']);
-
-		return $document->saveXML($news);
-	}
-
-	/**
-	 * Appends a CDATA element and safely preserves CDATA terminators.
-	 *
-	 * @param DOMDocument $document
-	 * @param DOMElement $parent
-	 * @param string $name
-	 * @param string $value
-	 * @return void
-	 */
-	private function _appendCdataElement($document, $parent, $name, $value)
-	{
-		$element = $document->createElement($name);
-		$parts = explode(']]>', $value);
-		$lastIndex = count($parts) - 1;
-
-		foreach ($parts as $index => $part)
-		{
-			if ($index > 0)
-			{
-				$part = '>' . $part;
-			}
-
-			if ($index < $lastIndex)
-			{
-				$part .= ']]';
-			}
-
-			$element->appendChild($document->createCDATASection($part));
-		}
-
-		$parent->appendChild($element);
-	}
-    
-	private function _sendNewsItemTranslationRequiredMail($newsItem)
-	{
-		$translatorsResult = $this->BenutzerfunktionModel->getBenutzerFunktionen("translate", $newsItem->studiengang_kz);
-		$translators = $this->getDataOrTerminateWithError($translatorsResult);
-
-		$newsItemContentResult = $this->ContentspracheModel->loadWhere([
-			'content_id' => $newsItem->content_id,
-			'sprache' => 'German'
-		]);
-		$newsItemContentEntry = getData($newsItemContentResult)[0] ?? null;
-		if ($newsItemContentEntry) {
-			$newsItem->sichtbar = $newsItemContentEntry->sichtbar ?? false;
-			$newsItem->content = $newsItemContentEntry->content;
-		}
-		$content = getData(
-			$this->cmslib->createNewsContent(
-				$this->cmslib->createNewsWrapper($newsItem, true),
-				false,
-				""
-			)
-		);
-
-		foreach ($translators as $translator) {
-			sendSanchoMail(
-				"Sancho_Mail_News_Translation_Req",
-				[
-					"newsItemUrl" => APP_ROOT . "cis.php/CisVue/Cms/newsAdministration?newsId=" . $newsItem->news_id,
-					"newsItemAuthor" => $newsItem->verfasser,
-					"newsItemSubject" => $newsItem->betreff,
-					"newsItemContent" => $content
-				],
-				$translator->uid . "@" . DOMAIN,
-				"Übersetzung erforderlich / Translation required"
-			);
-		}
-	}
-
-	private function formatContentURLsToRelative($content)
-	{
-		$content = preg_replace(
-			'#https?://[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
-			'$1',
-			$content
-		);
-
-		$content = preg_replace(
-			'#(?:\.\./)+[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
-			'$1',
-			$content
-		);
-
-		$content = preg_replace(
-			'#/[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
-			'$1',
-			$content
-		);
-
-		return $content;
-	}
-}
@@ -25,19 +25,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 */
 class Ort extends FHCAPI_Controller
 {
-	// advanced filters of getRooms: tbl_ort column => filter type, the same list as in Raumsuche.js.
-	// text: contains, case-insensitive; select: equals; range: <column>_min, <column>_max; flag: true; exists: not null
-	const ADVANCED_FILTERS = [
-		'ort_kurzbz' => 'text',
-		'bezeichnung' => 'text',
-		'planbezeichnung' => 'text',
-		'stockwerk' => 'range',
-		'gebteil' => 'select',
-		'm2' => 'range',
-		'lehre' => 'flag',
-		'content_id' => 'exists'
-	];
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -47,162 +35,15 @@ class Ort extends FHCAPI_Controller
 		parent::__construct([
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
-			'getRooms' => self::PERM_LOGGED,
-			'getTypes' => self::PERM_LOGGED,
-			'getRoomInfo' => self::PERM_LOGGED,
-			'getStandorte' => self::PERM_LOGGED,
-			'getAdvancedFilterOptions' => self::PERM_LOGGED
 		]);

 		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->config->load('raumsuche');
+
 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	/**
-	 * Retrieves all Ort entries filtered by the provided parameters
-	 */
-	public function getRooms()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('datum','Datum','required');
-		$this->form_validation->set_rules('von','Uhrzeit Von','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
-		$this->form_validation->set_rules('bis','Uhrzeit Bis','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
-		$this->form_validation->set_rules('standort_id','Standort','regex_match[/^([0-9]+|none)$/]');
-		foreach (self::ADVANCED_FILTERS as $column => $type) {
-			if ($type == 'range') {
-				$this->form_validation->set_rules($column.'_min', $column, 'numeric');
-				$this->form_validation->set_rules($column.'_max', $column, 'numeric');
-			} elseif ($type == 'flag' || $type == 'exists') {
-				$this->form_validation->set_rules($column, $column, 'in_list[true]');
-			} else {
-				$this->form_validation->set_rules($column, $column, 'max_length[255]');
-			}
-		}
-		if($this->form_validation->run() == FALSE) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-		
-		$datum = $this->input->get('datum', TRUE);
-		$von = $this->input->get('von', TRUE);
-		$bis = $this->input->get('bis', TRUE);
-		$typ = $this->input->get('typ', TRUE);
-		$personenanzahl = $this->input->get('personenanzahl', TRUE);
-		$standort_id = $this->input->get('standort_id', TRUE);
-		
-		
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
-		
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
-		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
-		
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-
-		$params = array();
-		$qry = "SELECT DISTINCT tbl_ort.*, tbl_standort.bezeichnung AS standort
-			FROM public.tbl_ort JOIN public.tbl_ortraumtyp USING(ort_kurzbz)
-			LEFT JOIN public.tbl_standort USING(standort_id)
-			WHERE aktiv AND reservieren";
-		if($typ) {
-			$params[] = $typ;
-			$qry.= " AND raumtyp_kurzbz = ?";
-		}
-		
-		if($standort_id === 'none') { // rooms without a Standort
-			$qry.= " AND standort_id IS NULL";
-		} elseif($standort_id) {
-			$params[] = $standort_id;
-			$qry.= " AND standort_id = ?";
-		} else {
-			$qry.= " AND standort_id IS NOT NULL";
-		}
-
-		$qry.= $this->advancedFilterSql($params);
-
-		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
-			$qry.= ' AND raumtyp_kurzbz IN ?';
-			$params[] = $this->config->item('roomtypes_student');
-			$this->addMeta('config', $this->config->item('roomtypes_student'));
-		}
-		
-		$qry.= " AND (max_person>= ? OR max_person is null)";
-		$params[] = $personenanzahl;
-
-		$qry.="	AND ort_kurzbz NOT IN 
-			(
-				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum = ? AND stunde >= ? AND stunde <= ? 
-				UNION 
-				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum= ? AND stunde >= ? AND stunde <= ?
-			)
-		";
-		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-//		$this->addMeta('qry', $qry);
-//		$this->addMeta('params', $params);
-		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
-		
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getTypes()
-	{
-		$this->load->model('ressource/Raumtyp_model', 'RaumtypModel');
-		$qry = "SELECT * FROM public.tbl_raumtyp WHERE aktiv = true";
-		$params = array();
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		
-		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
-		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
-			$qry.= ' AND raumtyp_kurzbz IN ?';
-			$params[] = $this->config->item('roomtypes_student');
-		}
-                                 
-        $qry .= " ORDER BY raumtyp_kurzbz;";
-		
-		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-	
-	/**
-	 * Standorte of the rooms that pass the base filter of getRooms
-	 */
-	public function getStandorte()
-	{
-		$qry = "SELECT DISTINCT standort_id, tbl_standort.bezeichnung
-			FROM public.tbl_ort JOIN public.tbl_standort USING(standort_id)
-			WHERE aktiv AND reservieren
-			ORDER BY tbl_standort.bezeichnung";
-
-		$result = $this->OrtModel->execReadOnlyQuery($qry);
-
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	/**
-	 * Values of the select filters: column => distinct values of the rooms that pass the base filter of getRooms
-	 */
-	public function getAdvancedFilterOptions()
-	{
-		$options = [];
-		foreach (self::ADVANCED_FILTERS as $column => $type) {
-			if ($type != 'select')
-				continue;
-
-			$result = $this->OrtModel->execReadOnlyQuery("SELECT DISTINCT ".$column." AS value
-				FROM public.tbl_ort
-				WHERE aktiv AND reservieren AND ".$column." <> ''
-				ORDER BY ".$column);
-			$options[$column] = array_column($this->getDataOrTerminateWithError($result), 'value');
-		}
-
-		$this->terminateWithSuccess($options);
-	}
-
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
@@ -250,60 +91,5 @@ class Ort extends FHCAPI_Controller

 		$this->terminateWithSuccess($content);
 	}
-
-	public function getRoomInfo()
-	{
-		$ortKurzbz = $this->input->get("ortKurzbz");
-
-		$roomResult = $this->OrtModel->getRoomInfo($ortKurzbz);
-		$roomData = $this->getDataOrTerminateWithError($roomResult);
-		$room = count($roomData) ? $roomData[0] : null;
-		
-		$this->terminateWithSuccess($room);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * SQL conditions of the advanced filters in the GET parameters, adds their values to $params
-	 */
-	private function advancedFilterSql(&$params)
-	{
-		// no xss_clean: the values are bound, and it could change a select value so that it no longer equals the column
-		$sql = '';
-		foreach (self::ADVANCED_FILTERS as $column => $type) {
-			if ($type == 'range') {
-				$min = $this->input->get($column.'_min');
-				$max = $this->input->get($column.'_max');
-				if ($min !== null && $min !== '') {
-					$sql.= " AND tbl_ort.".$column." >= ?::numeric";
-					$params[] = $min;
-				}
-				if ($max !== null && $max !== '') {
-					$sql.= " AND tbl_ort.".$column." <= ?::numeric";
-					$params[] = $max;
-				}
-				continue;
-			}
-
-			$value = $this->input->get($column);
-			if ($value === null || $value === '')
-				continue;
-
-			if ($type == 'flag') {
-				$sql.= " AND tbl_ort.".$column;
-			} elseif ($type == 'exists') {
-				$sql.= " AND tbl_ort.".$column." IS NOT NULL";
-			} elseif ($type == 'select') {
-				$sql.= " AND tbl_ort.".$column." = ?";
-				$params[] = $value;
-			} else {
-				$sql.= " AND strpos(lower(tbl_ort.".$column."), lower(?)) > 0";
-				$params[] = $value;
-			}
-		}
-		return $sql;
-	}
 }

@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-		]);
-
-		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->library('ProfilLib');
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * retrieves viewData for other lv plan view
-	 * @access public
-	 * @param  $uid the userID for which the other lv plan is being viewed
-	 */
-	public function otherLvPlanViewData($uid)
-	{
-		$isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-		$isMitarbeiter = getData($isMitarbeiterResult);
-		$isStudent = !$isMitarbeiter;
-
-		$resProfileData = $this->profillib->getView($uid);
-		$profileData = hasData($resProfileData) ? getData($resProfileData) : null;
-
-		$viewData = [
-			"user_data" => [
-				"username" => $uid,
-				"is_student" => $isStudent,
-				"is_mitarbeiter" => $isMitarbeiter,
-				"foto" => $profileData->data->foto,
-				"vorname" => $profileData->data->vorname,
-				"nachname" => $profileData->data->nachname,
-				"titel" => $profileData->data->titel,
-				"postnomen" => $profileData->data->postnomen,
-			],
-		];
-
-		$this->terminateWithSuccess($viewData);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-}
-
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Permission extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getPermissions' => self::PERM_LOGGED,
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * retrieves permissions for auth user
-	 * @access public
-	 */
-	public function getPermissions()
-	{
-		$permissionsParam = $this->input->post("permissions");
-		if (!$permissionsParam || !is_array($permissionsParam)) {
-			$this->terminateWithError("Invalid parameter!");
-		}
-
-		$permissions = [];
-		foreach ($permissionsParam as $permission) {
-			$permissions[$permission] = $this->permissionlib->isBerechtigt($permission);
-		}
-
-		$this->terminateWithSuccess($permissions);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-}
-
@@ -32,8 +32,6 @@ class Phrasen extends FHCAPI_Controller
 			'setLanguage' => self::PERM_ANONYMOUS,
 			'getLanguage' => self::PERM_ANONYMOUS,
 			'getAllLanguages' => self::PERM_ANONYMOUS,
-			'getPhrases' => self::PERM_ANONYMOUS,
-			'getTabulatorPhrases' => self::PERM_ANONYMOUS,
 		]);

 		$this->load->helper('hlp_language');
@@ -94,59 +92,4 @@ class Phrasen extends FHCAPI_Controller
 		$this->terminateWithSuccess($langs);
 	}

-	public function getPhrases()
-	{
-		$postParams = $this->getPostJSON();
-
-		$languages = $postParams->languages;
-		if (!$languages || !count($languages)) {
-			$this->load->model('system/Sprache_model', 'sprachenModel');
-			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
-			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
-			$languages = array_map(
-				function ($languageData) {
-					return $languageData->sprache;
-				},
-				$activeLanguagesData
-			);
-		}
-
-		$this->load->model('system/Phrase_model', 'phraseModel');
-		$phrasesGroupedByCategory = $postParams->phrasesGroupedByCategory;
-		$result = [];
-		foreach ($languages as $language) {
-			$phrases = $this->phraseModel->getPhrasesByCategoryAndPhrasesAndLanguage($phrasesGroupedByCategory, $language);
-			$result[$language] = $this->getDataOrTerminateWithError($phrases);
-		}
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getTabulatorPhrases()
-	{
-		$languages = json_decode($this->input->get('languages'));
-		if (!$languages || !count($languages)) {
-			$this->load->model('system/Sprache_model', 'sprachenModel');
-			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
-			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
-			$languages = array_map(
-				function ($languageData) {
-					return $languageData->sprache;
-				},
-				$activeLanguagesData
-			);
-		}
-
-		$this->load->model('system/Phrase_model', 'phraseModel');
-		$result = [];
-		foreach ($languages as $language) {
-			$tabulatorPhrases = $this->phraseModel->getPhrasesByCategoryAndLanguage(['tabulator'], $language);
-			$result[$language] = $this->getDataOrTerminateWithError($tabulatorPhrases);
-		}
-
-		header('Pragma: private');
-		header('Cache-Control: private, max-age=' . (60 * 60 * 24 * 30));
-		$this->terminateWithSuccess($result);
-	}
-
 }
@@ -16,8 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 class Profil extends FHCAPI_Controller
 {
@@ -28,17 +27,27 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'fotoSperre' => self::PERM_LOGGED,
+			'getView' => self::PERM_LOGGED,
+            'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
-			'profilViewData' => self::PERM_LOGGED,
+			
 		]);
-
+		
 		$this->load->library('PermissionLib');

 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');


 		//? put the uid and pid inside the controller for reusability
@@ -50,36 +59,68 @@ class Profil extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	/**
-     * retrieves view data for profile view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function profilViewData($uid = null)
+	
+    /**
+	 * function that returns the data used for the corresponding view
+	 * the client side parses the @param $uid and calls this function to get the data to the correct view 
+	 * @access public
+	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
+	 * @return stdClass all the data corresponding to a view of a user
+	 */
+	public function getView($uid)
 	{
-		$authUid = getAuthUID();
-		$isProfilOfAuthUser = !$uid || $uid === $authUid;
+		$res = new stdClass();
+		$editAllowed = getAuthUID() == $uid || $this->permissionlib->isBerechtigt('admin');

-		$this->load->library('ProfilLib');
-		$profileData = $this->profillib->getView($uid ?? $authUid);
-		$profileData = hasData($profileData) ? getData($profileData) : null;
-
-		$viewData = [
-			'editable' => $isProfilOfAuthUser,
-			'profil_data' => $profileData,
-			'permissions' => [
-				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan'))
-			]
-		];
-
-		if ($isProfilOfAuthUser) {
-			$viewData['calendar_sync_urls'] = $this->getCalendarSyncUrlData();
+		// if parsing the URL did not found a UID then the UID of the logged in user is used
+		if ($uid == "Profil" || $uid == $this->uid) {
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = $this->pid;
+			} else {
+				$res->view = "StudentProfil";
+				$res->data = $this->studentProfil();
+				$res->data->pid = $this->pid;
+			}
+			// editing your own profil - true
+			$editAllowed = true;
 		}
+		// UID is availabe when accessing Profil/View/:uid
+		else {
+			$this->PersonModel->addSelect(["person_id"]);
+			$pid = $this->PersonModel->getByUid($uid);
+			if (isError($pid)) {
+				show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
+			}
+			$pid = hasData($pid) ? getData($pid)[0] : null;
+			if (!$pid) {
+				show_error("Person with UID: " . $uid . " does not exist");
+			}
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);

-		$this->terminateWithSuccess($viewData);
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+			}
+		}
+		$res->data->editAllowed = $editAllowed;
+		$this->terminateWithSuccess($res);
 	}

-	/**
+    /**
 	 * update column foto_sperre in public.tbl_person
 	 * @access public
 	 * @param  boolean $value  new value for the column
@@ -87,20 +128,23 @@ class Profil extends FHCAPI_Controller
 	 */
 	public function fotoSperre($value)
 	{
-		if (!isset($value)) {
-			$this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
-		}
+        if(!isset($value)){
+            $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+        }

 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
-			$this->terminateWithError("error while trying to update table public.tbl_person");
+			show_error("error while trying to update table public.tbl_person");
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
+		if (isError($res)) {
+			show_error("error while trying to query table public.tbl_person");
+		}

-		$res = $this->getDataOrTerminateWithError($res);
-
-		$this->terminateWithSuccess(current($res));
+        $res = $this->getDataOrTerminateWithError($res);
+		
+        $this->terminateWithSuccess(current($res));
 	}

 	/**
@@ -119,7 +163,7 @@ class Profil extends FHCAPI_Controller
 		if (isError($nation_res)) {
 			$this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
 		}
-
+		
 		$nation_res = $this->getDataOrTerminateWithError($nation_res);

 		$this->terminateWithSuccess($nation_res);
@@ -127,30 +171,114 @@ class Profil extends FHCAPI_Controller

 	public function getGemeinden($nation, $zip)
 	{
-		if (!isset($nation) || !isset($zip)) {
+		if(!isset($nation) || !isset($zip)){
 			echo json_encode(error("Missing parameters"));
 			return;
 		}
-
+		
 		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
-
+		

 		$gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
-
+		
 		if (isError($gemeinde_res)) {
-			$this->terminateWithError(getError($gemeinde_res), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
 		}
 		$gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
-
+		
 		/* $gemeinde_res = array_map(function ($obj) {
 			return $obj->ortschaftsname;
 		}, $gemeinde_res); */

-		$this->terminateWithSuccess($gemeinde_res);
-
+		$this->terminateWithSuccess($gemeinde_res);	
+		
 	}


+    // -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+		$res->emails = array($intern_email, $extern_email);
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -160,48 +288,408 @@ class Profil extends FHCAPI_Controller
 	public function isMitarbeiter($uid)
 	{

-		if (!$uid)
-			$this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
-
-
+		if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+		
+		
 		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-
+		
 		if (isError($result)) {
 			$this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
 		}

 		$result = $this->getDataOrTerminateWithError($result);
-
+		
 		$this->terminateWithSuccess($result);
 	}

-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+		$telefon_res = $this->getTelefonInfo($this->uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$res->emails = [$intern_email, $extern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}

 	/**
-	 * gets the identifier, phrase, and url for each calendar sync option
-	 * @access private
-	 * @return array array of arrays, where each child array is a sync option
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
 	 */
-	private function getCalendarSyncUrlData()
+	private function studentProfil()
 	{
-		return [
-			[
-				"identifier" => "cal_dav",
-				"labelPhrase" => "profil/calendar_sync_cal_dav",
-				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
-			],
-			[
-				"identifier" => "cal_dav_principal",
-				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
-				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
-			],
-			[
-				"identifier" => "i_cal",
-				"labelPhrase" => "profil/calendar_sync_i_cal",
-				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
-			],
-		];
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+		$student_res = $this->getStudentInfo($this->uid);
+		$matr_res = $this->getMatrikelNummer($this->uid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+
+    /**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
+	private function getMailverteiler($uid)
+	{
+		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if (isError($mailverteiler_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
+		}
+		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element;
+		}, $mailverteiler_res);
+		return $mailverteiler_res;
+	}
+
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
+	private function getBenutzerFunktion($uid)
+	{
+		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		if (isError($benutzer_funktion_res)) {
+			show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
+		}
+		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+		return $benutzer_funktion_res;
+	}
+
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
+	private function getBetriebsmittelInfo($pid)
+	{
+		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if (isError($betriebsmittelperson_res)) {
+			show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
+		}
+		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+		return $betriebsmittelperson_res;
+	}
+
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
+	private function getBenutzerAlias($uid)
+	{
+		$this->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		if (isError($benutzer_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
+		} else {
+			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+		}
+
+		return $benutzer_res;
+	}
+
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
+		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		/** @param integer $geburtsInfo */
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
+		}
+		$this->BenutzerModel->addSelect($selectClause);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$person_res = $this->BenutzerModel->load([$uid]);
+		if (isError($person_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
+		} else {
+			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
+		}
+
+		if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
+		{
+			$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+			$person_res->foto = $dummy_foto;
+		}
+
+		return $person_res;
+	}
+
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
+	private function getMitarbeiterInfo($uid)
+	{
+		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+		if (isError($mitarbeiter_res)) {
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
+		} else {
+			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
+		}
+
+		return $mitarbeiter_res;
+	}
+
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
+	private function getTelefonInfo($uid)
+	{
+		$this->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if (isError($telefon_res)) {
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
+		}
+		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+		return $telefon_res;
+	}
+
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
+	private function getStudentInfo($uid)
+	{
+		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+		$student_res = $this->StudentModel->load([$uid]);
+		if (isError($student_res)) {
+			show_error("was not able to query the table public.tbl_student:" . getData($student_res));
+		}
+		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+		return $student_res;
+	}
+
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
+	private function getProfilUpdates($uid)
+	{
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if (isError($profilUpdates)) {
+			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
+		}
+		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+		return $profilUpdates;
+	}
+
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return integer the Matrikelnummer corresponding to a userID
+	 */
+	private function getMatrikelNummer($uid)
+	{
+		$this->BenutzerModel->addSelect(["matr_nr"]);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$matr_res = $this->BenutzerModel->load([$uid]);
+		if (isError($matr_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
+		}
+		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+		return $matr_res;
+	}
+
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
+	private function getZutrittsgruppen($uid)
+	{
+		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if (isError($zutrittsgruppe_res)) {
+			show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
+		}
+		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+		return $zutrittsgruppe_res;
+	}
+
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
+	private function getAdressenInfo($pid)
+	{
+		$adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
+		if (isError($adresse_res)) {
+			show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
+		}
+		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+		return $adresse_res;
+	}
+
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
+	private function getKontaktInfo($pid)
+	{
+		$this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
+		if (isError($kontakte_res)) {
+			show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
+		}
+		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+		return $kontakte_res;
+	}
+
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
+	private function getZutrittskarteDatum($uid)
+	{
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		if (isError($zutrittskarte_ausgegebenam)) {
+			show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
+		}
+		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		return $zutrittskarte_ausgegebenam;
 	}
 }

@@ -44,7 +44,6 @@ class ProfilUpdate extends FHCAPI_Controller
 			'updateProfilRequest' => self::PERM_LOGGED,
 			'deleteProfilRequest' => self::PERM_LOGGED,
 			'insertFile' => self::PERM_LOGGED,
-			'updateProfilbild' => self::PERM_LOGGED,
 			'show' => self::PERM_LOGGED,
 			]);

@@ -479,101 +478,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess($res);
 	}

-	public function updateProfilbild()
-	{
-
-		$resize = function($filename, $width, $height){
-			// Hoehe und Breite neu berechnen
-			list($width_orig, $height_orig) = getimagesize($filename);
-			
-			if ($width && ($width_orig < $height_orig))
-			{
-				$width = ($height / $height_orig) * $width_orig;
-			}
-			else
-			{
-				$height = ($width / $width_orig) * $height_orig;
-			}
-
-			$image_p = imagecreatetruecolor($width, $height);
-
-			$image = imagecreatefromjpeg($filename);
-
-			//Bild nur verkleinern aber nicht vergroessern
-			if($width_orig>$width || $height_orig>$height)
-				imagecopyresampled($image_p, $image, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
-			else
-				$image_p = $image;
-
-			imagejpeg($image_p, $filename, 80);
-
-			@imagedestroy($image_p);
-			@imagedestroy($image);
-		};
-		
-		if (!count($_FILES)) {
-			$this->terminateWithError("No file available for upload");
-		}
-
-		$files = $_FILES['files'];
-		
-		$_FILES['files']['name'] = current($files['name']);
-		$_FILES['files']['type'] = current($files['type']);
-		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
-		$_FILES['files']['error'] = current($files['error']);
-		$_FILES['files']['size'] = current($files['size']);
-		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
-
-		$filename = $_FILES['files']['tmp_name'];
-
-		$ext = substr(current($files['name']), strrpos(current($files['name']), '.') + 1);
-		if($ext!='jpg' && $ext!='jpeg'){
-			$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
-		}
-		
-		// resize
-		$resize($filename, 827, 1063);
-
-		//akte
-		$fp = fopen($filename,'r');
-		//auslesen
-		$content = fread($fp, filesize($filename));
-		$base64_content = base64_encode($content);
-		$this->load->library('AkteLib');
-		$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
-		fclose($fp);
-		if (isError($aktenInsertResult)) {
-			$this->terminateWithError(getError($aktenInsertResult));
-		}
-
-		// in person abspeichern
-		$resize($filename, 101, 130);
-		$fp = fopen($filename,'r');
-		$content = fread($fp, filesize($filename));
-		fclose($fp);
-		$base64_content = base64_encode($content);
-		$this->load->model('person/Person_model','PersonModel');
-		$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
-		if(isError($personUpdate)){
-			$this->terminateWithError(getError($personUpdate));
-		}
-
-
-		// update foto status
-		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
-		$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
-		if(isError($fotoInsert)){
-			$this->terminateWithError(getError($fotoInsert));
-		}
-		
-		$this->terminateWithSuccess();
-	}
-
 	public function getProfilUpdateWithPermission($status = null)
 	{
 		// early return if no status has been passed as argument
 		if (!isset($status)) {
-			$this->terminateWithSuccess($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+			return;
 		}

 		// get the sprache of the user
@@ -586,7 +496,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
 			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);

-			$this->terminateWithSuccess($res);
+			echo json_encode($res);
 		}
 	}

@@ -637,10 +547,9 @@ class ProfilUpdate extends FHCAPI_Controller
 				//? Send email to the Studiengangsassistentinnen
 				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
 				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
 				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
 				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
-				$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);
 				//* check if the benutzer itself is active
 				//* check if the student status is Student or Diplomand (active students)
 				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
@@ -657,10 +566,8 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		$mail_res = [];
 		//? sending email
-		foreach ($emails as $email)
-		{
-			$href = $this->config->item('cis_vilesci_base_url') . $this->config->item('cis_vilesci_index_page') . '/Cis/ProfilUpdate/id/' . $profil_update_id;
-			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => $href], $email, ("Profil Änderung von " . $uid)));
+		foreach ($emails as $email) {
+			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
 		}
 		foreach ($mail_res as $m_res) {
 			if (!$m_res) {
@@ -683,21 +590,21 @@ class ProfilUpdate extends FHCAPI_Controller

 		function languageQuery($language)
 		{
-			return "select index from public.tbl_sprache where sprache = '" . $language . "'";
+			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
 		}

 		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
 		
 		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+		
 		if (isError($status_translation)) {
 			$this->terminateWithError($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
 		}

 		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
-		if (isset($status_translation))
-		{
-			$href = $this->config->item('cis_base_url') . $this->config->item('cis_index_page') . '/Cis/Profil';
-			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => $href], $email, ("Profil Änderung " . $status_translation->status_de . ' / Profile Update ' . $status_translation->status_en));
+
+		if (isset($status_translation)) {
+			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
 			if (!$mail_res) {
 				$this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
 			}
@@ -706,13 +613,7 @@ class ProfilUpdate extends FHCAPI_Controller

 	private function setStatusOnUpdateRequest($id, $status, $status_message)
 	{
-		return $this->ProfilUpdateModel->update([$id], [
-			"status" => $status,
-			"status_timestamp" => "NOW()",
-			"status_message" => $status_message,
-			"updateamum" => "NOW()",
-			"updatevon" => getAuthUID()
-		]);
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
 	
 	private function updateRequestedChange($id, $requested_change)
@@ -722,12 +623,13 @@ class ProfilUpdate extends FHCAPI_Controller
 	
 	private function deleteOldVersionFile($dms_id)
 	{
-		if (!isset($dms_id)) {
-			return true;
-		}
-
 		// starting the transaction
 		$this->db->trans_start();
+		
+		
+		if (!isset($dms_id)) {
+			return;
+		}

 		//? delete the file from the profilUpdate first
 		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
@@ -782,8 +684,13 @@ class ProfilUpdate extends FHCAPI_Controller

 		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
 		$res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));	
-		$oe = ($res[0])->oe_kurzbz;
-		return $oe;
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
 	}

 	private function handleAdresse($requested_change, $personID)
@@ -813,7 +720,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_adresse_id = $insertID;
 			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			if ($insert_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id, $personID);
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
 			}
 		}
 		//! DELETE
@@ -825,33 +732,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		//! UPDATE
 		else {
-			$curadresse_res = $this->AdresseModel->load($adresse_id);
-			$curadresse = ($this->getDataOrTerminateWithError($curadresse_res))[0];
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);

-			if($curadresse->heimatadresse)
-			{
-				$tmpadresse = array_merge((array) $curadresse, $requested_change);
-				unset($tmpadresse["adresse_id"]);
-				$tmpadresse['insertamum'] = "NOW()";
-				$tmpadresse['insertvon'] = getAuthUID();
-				$tmpadresse['person_id'] = $personID;
-				unset($tmpadresse["heimatadresse"]);
-				unset($tmpadresse["updateamum"]);
-				unset($tmpadresse["updatevon"]);
-
-				$tmpadresse_res = $this->AdresseModel->insert($tmpadresse);
-				$tmpadresse_id = $this->getDataOrTerminateWithError($tmpadresse_res, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $tmpadresse_id, $personID);
-			}
-			else
-			{
-				$requested_change['updateamum'] = "NOW()";
-				$requested_change['updatevon'] = getAuthUID();
-
-				$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-				$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
-			}
 		}
 		return $insertID ?? null;
 	}
@@ -873,7 +759,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_kontakt_id = $insertID;
 			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
 			}
 		}
 		//! DELETE
@@ -890,18 +776,18 @@ class ProfilUpdate extends FHCAPI_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
 			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}

-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id, $person_id)
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
 			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustelladresse" => TRUE]);
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
 			if (isError($zustellAdressenArray)) {
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
@@ -914,8 +800,6 @@ class ProfilUpdate extends FHCAPI_Controller
 					return $adresse->adresse_id != $adresse_id;
 				});
 	
-				$this->addMeta('bhzustelladressen', $zustellAdressenArray);
-
 				// remove the zustelladresse from all other zustelladressen
 				foreach ($zustellAdressenArray as $adresse) {
 					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
@@ -925,16 +809,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}

-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $kontakttyp, $person_id)
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
 			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere([
-				"public.tbl_person.person_id" => $person_id,
-				"zustellung" => TRUE,
-				"kontakttyp" => $kontakttyp
-			]);
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
 			if (!isSuccess($zustellKontakteArray)) {
 				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class RendererLoader extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-
-		parent::__construct([
-			'GetRenderers' => self::PERM_LOGGED,
-           
-		]);
-
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
-
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	 /**
-     * fetches Stundenplan and Moodle events together
-     * @access public
-     *
-     */
-	public function GetRenderers(){
-		$renderer_paths = [];
-		Events::trigger(
-				'loadRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-		$this->terminateWithSuccess($renderer_paths);
-	}
-
-	
-	
-
-}
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Reservierung extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getMyReservation' => 'basis/cis:r',
-			'deleteReservation' => 'lehre/reservierung:rw'
-		]);
-
-		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-
-	}
-
-	/**
-	 * Retrieves all reservations from lehre.vw_reservation of the logged in user
-	 */
-	public function getMyReservation()
-	{
-		$result = $this->ReservierungModel->getMyReservation();
-		$data = $this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * deletes a reservation by ID
-	 */
-	public function deleteReservation()
-	{
-		$reservierung_id = $this->input->post('reservierung_id');
-
-
-		if ($reservierung_id === NULL || trim((string)$reservierung_id) === '') {
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		}
-		
-		$result = $this->ReservierungModel->deleteReservation($reservierung_id);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}
-
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class RouteInfo extends FHCAPI_Controller
-{
-
-	public function __construct()
-	{
-		parent::__construct([
-			'info' => self::PERM_LOGGED,
-		]);
-
-		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
-	}
-
-	public function info()
-	{
-		$payload = json_decode($this->input->raw_input_stream);
-
-		if (isset($payload->app) && isset($payload->path) && $this->isValidApp($payload->app) && $this->isValidPath($payload->path))
-		{
-			$this->WebservicelogModel->insert(array(
-				'webservicetyp_kurzbz' => 'content',
-				'beschreibung' => $payload->app,
-				'request_data' => $payload->path,
-				'execute_user' => getAuthUID(),
-				'execute_time' => 'NOW()'
-			));
-		}
-		$this->terminateWithSuccess(true);
-	}
-
-	protected function isValidApp($app)
-	{
-		return preg_match("/^[A-Za-z0-9\-_]+$/", $app);
-	}
-
-	protected function isValidPath($path)
-	{
-		return preg_match("/^[\/A-Za-z0-9_.\-~?%=&;]+$/", $path);
-	}
-}
@@ -35,12 +35,11 @@ class Searchbar extends FHCAPI_Controller
 	{
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
-			'search' => self::PERM_LOGGED,
-			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED
+			'search' => self::PERM_LOGGED
 		]);

-		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
+		// Load the library SearchBarLib
+		$this->load->library('SearchBarLib');
 	}

 	//------------------------------------------------------------------------------------------------------------------
@@ -51,7 +50,6 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
-		$this->load->library('SearchBarLib');
 		$this->load->library('form_validation');

 		// Checks if the searchstr and the types parameters are in the POSTed JSON
@@ -65,64 +63,7 @@ class Searchbar extends FHCAPI_Controller
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 		if (property_exists($result, 'error'))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		
-		$this->addMeta('mode', 'simple');
-		
-		$this->terminateWithSuccess($result->data);
-	}
-
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function searchCis()
-	{
-		return $this->searchAdvanced([ 'config' => 'searchcis' ]);
-	}
-
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function searchStv()
-	{
-		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
-	}
-
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	private function searchAdvanced($config)
-	{
-		$this->load->library('SearchLib', $config);
-		$this->load->library('form_validation');
-
-		// Checks if the searchstr and the types parameters are in the POSTed JSON
-		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
-		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// Convert to json the result from searchlib->search
-		$result = $this->searchlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
-
-		$this->WebservicelogModel->insert(array(
-			'webservicetyp_kurzbz' => 'content',
-			'beschreibung' => $config['config'],
-			'request_data' => json_encode(array(
-				self::SEARCHSTR_PARAM => $this->input->post(self::SEARCHSTR_PARAM),
-				self::TYPES_PARAM => $this->input->post(self::TYPES_PARAM)
-			)),
-			'execute_user' => getAuthUID(),
-			'execute_time' => 'NOW()'
-		));
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->addMeta('time', $result->meta['time']);
-		$this->addMeta('searchstring', $result->meta['searchstring']);
-		$this->addMeta('mode', 'advanced');
-		
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }

@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class StgOrgLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-			'stgOrgLvPlanViewData' => self::PERM_LOGGED,
-        ]);
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-	 * fetches view data for stg org lv plan
-	 * @access public
-	 */
-	public function stgOrgLvPlanViewData()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-		$studiengaenge = $this->getDataOrTerminateWithError($result);
-
-		$viewData = array(
-			'studiengaenge' => $studiengaenge,
-		);
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-
@@ -27,7 +27,7 @@ class Studgang extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getStudiengangInfo'=> self::PERM_LOGGED,
-			'getDegreePrograms'=> self::PERM_LOGGED,
+
 		]);

 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -43,46 +43,15 @@ class Studgang extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	public function getDegreePrograms() {
-		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
-		if (!$entitledDegreePrograms) {
-			$this->terminateWithError("User is not entitled for any degree program");
-		}
-
-		$activeDegreePrograms = $this->StudiengangModel->getDegreePrograms();
-		$activeDegreePrograms= $this->getDataOrTerminateWithError($activeDegreePrograms);
-
-		$activeDegreePrograms = array_values(array_filter($activeDegreePrograms, function($degreeProgram) use ($entitledDegreePrograms) {
-			return in_array($degreeProgram->studiengang_kz, $entitledDegreePrograms);
-		}));
-
-		$this->terminateWithSuccess($activeDegreePrograms);
-	}
-
 	public function getStudiengangInfo(){
-		$studiengang_kz = $this->input->get('studiengang_kz', true);
-		$semester = $this->input->get('semester', true);
-
-		// without a Studiengang the info of the logged in Student is returned
-		if (!is_numeric($studiengang_kz))
-		{
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
-			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-			if($isMitarbeiter) {
-				$this->terminateWithSuccess(null);
-			}
-
-			$studiengang_kz = null;
-			$semester = null;
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
+		if($isMitarbeiter) {
+			$this->terminateWithSuccess(null);
 		}
-		else
-		{
-			$studiengang_kz = (int)$studiengang_kz;
-			$semester = is_numeric($semester) ? (int)$semester : null;
-		}
-
+		
 		// fetches the Studiengang Information which is used next to the news
-		$studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews($studiengang_kz, $semester);
+		$studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews();
 		$studiengangInfo= $this->getDataOrTerminateWithError($studiengangInfo);
 		$this->terminateWithSuccess($studiengangInfo);
 	}
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-class Studiensemester extends FHCAPI_Controller
-{
-
-	private $_ci;
-	
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudiensemester'=> self::PERM_LOGGED,
-
-		]);
-
-		$this->_ci =& get_instance();
-		
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * GET METHOD
-	 * returns List of all studiensemester as well as current one
-	 */
-	public function getStudiensemester()
-	{
-		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
-		$result = $this->_ci->StudiensemesterModel->load();
-
-		$studiensemester = getData($result);
-		$result = $this->_ci->StudiensemesterModel->getAkt();
-		$aktuell = getData($result);
-
-		$this->terminateWithSuccess(array($studiensemester, $aktuell));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-
-
-}
-
@@ -1,353 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class Studium extends FHCAPI_Controller
-{
-	
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudienAllSemester'=> self::PERM_LOGGED,
-			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
-			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
-			'getLvEvaluierungInfo'=> self::PERM_LOGGED,
-		]);
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
-		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->load->model('codex/Orgform_model','OrgformModel');
-		$this->load->model('person/Person_model','PersonModel');
-
-		
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getStudienAllSemester(){
-
-		$parameter_studiensemester = $this->input->get('studiensemester',true);
-        $parameter_studiengang = $this->input->get('studiengang',true);
-		$parameter_semester = $this->input->get('semester',true);
-		$parameter_studienplan = $this->input->get('studienplan',true);
-
-		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester()));
-
-		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
-			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
-
-			//TODO(Manu) check if use Fallback or just comment out all paramschecks?
-			//add Fallback: if no LehrverbandData of actual semester, get Data of previous one
-			if(!hasData($studentLehrverband))
-			{
-				$result= $this->StudiensemesterModel->getPreviousFrom($aktuelles_studiensemester->studiensemester_kurzbz);
-
-				$data = $this->getDataOrTerminateWithError($result);
-				$vorheriges_studiensemester = current($data)->studiensemester_kurzbz;
-				$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $vorheriges_studiensemester]);
-			}
-			$studentLehrverband = current(getData($studentLehrverband));
-
-			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
-			
-			if(!isset($parameter_studiensemester)) {
-				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-				$parameter_studiensemester = $student_studiensemester;
-			}
-			if(!isset($parameter_studiengang)) {
-				$student_studiengang = $studentLehrverband->studiengang_kz;
-				$parameter_studiengang = $student_studiengang;
-			}
-			if(!isset($parameter_semester)) {
-				$student_semester = $studentLehrverband->semester;
-				$parameter_semester = $student_semester;
-			}
-			if(!isset($parameter_studienplan))
-				$parameter_studienplan = $student_studienplan;
-
-		}  
-
-		if(isset($parameter_studiensemester)){
-			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
-		}
-
-		if(isset($parameter_studiengang)){
-			$parameter_studiengang = current($this->getDataOrTerminateWithError($this->StudiengangModel->loadWhere(["studiengang_kz" => $parameter_studiengang])));
-		}
-
-		if(isset($parameter_studienplan)){
-			$this->StudienplanModel->addJoin("lehre.tbl_studienordnung", "studienordnung_id");
-			$this->StudienplanModel->addJoin("lehre.tbl_studienplan_semester", "studienplan_id");
-			$parameter_studienplan = $this->StudienplanModel->loadWhere(["studienplan_id" => $parameter_studienplan, "aktiv" => TRUE]);
-			$parameter_studienplan = current($this->getDataOrTerminateWithError($parameter_studienplan));
-		}
-
-		// fetch studiensemester
-		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
-
-		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
-			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
-		}))){
-			$aktuelles_studiensemester = $parameter_studiensemester;
-		}
-		
-		// fetch studiengaenge
-		$studiengaenge = $this->computeStudiengaenge($aktuelles_studiensemester->studiensemester_kurzbz);
-		$aktuelles_studiengang = current($studiengaenge);
-		if(!$aktuelles_studiengang){
-			$aktuelles_studiengang = null;
-		}
-		if(isset($parameter_studiengang) && !empty(array_filter( $studiengaenge,function($studiengang)use($parameter_studiengang){
-			return $studiengang->studiengang_kz == $parameter_studiengang->studiengang_kz;
-		}))){
-			$aktuelles_studiengang = $parameter_studiengang;
-		}
-		
-		// compute semester and studienplaene
-		if($aktuelles_studiengang){
-			$studienplaene = $this->computeStudienplaene($aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
-		}else{
-			$studienplaene =[];
-		}
-
-		$semester = array_values(array_unique(array_map(function($item){
-			return $item->semester;
-		}, $studienplaene))); 
-		$aktuelles_semester = current($semester);
-		if(!$aktuelles_semester){
-			$aktuelles_semester = null;
-		}
-		if(isset($parameter_semester) && in_array($parameter_semester, $semester)){
-			$aktuelles_semester = $parameter_semester;
-		}
-
-		$semester_studienplan = array_filter($studienplaene, function($item) use($aktuelles_semester){
-			return $item->semester == $aktuelles_semester;
-		});
-
-		// fetch current studienplan based on semester
-		$aktuelles_studienplan = current($semester_studienplan);
-		if(!$aktuelles_studienplan){
-			$aktuelles_studienplan = null;
-		}
-		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($studienplan) use($parameter_studienplan){
-			return $studienplan->studienplan_id == $parameter_studienplan->studienplan_id;
-		}))){
-			$aktuelles_studienplan = $parameter_studienplan ;
-		}
-
-		// fetch studienplan lehrveranstaltungen
-		if($aktuelles_studienplan){
-			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
-			foreach($lehrveranstaltungen as $lehrv){
-				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
-				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
-				foreach($lvs as $lv){
-					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
-					$lv->lektoren = $lvLektoren;
-				}
-			
-			}
-			$aktuelles_lehrveranstaltungen = $lehrveranstaltungen;
-		}else{
-			$aktuelles_lehrveranstaltungen = [];
-		}
-
-		// result object
-		$result = new stdClass();
-		$result->studienSemester = [];
-		$result->studienSemester["all"]= $allStudienSemester;
-		$result->studienSemester["preselected"]=$aktuelles_studiensemester;
-		$result->studiengang["all"]=$studiengaenge;
-		$result->studiengang["preselected"]=$aktuelles_studiengang;
-		$result->semester["all"] =$semester;
-		$result->semester["preselected"] =$aktuelles_semester;
-		$result->studienplan["all"]=$semester_studienplan;
-		$result->studienplan["preselected"]=$aktuelles_studienplan; 
-		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
-		
-		
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getLvEvaluierungInfo($studiensemester_kurzbz, $lehrveranstaltung_id){
-		$result = [];
-		Events::trigger('lvEvaluierungsInfo', function & () use (&$result) {
-			return $result;
-		},$lehrveranstaltung_id, $studiensemester_kurzbz);
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getStudiengaengeForStudienSemester($studiensemester){
-		$studiengaenge = $this->computeStudiengaenge($studiensemester);
-		$this->terminateWithSuccess($studiengaenge);
-	}
-
-	public function getStudienplaeneBySemester(){
-		$this->load->library('form_validation');
-        $this->form_validation->set_data($this->input->get());
-		$this->form_validation->set_rules('studiengang', 'studiengang', 'required');
-        $this->form_validation->set_rules('studiensemester', 'studiensemester', 'required');
-        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
- 
-        $studiengang = $this->input->get('studiengang',true);
-        $studiensemester = $this->input->get('studiensemester',true);
-        $studienplaene = $this->computeStudienplaene($studiengang, $studiensemester);
-		$this->terminateWithSuccess($studienplaene);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	private function computeStudienplaene($studiengang, $studiensemester){
-		$studienplaene = $this->StudienplanModel->getStudienplaeneBySemester($studiengang, $studiensemester);
-		$studienplaene = $this->getDataOrTerminateWithError($studienplaene);
-		$studienplaene = array_map(function($studienplan){
-			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
-			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
-			// bezeichnung_mehrsprachig
-			$studienplan->orgform_bezeichnung_english = $orgform->bezeichnung_mehrsprachig[1];
-			return $studienplan;
-		},$studienplaene);
-		return $studienplaene;
-	}
-
-	private function computeStudienplanLehrveranstaltungen($studienplan_id, $semester){
-
-/* 
-SELECT tbl_lehrveranstaltung.*,
-            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
-            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
-            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
-            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
-            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
-            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
-            tbl_studienplan_lehrveranstaltung.curriculum,
-            tbl_studienplan_lehrveranstaltung.export,
-            tbl_studienplan_lehrveranstaltung.genehmigung
-        FROM lehre.tbl_lehrveranstaltung
-        JOIN lehre.tbl_studienplan_lehrveranstaltung
-        USING(lehrveranstaltung_id)
-        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=" . $this->db_add_param($studienplan_id, FHC_INTEGER);
-        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
-            $qry .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
-        if (!is_null($semester))
-        {
-            $qry.=" AND tbl_studienplan_lehrveranstaltung.semester=" . $this->db_add_param($semester, FHC_INTEGER);
-        } */
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		
-		$query = "
-		SELECT tbl_lehrveranstaltung.*,
-            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
-            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
-            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
-            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
-            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
-            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
-            tbl_studienplan_lehrveranstaltung.curriculum,
-            tbl_studienplan_lehrveranstaltung.export,
-            tbl_studienplan_lehrveranstaltung.genehmigung
-        FROM lehre.tbl_lehrveranstaltung
-        JOIN lehre.tbl_studienplan_lehrveranstaltung
-        USING(lehrveranstaltung_id)
-        WHERE 
-			tbl_lehrveranstaltung.lehre = true AND
-			tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
-		
-        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
-			$query .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
-		
-		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
-		
-		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		
-		usort($lehrveranstaltungen, function($a, $b){
-			if($a->lehrtyp_kurzbz == "modul"){
-				return -1;
-			}
-			else if($b->lehrtyp_kurzbz == "modul"){
-				return 1;
-			}
-			return 0;
-		});
-		$lehrveranstaltungen= array_reduce($lehrveranstaltungen,function($carry, $lehrv){
-			if($lehrv->lehrtyp_kurzbz == "modul"){
-				$lehrv->lehrveranstaltungen = [];
-				array_push($carry, $lehrv);
-			}
-			else{
-				$parent =array_filter($carry, function($item)use($lehrv){
-					return isset($item->lehrveranstaltungen)
-						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
-				});
-				$parent = current($parent);
-				if($parent){
-					$parent->lehrveranstaltungen[] = $lehrv;
-				}
-				else{
-					// lehrveranstaltung without a modul: keep it on the top level
-					array_push($carry, $lehrv);
-				}
-			}
-			return $carry;
-		}, []);
-		return $lehrveranstaltungen;
-	}
-
-	private function computeStudiengaenge($studiensemester){
-		$studiengang_studiensemester_result = $this->StudiengangModel->getStudiengaengeByStudiensemester($studiensemester);
-		$studiengang_studiensemester_result = $this->getDataOrTerminateWithError($studiengang_studiensemester_result);
-		return $studiengang_studiensemester_result;
-	}
-
-	private function getStudienPlanFromPrestudentStatus($person_id){
-			$studienplan_id = current($this->getDataOrTerminateWithError($this->PrestudentstatusModel->getLastStatusPerson($person_id)))->studienplan_id;
-			$studienplan =current($this->getDataOrTerminateWithError($this->StudienplanModel->loadWhere(["studienplan_id"=>$studienplan_id])));
-			return $studienplan;
-	}
-
-	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
-		$this->load->library('StundenplanLib');
-		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
-		$lektoren = $this->getDataOrTerminateWithError($lektoren) ?? [];
-		
-		$lektoren = array_map(function($lektor){
-			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
-		},$lektoren);
-		
-		return $lektoren;
-	}
-
-
-	
-	
-}
-
@@ -1,145 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class StudstatusAntraege extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getTodos' => self::PERM_LOGGED
-		]);
-
-		//load models
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * gets all todos of antraegen of the user with stg leitungsfunction
-	 * or list of open antraege for user with assistance function
-	 * @access public
-	 * @return array || []
-	 */
-	public function getTodos()
-	{
-		$uid = getAuthUID();
-
-		//at first get studiengang with leitungsfunktion
-		$result = $this->BenutzerfunktionModel->getSTGLByUID($uid);
-
-		if(hasData($result))
-		{
-			$funktionen = getData($result);
-
-			$studiengaenge = [];
-
-			foreach ($funktionen as $funktion) {
-				$studiengaenge[] = $funktion->studiengang_kz;
-			}
-
-			$dataAntrage = [];
-
-			$result = $this->StudierendenantragModel->getOpenAntraegeForStgl($studiengaenge);
-
-			if (isError($result)) {
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$dataAntrage[] = getData($result) ?: [];
-			$statusRole = 1;
-
-			$this->terminateWithSuccess([count($dataAntrage) > 0 ? $dataAntrage[0] : $dataAntrage, $statusRole]);
-
-		}
-
-		//TODO delete after check if needed or not
-		//get studiengaenge of assistance (regarding benutzerfunktion)
-		//$result = $this->BenutzerfunktionModel->getSTGAssByUID($uid);
-		/*		if(hasData($result)) {
-			$statusRole = 2;
-			$funktionen = getData($result);
-
-			$studiengaenge = [];
-
-			foreach ($funktionen as $funktion) {
-				$studiengaenge[] = $funktion->studiengang_kz;
-			}
-
-			$ci->addMeta('stgAss', $studiengaenge);
-			$dataAntrage = [];
-
-			foreach ($studiengaenge as $studiengang)
-			{
-				$result = $this->StudierendenantragModel->getOpenAntraegeForAss($studiengang);
-
-				if (isError($result)) {
-					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				if(hasData($result)) {
-					$dataAntrage[] = getData($result);
-					$statusRole = 2;
-				}
-			}
-		}
-		else
-		{
-			$statusRole = 0;
-			$dataAntrage = [];
-			//$this->terminateWithSuccess([[], $statusRole]);
-		}*/
-
-		//get studiengaenge of assistance (regarding rights)
-		$stgAss = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-		if(!is_array($stgAss))
-		{
-			$statusRole = 0;
-			$this->terminateWithSuccess([[], $statusRole]);
-		}
-		else {
-			$statusRole = 2;
-			$studiengaenge = [];
-
-			foreach ($stgAss as $stg) {
-				$studiengaenge[] = (int) $stg;
-			}
-
-			$dataAntrage = [];
-			$result = $this->StudierendenantragModel->getOpenAntraegeForAss($studiengaenge);
-
-			if (isError($result)) {
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			if(hasData($result)) {
-				$dataAntrage[] = getData($result);
-				$statusRole = 2;
-			}
-
-			$this->terminateWithSuccess([count($dataAntrage) > 0 ? $dataAntrage[0] : $dataAntrage, $statusRole]);
-
-		}
-	}
-}
@@ -0,0 +1,618 @@
+<?php
+/**
+ * Copyright (C) 2024 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Stundenplan extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+
+		parent::__construct([
+			'getRoomplan' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED,
+            'Reservierungen' => self::PERM_LOGGED,
+			'getStundenplan' => self::PERM_LOGGED,
+			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
+			'studiensemesterDateInterval' => self::PERM_LOGGED,
+		]);
+
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+        $this->load->library('form_validation');
+
+		//load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	//TODO: delete this function if we don't use the old calendar export endpoints anymore
+	public function studiensemesterDateInterval($date){
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
+		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
+		$this->terminateWithSuccess($studiensemester);
+	}
+		
+
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     *
+     */
+    public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$stunden = $this->StundeModel->load();
+
+        $stunden = $this->getDataOrTerminateWithError($stunden);
+
+		$this->terminateWithSuccess($stunden);
+	}
+
+    /**
+     * fetches room events from a certain date
+     * @access public
+     *
+     */
+	public function getRoomplan()
+	{
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_data($_GET);
+        $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+        $this->form_validation->set_rules('start_date',"start_date","required");
+        $this->form_validation->set_rules('end_date',"end_date","required");
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+        // storing the get parameter in local variables
+        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
+
+        $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
+
+		$this->expand_object_information($roomplan_data);
+
+		$this->terminateWithSuccess($roomplan_data);
+
+	}
+
+	/**
+	 * fetches stundenplan events from a UID and start/end date
+	 * @access public
+	 *
+	 */
+
+	public function getStundenplan(){
+
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		if ($this->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the get parameter in local variables
+		$start_date = $this->input->get('start_date', TRUE);
+		$end_date = $this->input->get('end_date', TRUE);
+		$lv_id = $this->input->get('lv_id', TRUE);
+
+		$student_uid = getAuthUID();
+		if(is_null($student_uid))
+		{
+			$this->terminateWithError("No UID");
+		}
+		
+		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
+		$this->sortStudienSemester($semester_range);
+		$this->applyLoadUeberSemesterHaelfte($semester_range);
+		
+		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+
+			$stundenplan_data = $this->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+			$this->expand_object_information($stundenplan_data);
+
+			// query lv itself in case its Stundenplan is being queried and it has no entries
+			$this->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
+			$lv = getData($this->LehrveranstaltungModel->load($lv_id))[0];
+			$this->addMeta('lv', $lv);
+			$this->terminateWithSuccess($stundenplan_data);
+			
+		}
+		
+		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
+		if($is_mitarbeiter)
+		{
+			
+			$stundenplan_data = $this->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+			$this->expand_object_information($stundenplan_data);
+			$this->terminateWithSuccess($stundenplan_data);
+		} else {
+			// getting the gruppen_kurzbz of the student in the different studiensemester
+			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
+
+			// getting the student_lehrverbaende of the student in the different studiensemester
+			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
+
+			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$stundenplan_query)
+			{
+				$this->terminateWithSuccess([]);
+			}
+			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+
+			$this->expand_object_information($stundenplan_data);
+			
+			$this->returnObj['$stundenplan_query'] = $stundenplan_query;
+			$this->returnObj['$student_lehrverband'] = $student_lehrverband;
+			$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+			$this->terminateWithSuccess($stundenplan_data);
+		}
+		
+	}
+
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+    public function Reservierungen($ort_kurzbz = null)
+	{
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+
+		// storing the get parameter in local variables
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		if($is_mitarbeiter)
+		{
+			$reservierungen = $this->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+		} else {
+			// querying the reservierungen
+			$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}
+		
+		$reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+		$this->expand_object_information($reservierungen);
+		$this->terminateWithSuccess($reservierungen);
+		
+	}
+
+	public function getLehreinheitStudiensemester($lehreinheit_id){
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
+		$result = $this->LehreinheitModel->load($lehreinheit_id);
+		$result = current($this->getDataOrTerminateWithError($result))->studiensemester_kurzbz;
+		$this->terminateWithSuccess($result);
+	}
+
+	// ################# Private Functions
+
+	private function expand_object_information($data){
+
+		foreach ($data as $item)
+		{
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor)
+			{
+				$this->StundenplanModel->addLimit(1);
+				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+				FROM public.tbl_mitarbeiter
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = $this->getDataOrTerminateWithError($lektor_object);
+				if(count($lektor_object) == 0)
+				{
+					$this->terminateWithError("No lektor object");
+				}
+				$lektor_object = current($lektor_object);
+				// only provide needed information of the mitarbeiter object
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe)
+			{
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+			
+			if($item->ort_kurzbz) {
+
+				$ort_content_object = $this->StundenplanModel->execReadOnlyQuery("
+				SELECT content_id
+				FROM public.tbl_ort
+				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
+				if (isError($ort_content_object)) {
+					$this->show_error(getError($ort_content_object));
+				}
+				$ort_content_object = getData($ort_content_object)[0];
+				if($ort_content_object) {
+					$item->ort_content_id = $ort_content_object->content_id;
+				}
+				
+				
+			}
+
+			$item->gruppe = $gruppe_obj_array;
+			$item->lektor = $lektor_obj_array;
+
+		}
+	}
+
+	// function used to sort an array of studiensemester strings
+	private function sortStudienSemester(&$semester_range){
+		usort(
+			$semester_range,
+			function($first,$second)
+			{
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+				
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				else if($year_first > $year_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			} 
+		);
+	}
+
+	
+
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					 array_map(
+						function($item)
+						{
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+		
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/ 
+		$benutzer_gruppen = array_map(
+			function($gruppe)
+			{
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return $benutzer_gruppen;
+	}
+
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+				array_push($student_lehrverband[$semester_key], array_map(
+					function ($item)
+					{
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result)); 
+			}
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		$student_lehrverband = array_map(
+			function($studentlehrverband)
+			{	
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return $student_lehrverband;
+	}
+
+	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key 
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
+			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				$this->terminateWithError("No previous semester");
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
+				
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+				
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	private function studienSemesterErmitteln($start_date,$end_date){
+		
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->StudiensemesterModel->getByDateRange($start_date,$end_date);
+		$semester_range = array_map( 
+			function($sem)
+			{
+				return $sem->studiensemester_kurzbz;
+			},
+			$this->getDataOrTerminateWithError($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				$this->terminateWithError("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+
+		}
+		return $semester_range;
+	}
+
+}
@@ -1,162 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the PhrasesLib (back-end)
- * Provides data to the ajax get calls about the Phrasen plugin
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class TabulatorPresets extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getTabulatorPresets' => self::PERM_LOGGED,
-			'createTabulatorPreset' => self::PERM_LOGGED,
-			'updateTabulatorPreset' => self::PERM_LOGGED,
-			'deleteTabulatorPreset' => self::PERM_LOGGED,
-		]);
-
-		$this->load->model('tabulator/Tabulator_preset_model', 'TabulatorPresetModel');
-
-		$this->loadPhrases([
-			'global',
-			'tabulator_presets'
-		]);
-	}
-	
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getTabulatorPresets()
-	{
-		$tableName = $this->input->get("tableName");
-		if (!$tableName) {
-			$this->terminateWithError(error($this->p->t("tabulator_presets", "invalid_params_err_msg")));
-		}
-
-		$uid = getAuthUID();
-		$presets = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$presetsData = $this->getDataOrTerminateWithError($presets) ?? [];
-
-		$this->terminateWithSuccess($presetsData);
-	}
-
-	public function createTabulatorPreset()
-	{
-		$tableName = $this->input->post("tableName");
-		$presetName = $this->input->post("presetName");
-		$preset = $this->input->post("preset");
-
-		if (!$tableName || !$presetName || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$uid = getAuthUID();
-
-		$existingPresetsResult = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$existingPresets = $this->getDataOrTerminateWithError($existingPresetsResult) ?? [];
-
-		if (count($existingPresets) > 19) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "max_presets_count_err_msg"), "general", 409);
-		}
-
-		$existingPresetNames = array_map(function($presetInfo) {
-			return $presetInfo->preset_name;
-		}, $existingPresets);
-
-		if (in_array($presetName, $existingPresetNames)) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_name_duplicate_err_msg"), "general", 409);
-		}
-
-		$presetCreationResult = $this->TabulatorPresetModel->createTabulatorPreset($uid, $tableName, $presetName, $preset);
-
-		if (isError($presetCreationResult)) {
-			$this->terminateWithError($presetCreationResult->retval);
-		}
-
-		$newPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetCreationResult->retval);
-		$newPresetArray = $this->getDataOrTerminateWithError($newPresetData) ?? [null];
-		$newPreset = $newPresetArray[0];
-
-		$this->terminateWithSuccess($newPreset);
-	}
-
-	public function updateTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		$preset = $this->input->post("preset");
-
-		if (!$presetId || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		} 
-
-		$existingPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$existingPresetArray = $this->getDataOrTerminateWithError($existingPresetData) ?? [null];
-		$existingPreset = $existingPresetArray[0];
-		if (!$existingPreset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($existingPreset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_update_err_msg"), "general", 403);
-		}
-
-		$presetUpdateResult = $this->TabulatorPresetModel->updateTabulatorPreset($presetId, $preset);
-		if (isError($presetUpdateResult)) {
-			$this->terminateWithError($presetUpdateResult->retval);
-		}
-
-		$updatedPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$updatedPresetArray = $this->getDataOrTerminateWithError($updatedPresetData) ?? [null];
-		$updatedPreset = $updatedPresetArray[0];
-
-		$this->terminateWithSuccess($updatedPreset);
-	}
-
-	public function deleteTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		if (!$presetId) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$presetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$presetArray = $this->getDataOrTerminateWithError($presetData) ?? [null];
-		$preset = $presetArray[0];
-		if (!$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($preset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_delete_err_msg"), "general", 403);
-		}
-
-		$presetDeletionResult = $this->TabulatorPresetModel->deleteTabulatorPreset($presetId);
-		if (isError($presetDeletionResult)) {
-			$this->terminateWithError($presetDeletionResult->retval);
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-}
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \ReflectionMethod as ReflectionMethod;
-use \ReflectionFunction as ReflectionFunction;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about menues
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Treemenu extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		// Load Router
-		$router = load_class('Router');
-
-		// Load Config
-		$config = load_class('Config');
-		$config->load('treemenu');
-
-		// Get Treemenu name & config
-		$name = $router->method;
-		$conf = $config->item($name);
-		
-		// Get Permissions from config
-		$permissions = $conf['permissions'] ?? self::PERM_ANONYMOUS;
-
-		// Call constructor
-		parent::__construct([
-			$name => $permissions
-		]);
-
-		// Load Library
-		$libraryName = $conf['library'] ?? null;
-		$this->load->library($libraryName, null, 'treemenulib');
-	}
-	
-	/**
-	 * @param string		$method
-	 * @param array			$params				(optional)
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params = [])
-	{
-		if (!$this->treemenulib)
-			show_404();
-
-		$this->addMeta('ci_method', $method);
-		$this->addMeta('ci_params', $params);
-		
-		$params = $this->uri->uri_to_assoc(6); // 6 = start of $params
-		$config = $this->treemenulib->config;
-
-		foreach (array_keys($params) as $key) {
-			if (!isset($config[$key]) || !$config[$key])
-				show_404();
-
-			$config = $config[$key];
-		}
-
-		// Prepare aliases
-		$argumentaliases = [];
-		if (property_exists($this->treemenulib, 'path_to_argument'))
-			$argumentaliases = array_flip($this->treemenulib->path_to_argument);
-		$methodaliases = [];
-		if (property_exists($this->treemenulib, 'redirect_method'))
-			$methodaliases = $this->treemenulib->redirect_method;
-		
-		$items = [];
-		foreach ($config as $uripart => $children) {
-			if (!is_array($children)) {
-				$uripart = $children;
-				$children = [];
-			}
-
-			$methodName = $uripart;
-			if (isset($methodaliases[$methodName])) {
-				$methodName = $methodaliases[$methodName];
-			} elseif (strpbrk($methodName, ' _-') !== false) {
-				$methodName = lcfirst(str_replace([' ', '_', '-'], '', ucwords($methodName, " \t\r\n\f\v_-")));
-			}
-
-			// Prepare arguments
-			if (is_callable($methodName, false, $name)) {
-				if (is_string($methodName) && is_callable([$this->treemenulib, $methodName]))
-					$callable = [$this->treemenulib, $methodName];
-				else
-					$callable = $methodName;
-			} else {
-				$callable = [$this->treemenulib, $methodName];
-			}
-
-			if (is_array($callable))
-				$reflection = new ReflectionMethod($callable[0], $callable[1]);
-			elseif (is_string($callable) && strstr($callable, '::'))
-				$reflection = new ReflectionMethod($callable);
-			elseif ($name != 'Closure::__invoke' && strstr($name, '::__invoke'))
-				$reflection = new ReflectionMethod($callable, '__invoke');
-			else
-				$reflection = new ReflectionFunction($callable);
-
-			$arguments = [];
-			foreach ($reflection->getParameters() as $arg) {
-				if ($arg->name == 'path_template') {
-					$path = $params;
-					$path[$uripart] = '%s';
-					$arguments[] = $this->uri->assoc_to_uri($path);
-				} elseif ($arg->name == 'has_children') {
-					$arguments[] = $children;
-				} elseif ($arg->name == 'original_method') {
-					$arguments[] = $uripart;
-				} elseif (isset($argumentaliases[$arg->name]) && isset($params[$argumentaliases[$arg->name]])) {
-					$arguments[] = $params[$argumentaliases[$arg->name]];
-				} elseif (isset($params[$arg->name])) {
-					$arguments[] = $params[$arg->name];
-				} else {
-					$arguments[] = null;
-				}
-			}
-
-			// Call function from lib
-			$items = array_merge($items, call_user_func_array($callable, $arguments));
-		}
-
-		$this->terminateWithSuccess($items);
-	}
-}
@@ -1,367 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getZeitsperrenUser' => ['cis/eigene_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'getTypenZeitsperren' => self::PERM_LOGGED,
-			'getTypenErreichbarkeit' => self::PERM_LOGGED,
-			'getStunden' => self::PERM_LOGGED,
-			'loadZeitsperre' => ['cis/eigene_zeitsperren:r', 'admin:r', 'assistenz:r'],
-			'add' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
-			'update' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
-			'delete' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'zeitsperren'
-		]);
-
-		// Load models
-		$this->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->load->model('ressource/Zeitsperretyp_model', 'ZeitsperretypModel');
-		$this->load->model('ressource/Erreichbarkeit_model', 'ErreichbarkeitModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->load->model('ressource/Zeitaufzeichnung_model', 'ZeitaufzeichnungModel');
-	}
-
-	public function getZeitsperrenUser($uid)
-	{
-		//check if $uid is passedUser
-		$loggedInUser = getAuthUID();
-		if($loggedInUser != $uid) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) {
-				$this->terminateWithError($this->p->t('ui', 'noAdmin'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->ZeitsperreModel->getZeitsperrenUser($uid);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenZeitsperren()
-	{
-		$excludedTypes = array('ZVerfueg');
-		$result = $this->ZeitsperretypModel->getTypenZeitsperren($excludedTypes);
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenErreichbarkeit()
-	{
-		$result = $this->ErreichbarkeitModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getStunden()
-	{
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->StundeModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function loadZeitsperre($zeitsperre_id)
-	{
-		$this->ZeitsperreModel->addSelect(
-			'campus.tbl_zeitsperre.*, typ.*,
-			ma.person_id AS ma_person_id, ma.vorname AS ma_vorname, ma.nachname AS ma_nachname,
-			ma.titelpre AS ma_titelpre, ma.titelpost AS ma_titelpost'
-		);
-		$this->ZeitsperreModel->addJoin('campus.tbl_zeitsperretyp typ', 'ON (typ.zeitsperretyp_kurzbz = campus.tbl_zeitsperre.zeitsperretyp_kurzbz)');
-		$this->ZeitsperreModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = campus.tbl_zeitsperre.vertretung_uid)', 'LEFT');
-		$this->ZeitsperreModel->addJoin('public.tbl_person ma', 'ON (ma.person_id = ben.person_id)', 'LEFT');
-		$result = $this->ZeitsperreModel->loadWhere(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((current(getData($result)) ?: []));
-	}
-
-	public function add($mitarbeiter_uid)
-	{
-		$loggedInUser = getAuthUID();
-
-		if($mitarbeiter_uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$this->form_validation->set_rules('zeitsperretyp_kurzbz', 'Grund Zeitsperre', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Grund Zeitsperre'])
-		]);
-
-		$this->form_validation->set_rules('vondatum', 'VonDatum', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
-		]);
-
-		$this->form_validation->set_rules('bisdatum', 'BisDatum', 'required|is_valid_date|callback_check_von_bis_datum|callback_check_diff_intval', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'BisDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum']),
-			'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-			'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$bezeichnung = $this->input->post('bezeichnung');
-		$vondatum = $this->input->post('vondatum');
-		$vonstunde = $this->input->post('vonstunde');
-		$bisdatum = $this->input->post('bisdatum');
-		$bisstunde = $this->input->post('bisstunde');
-		//$vonIso = $this->input->post('vonISO'); //Timestamp für Stunde
-		//$bisIso = $this->input->post('bisISO'); //Timestamp für Stunde
-		$erreichbarkeit_kurzbz = $this->input->post('erreichbarkeit_kurzbz');
-		$vertretung_uid = $this->input->post('vertretung_uid');
-		$zeitsperretyp_kurzbz = $this->input->post('zeitsperretyp_kurzbz');
-
-		//check if existing zeitsperre
-		$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if(hasData($result))
-		{
-			$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if existing zeitaufzeichnung
-		if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-		{
-			$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-			if(hasData($result))
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->ZeitsperreModel->insert(
-			[
-				'mitarbeiter_uid' => $mitarbeiter_uid,
-				'bezeichnung' => $bezeichnung,
-				'vondatum' => $vondatum,
-				'vonstunde' => $vonstunde,
-				'bisdatum' => $bisdatum,
-				'bisstunde' => $bisstunde,
-				'erreichbarkeit_kurzbz' => $erreichbarkeit_kurzbz,
-				'zeitsperretyp_kurzbz' => $zeitsperretyp_kurzbz,
-				'vertretung_uid' => $vertretung_uid,
-				'insertvon' =>  $loggedInUser,
-				'insertamum' => date('c'),
-			]
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update($zeitsperre_id)
-	{
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		if(!$zeitsperre_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-		//get current params
-		$array_update = [
-			'bezeichnung',
-			'vondatum',
-			'vonstunde',
-			'bisdatum',
-			'bisstunde',
-			//	'vonISO', //Timestamp für Stunde
-			//	'bisISO', //Timestamp für Stunde
-			'erreichbarkeit_kurzbz',
-			'vertretung_uid',
-			'zeitsperretyp_kurzbz',
-			'mitarbeiter_uid',
-		];
-		$post = $this->input->post();
-		$update = [];
-
-		foreach ($array_update as $prop)
-		{
-			if (array_key_exists($prop, $post))
-			{
-				$update[$prop] = $post[$prop];
-			}
-		}
-
-		// Validation
-		$rulesDefined = false;  //necessary, otherwise CI validation will always be triggered, even without rules
-		foreach ($update as $key => $val) {
-			switch ($key) {
-				case 'zeitsperretyp_kurzbz':
-					$this->form_validation->set_rules(
-						$key,
-						'Grund Zeitsperre',
-						'required',
-						['required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'Grund Zeitsperre'])]
-					);
-					$rulesDefined = true;
-					break;
-				case 'vondatum':
-					$this->form_validation->set_rules(
-						$key,
-						'VonDatum',
-						'required|is_valid_date',
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'VonDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'VonDatum'])
-						]
-					);
-					$rulesDefined = true;
-					break;
-				case 'bisdatum':
-					$rules = 'required|is_valid_date';
-					if (array_key_exists('vondatum', $update)) {
-						$rules .= '|callback_check_von_bis_datum|callback_check_diff_intval';
-					}
-					$this->form_validation->set_rules(
-						$key,
-						'BisDatum',
-						$rules,
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'BisDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'BisDatum']),
-							'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-							'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-						]
-					);
-					$rulesDefined = true;
-					break;
-			}
-		}
-
-		if ($rulesDefined && $this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if(array_key_exists('vondatum', $post) || array_key_exists('bisdatum', $post))
-		{
-			$result = $this->ZeitsperreModel->load($zeitsperre_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$data = current($data);
-
-			$mitarbeiter_uid = array_key_exists('mitarbeiter_uid', $post) ? $update['mitarbeiter_uid'] : $data->mitarbeiter_uid;
-			$vondatum = array_key_exists('vondatum', $post) ? $update['vondatum'] : $data->vondatum;
-			$bisdatum = array_key_exists('bisdatum', $post) ? $update['bisdatum'] : $data->bisdatum;
-			$vonstunde = array_key_exists('vonstunde', $post) ? $update['vonstunde'] : $data->vonstunde;
-			$zeitsperretyp_kurzbz = array_key_exists('zeitsperretyp_kurzbz', $post) ? $update['zeitsperretyp_kurzbz'] : $data->zeitsperretyp_kurzbz;
-
-			$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if(hasData($result))
-			{
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-			}
-
-			//check if existing zeitaufzeichnung
-			if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-			{
-				$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-				if(hasData($result))
-					$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		if (!empty($update)) {
-			$update['updatevon'] = $loggedInUser;
-			$update['updateamum'] = date('c');
-			$result = $this->ZeitsperreModel->update($zeitsperre_id, $update);
-
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$this->terminateWithSuccess($data);
-		}
-		else
-			$this->terminateWithSuccess("no update");
-	}
-
-	public function delete($zeitsperre_id)
-	{
-
-		if (!is_numeric($zeitsperre_id) || (int)$zeitsperre_id <= 0)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->ZeitsperreModel->delete(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function check_von_bis_datum($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		return $vondatum <= $bisdatum;
-	}
-
-	public function check_diff_intval($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		// Intervall in days
-		$vonTs = strtotime($vondatum);
-		$bisTs = strtotime($bisdatum);
-
-		$tage = ($bisTs - $vonTs) / 86400;
-
-		// if intervall > 14
-		return $tage <= 14;
-	}
-
-
-}
@@ -60,11 +60,7 @@ class BetriebsmittelP extends FHCAPI_Controller

 	public function getAllBetriebsmittel($type_id, $id)
 	{
-		$betriebsmitteltypes = null;
-		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
-			$betriebsmitteltypes = $this->input->get('betriebsmitteltypes');
-
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id, $betriebsmitteltypes);
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);

 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -79,9 +75,8 @@ class BetriebsmittelP extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);

-		$this->form_validation->set_rules('kaution', 'Kaution', 'callback_valid_number|callback_not_less_than_equal', [
-			'valid_number' => $this->p->t('ui', 'error_fieldNoValidNumber'),
-			'not_less_than_equal' => $this->p->t('ui', 'error_fieldLessThan1000'),
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
 		]);

 		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
@@ -163,7 +158,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 		], [
 			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
 		]);
-
 		$this->validateNewOrUpdate();

 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -173,7 +167,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
-		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 		$uid = $this->input->post('uid');
@@ -257,9 +250,8 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
-		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');

 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
@@ -374,12 +366,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');

 		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
-
-		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
-		{
-			$this->BetriebsmitteltypModel->db->where_in('betriebsmitteltyp', $this->input->get('betriebsmitteltypes'));
-		}
-
 		$result = $this->BetriebsmitteltypModel->load(); // load All

 		if (isError($result)) {
@@ -396,26 +382,6 @@ class BetriebsmittelP extends FHCAPI_Controller

 		$this->terminateWithSuccess($data);
 	}
-
-	public function valid_number($number)
-	{
-		if(is_null($number)) return true;
-		$number = str_replace(',', '.', $number);
-		if (!is_numeric($number))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	public function not_less_than_equal($number)
-	{
-		$number = str_replace(',', '.', $number);
-		if ($number < 1000)
-			return true;
-		return false;
-
-	}
 }


@@ -1,276 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class RoomPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addRoomReservation' => self::PERM_LOGGED,
-			'deleteRoomReservation' => self::PERM_LOGGED,
-			'getRoomCreationInfo' => self::PERM_LOGGED,
-			'getGruppen' => self::PERM_LOGGED,
-			'getLektor' => self::PERM_LOGGED,
-			'getReservableMap' => self::PERM_LOGGED,
-			'getGroupOptions' => self::PERM_LOGGED,
-		]);
-
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API',
-			'dbExecuteUser' => 'RESTful API'
-		));
-
-		$this->load->library('form_validation');
-		$this->load->library('PermissionLib');
-		$this->load->library('StundenplanLib');
-
-		$this->loadPhrases(['ui']);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-
-	public function addRoomReservation()
-	{
-		$this->form_validation->set_rules('selectedStart', "Start", "required");
-		$this->form_validation->set_rules('selectedEnd', "End", "required");
-		$this->form_validation->set_rules('title', "Title", "required|max_length[10]");
-		$this->form_validation->set_rules('beschreibung', "Beschreibung", "required|max_length[32]");
-		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required|max_length[16]");
-		$this->form_validation->set_rules('studiengang', 'Studiengang', 'numeric');
-		$this->form_validation->set_rules('semester', 'Semester', 'integer|greater_than_equal_to[0]');
-		$this->form_validation->set_rules('verband', 'Verband', 'trim');
-		$this->form_validation->set_rules('gruppe', 'Gruppe', 'trim');
-		$this->form_validation->set_rules('spezialgruppe', 'Spezialgruppe', 'max_length[32]');
-		$this->form_validation->set_rules('lektoren', 'Lektoren');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$start = $this->input->post('selectedStart');
-		$end = $this->input->post('selectedEnd');
-		$title = $this->input->post('title');
-		$beschreibung = $this->input->post('beschreibung');
-		$ort_kurzbz = $this->input->post('ort_kurzbz');
-
-		$studiengang_kz = $this->input->post('studiengang');
-		$semester = $this->input->post('semester');
-		$verband = $this->input->post('verband');
-		$gruppe = $this->input->post('gruppe');
-		$spezialgruppe = $this->input->post('spezialgruppe');
-		$lektoren = $this->input->post('lektoren');
-
-
-		$result = $this->stundenplanlib->addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren, $studiengang_kz, $semester, $verband, $gruppe, $spezialgruppe);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function deleteRoomReservation()
-	{
-		$reservierung_id = $this->input->post('reservierung_id');
-
-		$result = $this->stundenplanlib->deleteReservation($reservierung_id);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getRoomCreationInfo()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-		if (!$this->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$this->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError($studiengaenge);
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-
-		$this->terminateWithSuccess($return_array);
-	}
-
-	public function getGruppen()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/gruppe_model', 'GruppeModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->GruppeModel->addOrder('gruppe_kurzbz');
-		$this->GruppeModel->db->group_start();
-		foreach ($query_words as $word) {
-			$this->GruppeModel->db->group_start();
-			$this->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('beschreibung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('orgform_kurzbz ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word)) {
-				$this->GruppeModel->db->or_where('studiengang_kz', $word);
-			}
-			$this->GruppeModel->db->group_end();
-		}
-		$this->GruppeModel->db->group_end();
-		$this->GruppeModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$gruppen = $this->GruppeModel->loadWhere(array('sichtbar' => true, 'lehre' => true));
-		if (isError($gruppen))
-			$this->terminateWithError($gruppen);
-
-		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : []);
-	}
-
-	public function getLektor()
-	{
-
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-		$this->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-		$this->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word) {
-			$this->MitarbeiterModel->db->group_start();
-			$this->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->group_end();
-		}
-		$this->MitarbeiterModel->db->group_end();
-
-		$this->MitarbeiterModel->addOrder('nachname');
-		$this->MitarbeiterModel->addOrder('vorname');
-		$mitarbeiter = $this->MitarbeiterModel->load();
-		if (isError($mitarbeiter))
-			$this->terminateWithError($mitarbeiter);
-
-		$this->terminateWithSuccess(hasData($mitarbeiter) ? getData($mitarbeiter) : []);
-	}
-
-	public function getReservableMap($ort_kurzbz = null)
-	{
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-
-		$result = $this->stundenplanlib->getReservableMap($ort_kurzbz, $start_date, $end_date);
-
-		$this->terminateWithSuccess(array('reservierbarMap' => hasData($result) ? getData($result) : []));
-	}
-
-	public function getGroupOptions()
-	{
-		$studiengangKz = $this->input->get('studiengangKz');
-
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->LehrverbandModel->addSelect('semester, verband, gruppe');
-		$this->LehrverbandModel->db->where('aktiv', true);
-		$this->LehrverbandModel->db->where('studiengang_kz', $studiengangKz);
-		$lehrverbandResult = $this->LehrverbandModel->load();
-
-		if (isError($lehrverbandResult))
-			$this->terminateWithError($lehrverbandResult);
-
-		$lehrverbanden = hasData($lehrverbandResult) ? getData($lehrverbandResult) : [];
-
-		$grouppedValues = [];
-		foreach ($lehrverbanden as $lehrverband) {
-			if (isset($grouppedValues[$lehrverband->semester]) && $lehrverband->verband !== ' ') {
-				$grouppedValues[$lehrverband->semester][] = $lehrverband;
-			} else if (!isset($grouppedValues[$lehrverband->semester]) && $lehrverband->verband !== ' ') {
-				$grouppedValues[$lehrverband->semester] = [$lehrverband];
-			} else if (!isset($grouppedValues[$lehrverband->semester])) {
-				$grouppedValues[$lehrverband->semester] = [];
-			}
-		}
-		$grouppedValues = array_map(
-			function ($semester) {
-				$verbandGruppen = [];
-				foreach ($semester as $lehrverband) {
-					if (isset($verbandGruppen[$lehrverband->verband]) && $lehrverband->gruppe !== ' ') {
-						$verbandGruppen[$lehrverband->verband][] = $lehrverband->gruppe;
-					} else if (!isset($verbandGruppen[$lehrverband->verband]) && $lehrverband->gruppe !== ' ') {
-						$verbandGruppen[$lehrverband->verband] = [$lehrverband->gruppe];
-					} else if (!isset($verbandGruppen[$lehrverband->verband])) {
-						$verbandGruppen[$lehrverband->verband] = [];
-					}
-				}
-				return $verbandGruppen;
-			},
-			$grouppedValues
-		);
-
-		$this->terminateWithSuccess($grouppedValues);
-	}
-
-}
@@ -1,142 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Board extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'create'				=> 'dashboard/admin:rw',
-			'update'				=> 'dashboard/admin:rw',
-			'delete'				=> 'dashboard/admin:rw'
-		]);
-
-		// Models
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-
-	public function list()
-	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
-		$result = $this->DashboardModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function create()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		
-		$result = $this->DashboardModel->insert([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-
-		$result = $this->DashboardModel->update([
-			'dashboard_id' => $dashboard_id
-		], [
-			'dashboard_kurzbz' => $dashboard_kurzbz,
-			'beschreibung' => $beschreibung
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-
-		$result = $this->DashboardPresetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$result = $this->DashboardWidgetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->DashboardModel->delete($dashboard_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}
@@ -1,199 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Preset extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'getBatch'				=> 'dashboard/admin:r',
-			'addWidget'				=> 'dashboard/admin:rw',
-			'removeWidget'			=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function list($dashboard_kurzbz)
-	{
-		$sql = "
-			WITH
-			dashboard_presets AS (
-				SELECT
-					*
-				FROM
-					dashboard.tbl_dashboard_preset dp
-				JOIN
-					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
-				WHERE
-					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general AS 	(
-				SELECT
-					'general' AS funktion_kurzbz,
-					'Allgemein' AS beschreibung
-			)
-
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					general f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz IS NULL
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-			)
-			UNION ALL
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					public.tbl_funktion f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-				ORDER BY
-					f.beschreibung ASC
-			)
-		";
-
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		$funktionen = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function getBatch()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$db = $this->input->post('db');
-		$funktionen = $this->input->post('funktionen') ?: [];
-
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->dashboardlib->getPreset($db, $funktion);
-			if ($conf) {
-				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
-			} else {
-				$result[$funktion] = [];
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widget = $this->input->post('widget');
-
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$preset_decoded[$widget['widgetid']] = $widget;
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('db');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgetid = $this->input->post('widgetid');
-
-		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if (!$preset)
-			show_404();
-
-		$preset_decoded = json_decode($preset->preset, true);
-
-		if (!isset($preset_decoded[$widgetid]))
-			show_404();
-		
-		unset($preset_decoded[$widgetid]);
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-}
@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class User extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> 'dashboard/benutzer:r',
-			'addWidget'						=> 'dashboard/benutzer:rw',
-			'removeWidget'					=> 'dashboard/benutzer:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function get($dashboard_kurzbz)
-	{
-		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
-		if (!$dashboard)
-			show_404();
-		
-		$uid = $this->authlib->getAuthObj()->username;
-
-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
-
-		$this->terminateWithSuccess($mergedconfig);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		if (isset($widget['source']))
-			unset($widget['source']);
-
-		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-
-		$override_decoded = json_decode($override->override, true);
-
-		$override_decoded[$widget['widgetid']] = $widget;
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget_id = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (!$override)
-			show_404();
-		
-		$override_decoded = json_decode($override->override, true);
-
-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess();
-	}
-}
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Widget extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'list'							=> 'dashboard/admin:r',
-			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setAllowed'					=> 'dashboard/admin:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-	}
-
-	public function get($id)
-	{
-		$result = $this->WidgetModel->load($id);
-
-		$widget = $this->getDataOrTerminateWithError($result);
-
-		if (!$widget)
-			return $this->terminateWithSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current($widget);
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		$this->terminateWithSuccess($widget);
-	}
-
-	public function list($dashboard)
-	{
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function listAllowed($dashboard)
-	{
-		$result = $this->WidgetModel->getForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			$widget->permitted = empty($widget->berechtigung_kurzbz) 
-				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
-
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function setAllowed()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$data = [
-			'dashboard_id' => $this->input->post('dashboard_id'),
-			'widget_id' => $this->input->post('widget_id')
-		];
-
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		
-		if ($this->input->post('allowed'))
-			$result = $this->DashboardWidgetModel->insert($data);
-		else
-			$result = $this->DashboardWidgetModel->delete($data);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}
@@ -1,65 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Detailheader extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getSemesterStati' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function getHeader($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getHeader($person_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getPersonAbteilung($mitarbeiter_uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getLeitungOrg($oekurzbz)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getSemesterStati($prestudent_id)
-	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-}
-
-
@@ -1,218 +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');
-
-use CI3_Events as Events;
-
-class PaabgabeUebersicht extends FHCAPI_Controller
-{
-	const DOWNLOAD_PERMISSION = 'lehre/abgabetool:download';
-	const ABGABE_TYPES = ['Bachelor', 'Diplom'];
-
-	/**
-	 * PaabgabeUebersicht API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'viewData' => self::PERM_LOGGED,
-			'getPaAbgaben' => array('lehre/abgabetool:r'),
-			'getStudiengaenge' => array('lehre/abgabetool:r'),
-			'getTermine' => array('lehre/abgabetool:r'),
-			'getPaAbgabetypen' => array('lehre/abgabetool:r'),
-			'downloadZip' => array('lehre/abgabetool:r'),
-			//'downloadProjektarbeit' => array('lehre/abgabetool:r')
-		]);
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$this->load->library('PermissionLib');
-
-		// Load Phrases
-		$this->loadPhrases([
-			'abgabetool'
-		]);
-	}
-
-	public function viewData()
-	{
-		$viewData = [
-			"uid" => getAuthUID(),
-			// TODO create permission
-			"showEdit" => true,
-		];
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-	/**
-	 * Get Projektabgaben for search criteria.
-	 */
-	public function getPaAbgaben()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		// check wether Abgabe is in visual library
-		if (hasData($result))
-		{
-			Events::trigger('in_visual_library', getData($result));
-		}
-
-		$this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	/**
-	 * Get all Studiengänge for which user is entitled for
-	 */
-	public function getStudiengaenge()
-	{
-		$studiengang_kz_arr = $this->permissionlib->getSTG_isEntitledFor(self::DOWNLOAD_PERMISSION);
-
-		if (!$studiengang_kz_arr) $this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addSelect('tbl_studiengang.*, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) AS kuerzel', $studiengang_kz_arr);
-		$this->StudiengangModel->db->where_in('studiengang_kz', $studiengang_kz_arr);
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$result = $this->StudiengangModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get projekt work due dates, depending on search criteria.
-	 */
-	public function getTermine()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-
-		$result = $this->PaabgabeModel->getTermine(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get all submission types.
-	 */
-	public function getPaAbgabetypen()
-	{
-		// Load model PaabgabetypModel
-		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
-
-		$this->PaabgabetypModel->addOrder('bezeichnung');
-		$result = $this->PaabgabetypModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Download zip files with project works matching submission search criteria.
-	 */
-	public function downloadZip()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		if (!isset($studiengang_kz) && !isset($abgabetyp_kurzbz) && !isset($abgabedatum) && !isset($personSearchString))
-			$this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'nichtsAusgewaehlt'));
-
-		$this->load->library('zip');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithFileOutput('text/plain', getError($result));
-
-		$fileExists = false;
-		$studiengang_kuerzel = null;
-
-		if (!hasData($result)) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$abgaben = getData($result);
-
-		foreach ($abgaben as $abgabe)
-		{
-			$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$abgabe->uid.'.pdf';
-			if (file_exists($path))
-			{
-				$fileExists = true;
-				$studiengang_kuerzel = $abgabe->studiengang_kuerzel;
-				$this->zip->read_file($path);
-			}
-		}
-
-		if (!$fileExists) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$zipFileName = 'Abgabe'.(isset($studiengang_kz) && isset($studiengang_kuerzel) ? '_'.$studiengang_kuerzel : '').'.zip';
-		$this->zip->download($zipFileName);
-	}
-
-	/**
-	 * Download Projektarbeit document.
-	 */
-	//~ public function downloadProjektarbeit()
-	//~ {
-		//~ $paabgabe_id = $this->input->get('paabgabe_id');
-
-		//~ if (!is_numeric($paabgabe_id))
-			//~ $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Abgabe ID']), self::ERROR_TYPE_GENERAL);
-
-		//~ //$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
-		//~ $this->PaabgabeModel->addSelect("paabgabe_id, student_uid, tbl_paabgabe.datum, tbl_paabgabe.abgabedatum, projekttyp_kurzbz, titel, titel_english,
-					//~ paabgabe_id || '_' || student_uid || '.pdf' AS filename");
-		//~ $this->PaabgabeModel->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
-		//~ $abgabeRes = $this->PaabgabeModel->load($paabgabe_id);
-
-		//~ if (isError($abgabeRes))
-			//~ show_error(getError($abgabeRes));
-
-		//~ if (hasData($abgabeRes))
-		//~ {
-			//~ $endabgabe = getData($abgabeRes)[0];
-			//~ $filepath = PAABGABE_PATH.$endabgabe->filename;
-
-			//~ if (file_exists($filepath))
-			//~ {
-				//~ $this->output
-					//~ ->set_status_header(200)
-					//~ ->set_content_type('application/pdf', 'utf-8')
-					//~ ->set_header('Content-Disposition: attachment; filename="'.$endabgabe->filename.'"')
-					//~ ->set_output(file_get_contents($filepath))
-					//~ ->_display();
-			//~ }
-			//~ else
-			//~ {
-				//~ show_error("File does not exist.");
-			//~ }
-		//~ }
-	//~ }
-}
@@ -1,237 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Foto extends  FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'uploadFoto' => ['admin:r', 'assistenz:r'],
-			'deleteFoto' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models and Libraries
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model("crm/Akte_model", "AkteModel");
-		$this->load->model('person/Fotostatusperson_model', 'FotostatusPersonModel');
-
-		$this->loadPhrases([
-			'ui',
-			'header'
-		]);
-	}
-
-	public function uploadFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$data = json_decode(file_get_contents("php://input"), true);
-
-		if (!empty($data['image']))
-		{
-			$base64 = $data['image'];
-			$resizedImage1 = $this->_resize($base64, 827, 1063);
-
-			if (is_null($resizedImage1))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => 'Lichtbil'));
-
-			$akteUpdateData = array(
-				'dokument_kurzbz' => 'Lichtbil',
-				'person_id' => $person_id,
-				'inhalt' => $resizedImage1,
-				'mimetype' => 'image/jpg',
-				'erstelltam' => date('c'),
-				'gedruckt' => false,
-				'titel' => 'Lichtbild_' . $person_id . '.jpg',
-				'bezeichnung' => 'Lichtbild gross',
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-			);
-
-			if (hasData($akte)) {
-				$akte_id = getData($akte)[0]->akte_id;
-
-				$akteUpdateData['updateamum'] = date('c');
-				$akteUpdateData['updatevon'] = getAuthUID();
-				$akteResult = $this->AkteModel->update(array('akte_id' => $akte_id), $akteUpdateData);
-			} else {
-				$akteResult = $this->AkteModel->insert($akteUpdateData);
-			}
-
-			if (isError($akteResult)) {
-				return $this->terminateWithError(getError($akteResult), self::ERROR_TYPE_GENERAL);
-			}
-
-			$resizedImage2 = $this->_resize($base64, 101, 130);
-
-			if (is_null($resizedImage2))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$result = $this->_updateFoto($person_id, $resizedImage2);
-
-			if (!isError($result)) {
-				$this->FotostatusPersonModel->insert(array(
-					'person_id' => $person_id,
-					'fotostatus_kurzbz' => 'hochgeladen',
-					'datum' => date('Y-m-d'),
-					'updateamum' => date('c'),
-					'updatevon' => getAuthUID(),
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				));
-
-				return $this->terminateWithSuccess($base64);
-			}
-		}
-		else
-		{
-			$this->terminateWithError($this->p->t('header', 'error_noPhoto'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function deleteFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->_deleteFoto($person_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
-	private function _resize($imageData, $maxwidth, $maxheight, $quality = 90)
-	{
-		$meta = getimagesize($imageData);
-		if (!$meta)
-		{
-			return null;
-		}
-
-		$src_width = $meta[0];
-		$src_height = $meta[1];
-		$mime = $meta['mime'];
-
-		switch ($mime) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				$imagecreated = imagecreatefromjpeg($imageData);
-				break;
-			case 'image/png':
-				$imagecreated = imagecreatefrompng($imageData);
-				break;
-			case 'image/gif':
-				$imagecreated = imagecreatefromgif($imageData);
-				break;
-			default:
-				return null;
-		}
-
-
-		if (!$imagecreated)
-		{
-			return null;
-		}
-
-		$src_aspect_ratio = $src_width / $src_height;
-		$thu_aspect_ratio = $maxwidth / $maxheight;
-
-		if ($src_width <= $maxwidth && $src_height <= $maxheight)
-		{
-			$thu_width = $src_width;
-			$thu_height = $src_height;
-		}
-		elseif ($thu_aspect_ratio > $src_aspect_ratio)
-		{
-			$thu_width = (int) ($maxheight * $src_aspect_ratio);
-			$thu_height = $maxheight;
-		}
-		else
-		{
-			$thu_width = $maxwidth;
-			$thu_height = (int) ($maxwidth / $src_aspect_ratio);
-		}
-
-		$imageScaled = imagecreatetruecolor($thu_width, $thu_height);
-
-		if ($mime === 'image/png')
-		{
-			$background = imagecolorallocate($imageScaled , 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-			imagealphablending($imageScaled, false);
-			imagesavealpha($imageScaled, true);
-		}
-
-		imagecopyresampled($imageScaled, $imagecreated, 0, 0, 0, 0, $thu_width, $thu_height, $src_width, $src_height);
-
-		if ($mime === "image/gif")
-		{
-			$background = imagecolorallocate($imageScaled, 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-		}
-
-		if (!empty($imageScaled))
-		{
-			ob_start();
-
-			if ($mime == 'image/png')
-				imagepng($imageScaled, NULL);
-			else if ($mime === 'image/gif')
-				imagegif($imageScaled, NULL);
-			else
-				imagejpeg($imageScaled, NULL, $quality);
-
-			$resizedImageData = ob_get_contents();
-			ob_end_clean();
-			@imagedestroy($imagecreated);
-			@imagedestroy($imageScaled);
-
-
-			if (!empty($resizedImageData))
-			{
-				return base64_encode($resizedImageData);
-			}
-			return null;
-		}
-		return null;
-	}
-
-	private function _updateFoto($person_id, $foto)
-	{
-		$personJson['foto'] = $foto;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-
-	private function _deleteFoto($person_id)
-	{
-		$personJson['foto'] = null;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-}
@@ -1,332 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Funktionen extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		//TODO(Manu) check permissions
-		parent::__construct(array(
-				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getOrgHeads' =>  self::PERM_LOGGED,
-				'getOrgetsForCompany' => self::PERM_LOGGED,
-				'getAllOrgUnits' => self::PERM_LOGGED,
-				'loadFunction' => ['admin:r', 'assistenz:r'],
-				'insertFunction' => ['admin:rw', 'assistenz:rw'],
-				'updateFunction' => ['admin:rw', 'assistenz:rw'],
-				'deleteFunction' => ['admin:rw', 'assistenz:rw'],
-			)
-		);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		// Load models
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model', 'ApiModel');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-	}
-
-	public function getAllFunctions()
-	{
-		$this->FunktionModel->addSelect("funktion_kurzbz");
-		$this->FunktionModel->addSelect("beschreibung");
-		$this->FunktionModel->addSelect("aktiv");
-		$this->FunktionModel->addSelect("beschreibung AS label");
-		$this->FunktionModel->addOrder("beschreibung");
-		$result = $this->FunktionModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getOrgHeads()
-	{
-		$result = $this->OrganisationseinheitModel->getHeads();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAllUserFunctions($uid)
-	{
-		if(!$uid)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$sql = "
-			SELECT
-				dv.dienstverhaeltnis_id,
-				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' 
-				 || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
-				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
-				f.beschreibung AS funktion_beschreibung,
-				bf.*,
-				fb.bezeichnung AS fachbereich_bezeichnung,
-			    CASE
-					WHEN
-						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
-					THEN
-						false
-					ELSE
-						true
-				END aktiv
-			FROM
-				public.tbl_benutzerfunktion bf
-			JOIN
-				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
-			JOIN
-				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-            JOIN
-				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
-			LEFT JOIN
-				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-			LEFT JOIN
-				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
-			LEFT JOIN
-				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
-            WHERE
-				bf.uid = ?
-            ORDER BY
-				bf.datum_von, bf.datum_von ASC";
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
-		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/*
-	 * returns list of all organisation units
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getAllOrgUnits()
-	{
-		$sql = "
-			SELECT
-				oe.oe_kurzbz, oe.aktiv,
-				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-			FROM public.tbl_organisationseinheit oe
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
-
-		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/*
-	 * return list of child orgets for a given company orget_kurzbz
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getOrgetsForCompany($companyOrgetkurzbz = null)
-	{
-		$sql = "
-			SELECT
-				oe.oe_kurzbz, oe.aktiv,
-				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-			FROM (
-					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-					(
-						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz=?
-						UNION ALL
-						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-					)
-					SELECT oe_kurzbz
-					FROM oes
-					GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
-
-		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
-		$data = $this->getDataOrTerminateWithError($childorgets);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function loadFunction($benutzerfunktion_id)
-	{
-		$this->BenutzerfunktionModel->addSelect("*");
-		$result = $this->BenutzerfunktionModel->loadWhere(
-			array('benutzerfunktion_id' => $benutzerfunktion_id)
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function insertFunction()
-	{
-		$this->load->library('form_validation');
-		$authUID = getAuthUID();
-
-		$uid = $this->input->post('uid');
-
-		if(!$uid)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$formData = $this->input->post('formData');
-
-		$datum_von = $formData['datum_von'] ?? null;
-		$datum_bis = $formData['datum_bis'] ?? null;
-		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
-		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
-			? $formData['funktion_kurzbz']['funktion_kurzbz']
-			: $formData['funktion_kurzbz'];
-		$bezeichnung = $formData['bezeichnung'] ?? null;
-		$wochenstunden = $formData['wochenstunden'] ?? null;
-
-		$this->form_validation->set_data($formData);
-		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
-		]);
-		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
-		]);
-		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
-		]);
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
-		]);
-		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$result = $this->BenutzerfunktionModel->insert([
-			'uid' => $uid,
-			'datum_von' => $datum_von,
-			'datum_bis' => $datum_bis ,
-			'oe_kurzbz' => 	$formData['oe_kurzbz'],
-			'funktion_kurzbz' => $formData['funktion_kurzbz'],
-			'bezeichnung' => $bezeichnung,
-			'wochenstunden' => $wochenstunden,
-			'insertamum' => date('c'),
-			'insertvon' => $authUID,
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
-	}
-
-	public function updateFunction()
-	{
-		$this->load->library('form_validation');
-		$authUID = getAuthUID();
-
-		$uid = $this->input->post('uid');
-
-		if(!$uid)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
-		}
-		$benutzerfunktion_id = $this->input->post('benutzerfunktion_id');
-
-		if(!$benutzerfunktion_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Benutzerfunktion ID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$formData = $this->input->post('formData');
-
-		$datum_von = $formData['datum_von'] ?? null;
-		$datum_bis = $formData['datum_bis'] ?? null;
-		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
-		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
-			? $formData['funktion_kurzbz']['funktion_kurzbz']
-			: $formData['funktion_kurzbz'];
-		$bezeichnung = $formData['bezeichnung'] ?? null;
-		$wochenstunden = $formData['wochenstunden'] ?? null;
-
-		$this->form_validation->set_data($formData);
-		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
-		]);
-		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
-		]);
-		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
-		]);
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
-		]);
-		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
-
-		$result = $this->BenutzerfunktionModel->update(
-			[
-				'benutzerfunktion_id' => $benutzerfunktion_id,
-			],
-			[
-				'uid' => $uid,
-				'datum_von' => $datum_von,
-				'datum_bis' => $datum_bis ,
-				'oe_kurzbz' => 	$formData['oe_kurzbz'],
-				'funktion_kurzbz' => $formData['funktion_kurzbz'],
-				'bezeichnung' => $bezeichnung,
-				'wochenstunden' => $wochenstunden,
-				'updateamum' => date('c'),
-				'updatevon' => $authUID,
-			]
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
-	}
-
-	public function deleteFunction($benutzerfunktion_id)
-	{
-		$result = $this->BenutzerfunktionModel->delete(
-			array('benutzerfunktion_id' => $benutzerfunktion_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
-	}
-}
@@ -1,81 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Betreuungen extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getBetreuungen' => self::PERM_LOGGED,
-		]);
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getBetreuungen()
-	{
-		$semester = $this->input->get("semester");
-		if (!$semester) $this->terminateWithError("Missing parameters!");
-
-		$personId = getAuthPersonId();
-
-		$betreuungenQuery = "SELECT
-			tbl_lehrveranstaltung.bezeichnung,
-			tbl_projektarbeit.titel,
-			(SELECT nachname || ' ' || (CASE WHEN wahlname IS NOT NULL THEN wahlname ELSE vorname END)
-				FROM public.tbl_benutzer
-				JOIN public.tbl_person USING(person_id)
-				WHERE uid=student_uid)
-				as name,
-			(SELECT uid
-				FROM public.tbl_benutzer
-				WHERE uid=student_uid)
-				as uid,
-			tbl_lehrveranstaltung.studiengang_kz,
-			tbl_lehrveranstaltung.semester,
-			tbl_studiengang.kurzbzlang as studiengang,
-			tbl_studiengang.email,
-			tbl_betreuerart.beschreibung AS beutreuerart_beschreibung,
-			tbl_projektbetreuer.stunden
-			FROM
-				lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
-			WHERE
-				tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_projektarbeit.lehrveranstaltung_id AND
-				tbl_projektarbeit.studiensemester_kurzbz = '$semester' AND
-				tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id AND
-				tbl_lehrveranstaltung.studiengang_kz = tbl_studiengang.studiengang_kz AND
-				tbl_projektbetreuer.betreuerart_kurzbz = tbl_betreuerart.betreuerart_kurzbz AND
-				tbl_projektbetreuer.person_id = '$personId'";
-		$this->addMeta("query", $betreuungenQuery);
-
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$result = $this->LehrveranstaltungModel->execReadOnlyQuery($betreuungenQuery);
-		$result = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-}
@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_setAuthUID();
-
-		$this->loadPhrases([
-			'lehre'
-		]);
-
-		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->library('PermissionLib');
-
-	}
-
-
-	public function get()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
-		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
-		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
-
-		$config['ignore_kollision'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_kollision',
-			"value" => $ignore_kollision,
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_zeitsperre',
-			"value" => $ignore_zeitsperre,
-		];
-
-		$config['ignore_reservierung'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_reservierung',
-			"value" => $ignore_reservierung,
-		];
-
-		$this->terminateWithSuccess($config);
-	}
-	public function set()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		foreach (['ignore_kollision','ignore_zeitsperre','ignore_reservierung'] as $variable)
-		{
-			if ($this->_ci->input->post($variable) !== null)
-			{
-				$this->VariableModel->update(array('uid' => $this->_uid, 'name' => $variable), array('wert' => $this->input->post($variable)));
-
-			}
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid)
-			show_error('User authentification failed');
-	}
-}
@@ -1,110 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class DirektGruppe extends FHCAPI_Controller
-{
-	private $_ci;
-	public function __construct()
-	{
-		parent::__construct([
-			'add' => ['admin:rw', 'assistenz:rw'],
-			'delete' => ['admin:rw', 'assistenz:rw'],
-			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->_ci = &get_instance();
-
-		$this->loadPhrases([
-			'ui'
-		]);
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	public function add()
-	{
-		$uid = $this->input->post('uid');
-		$lehreinheit_id = $this->input->post('lehreinheit_id');
-
-		$this->checkPermission($lehreinheit_id, $uid);
-
-		$result = $this->_ci->LehreinheitgruppeModel->direktUserAdd($uid, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function delete()
-	{
-		$uid = $this->input->post('uid');
-		$lehreinheit_id = $this->input->post('lehreinheit_id');
-
-		$this->checkPermission($lehreinheit_id, $uid);
-
-		$result = $this->_ci->LehreinheitgruppeModel->direktUserDelete($uid, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getByLehreinheit($lehreinheit_id = null)
-	{
-		$this->checkPermission($lehreinheit_id);
-		$gruppen = $this->_ci->LehreinheitgruppeModel->getDirectGroup($lehreinheit_id);
-		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : array());
-	}
-
-	private function checkPermission($lehreinheit_id, $uid = false)
-	{
-		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
-
-		if (!hasData($lehreinheit_result) || isError($lehreinheit_result))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($uid)
-		{
-			$benuzuer_result = $this->_ci->BenutzerModel->load(array($uid));
-			if (!hasData($benuzuer_result) || isError($benuzuer_result))
-				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->_ci->LehreinheitModel->getOes($lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		$oe_array = [];
-		if (hasData($result))
-			$oe_array = getData($result);
-
-		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
-			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid'))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Johann Hoffmann	1feb4ff4fd	code cleanup	2025-07-15 09:43:38 +02:00
Johann Hoffmann	34865bc0c0	code cleanup	2025-07-14 17:04:56 +02:00
Johann Hoffmann	8cd0f4c8bd	parameterized server/user/pw for both browser url calls & cli calls;	2025-07-14 16:47:41 +02:00
Johann Hoffmann	ffaf360ea0	proof of concept Blackbox TestSuite using httpful to call Bookmark API Controller and test for expected responses; cleanup old phpunit testing attempt relics; WIP enhancing the script/helper functions further;	2025-07-14 15:44:27 +02:00
Paolo	f888dcc72d	Removed directory tests and all its content	2025-06-10 11:56:11 +02:00
Szabo MónikaandJohann Hoffmann	664796c69f	using phpunit to test controllers which are running in codeigniter3 requires further request/response mocking; setup of swagger-ui and swagger openapi doc generation for bookmark.php; WIP integration tests with ci3 & phpunit, maybe annotation generation solution for swagger annotations	2025-05-05 18:37:00 +02:00
Johann Hoffmann	37fa899540	phpunit test cases runnable; WIP teaching phpunit what a codeigniter3 is	2025-04-30 17:32:23 +02:00