issue AbschlusspruefungOderAbsolventFehlt: added Studiensemester and moved distinct for correct resolving, added status fehler to fehler.php and IssueResolver

Merge branch 'feature-68834/Fehlermonitoring_Issues_weitere_features' into feature-39602/Fas_Statusbearbeitung_bei_Sperre
Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features
2026-07-26 09:04:28 +00:00 · 2026-05-27 23:23:56 +02:00 · 2026-05-26 15:38:53 +02:00 · 2026-05-26 13:30:13 +02:00 · 2026-05-25 16:40:51 +02:00 · 2026-05-02 00:24:23 +02:00
299 changed files with 11996 additions and 15700 deletions
@@ -29,7 +29,7 @@ $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['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/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';
@@ -38,19 +38,8 @@ $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;
-
-
@@ -0,0 +1,514 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['fehler'] = array(
+	array(
+		'fehlercode' => 'CORE_ZGV_0001',
+		'fehler_kurzbz' => 'zgvDatumInZukunft',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'ZGV Datum in Zukunft',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => array('core'),
+		'producerLibName' => 'ZgvDatumInZukunft',
+		'resolverLibName' => 'CORE_ZGV_0001',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_ZGV_0002',
+		'fehler_kurzbz' => 'zgvDatumVorGeburtsdatum',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'ZGV Datum vor Geburtsdatum',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'ZgvDatumVorGeburtsdatum',
+		'resolverLibName' => 'CORE_ZGV_0002',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_ZGV_0003',
+		'fehler_kurzbz' => 'zgvMasterDatumInZukunft',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'ZGV Masterdatum in Zukunft',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'ZgvMasterDatumInZukunft',
+		'resolverLibName' => 'CORE_ZGV_0003',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_ZGV_0004',
+		'fehler_kurzbz' => 'zgvMasterDatumVorZgvdatum',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'ZGV Masterdatum vor Zgvdatum',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'ZgvMasterDatumVorZgvdatum',
+		'resolverLibName' => 'CORE_ZGV_0004',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_ZGV_0005',
+		'fehler_kurzbz' => 'zgvMasterDatumVorGeburtsdatum',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'ZGV Masterdatum vor Geburtsdatum',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'ZgvMasterDatumVorGeburtsdatum',
+		'resolverLibName' => 'CORE_ZGV_0005',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0001',
+		'fehler_kurzbz' => 'keinAufenthaltszweckPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Kein Aufenthaltszweck gefunden',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'KeinAufenthaltszweckPlausi',
+		'resolverLibName' => 'CORE_INOUT_0001',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0002',
+		'fehler_kurzbz' => 'zuVieleZweckeIncomingPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Es sind %s Aufenthaltszwecke eingetragen (max. 1 Zweck für Incomings)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'ZuVieleZweckeIncomingPlausi',
+		'resolverLibName' => 'CORE_INOUT_0002',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0003',
+		'fehler_kurzbz' => 'falscherIncomingZweckPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Aufenthaltszweckcode ist %s (für Incomings ist nur Zweck 1, 2, 3 erlaubt)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'FalscherIncomingZweckPlausi',
+		'resolverLibName' => 'CORE_INOUT_0003',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0004',
+		'fehler_kurzbz' => 'outgoingAufenthaltfoerderungfehltPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Keine Aufenthaltsfoerderung angegeben (bei Outgoings >= 29 Tage Monat im Ausland muss mind. 1 gemeldet werden)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'OutgoingAufenthaltfoerderungfehltPlausi',
+		'resolverLibName' => 'CORE_INOUT_0004',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0005',
+		'fehler_kurzbz' => 'outgoingAngerechneteEctsFehlenPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Angerechnete ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'OutgoingAngerechneteEctsFehlenPlausi',
+		'resolverLibName' => 'CORE_INOUT_0005',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0006',
+		'fehler_kurzbz' => 'outgoingErworbeneEctsFehlenPlausi',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Erworbene ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'OutgoingErworbeneEctsFehlenPlausi',
+		'resolverLibName' => 'CORE_INOUT_0006',
+		'producerIsResolver' => false
+	),
+
+	/** Plausichecks **/
+	array(
+		'fehlercode' => 'CORE_INOUT_0007',
+		'fehler_kurzbz' => 'IncomingHeimatNationOesterreich',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Heimatnation bei Incoming Österreich',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'IncomingHeimatNationOesterreich',
+		'resolverLibName' => 'CORE_INOUT_0007',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0008',
+		'fehler_kurzbz' => 'IncomingOhneIoDatensatz',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Incoming hat keinen IO Datensatz (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'IncomingOhneIoDatensatz',
+		'resolverLibName' => 'CORE_INOUT_0008',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_INOUT_0009',
+		'fehler_kurzbz' => 'IncomingOrGsFoerderrelevant',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Incoming oder gemeinsames Studium ist nicht als nicht förderrelevant markiert. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'IncomingOrGsFoerderrelevant',
+		'resolverLibName' => 'CORE_INOUT_0009',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STG_0001',
+		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudent',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Studiengang des Prestudenten ist ungleich dem Studiengang des Studenten. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'StgPrestudentUngleichStgStudent',
+		'resolverLibName' => 'CORE_STG_0001',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STG_0002',
+		'fehler_kurzbz' => 'OrgformStgUngleichOrgformPrestudent',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Es ist kein Studienplan mit Studiengang (%s) und Organisationsform (%s) des Studenten zugewiesen. (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'OrgformStgUngleichOrgformPrestudent',
+		'resolverLibName' => 'CORE_STG_0002',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STG_0003',
+		'fehler_kurzbz' => 'PrestudentMischformOhneOrgform',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Organisationsform ist für Studierenden/BewerberIn in Mischformstudiengang nicht eingetragen. (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'PrestudentMischformOhneOrgform',
+		'resolverLibName' => 'CORE_STG_0003',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STG_0004',
+		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudienplan',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Studiengang des Prestudenten passt nicht zu Studiengang des Studienplans. (prestudent_id %s, Studienplan %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'StgPrestudentUngleichStgStudienplan',
+		'resolverLibName' => 'CORE_STG_0004',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0001',
+		'fehler_kurzbz' => 'AbbrecherAktiv',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'AbbrecherIn hat aktiven Benutzer. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'AbbrecherAktiv',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0002',
+		'fehler_kurzbz' => 'StudentstatusNachAbbrecher',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Aktiver Status nach Abbrecher Status. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'StudentstatusNachAbbrecher',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0002',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0003',
+		'fehler_kurzbz' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Ausbildungssemester %s des aktuellen Status stimmt nicht mit Ausbildungssemester %s bei StudentIn (Lehrverband) überein. (student_uid %s, prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'warning',
+		'app' => 'core',
+		'producerLibName' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0003',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0004',
+		'fehler_kurzbz' => 'InaktiverStudentAktiverStatus',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Inaktiver Benutzer hat aktiven Status. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'warning',
+		'app' => 'core',
+		'producerLibName' => 'InaktiverStudentAktiverStatus',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0004',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0005',
+		'fehler_kurzbz' => 'InskriptionVorLetzerBismeldung',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Datum der Inskription liegt vor dem Datum der letzten BIS-Meldung %s. (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'InskriptionVorLetzerBismeldung',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0005',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0006',
+		'fehler_kurzbz' => 'DatumStudiensemesterFalscheReihenfolge',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Datum und Studiensemester sind bei den Status in falscher Reihenfolge. (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'DatumStudiensemesterFalscheReihenfolge',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0006',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0007',
+		'fehler_kurzbz' => 'AktiverStudentOhneStatus',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Aktive/r StudentIn ohne aktuellen Status (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'AktiverStudentOhneStatus',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0007',
+		'producerIsResolver' => false
+	),
+	//~ array(
+		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0008',
+		//~ 'fehler_kurzbz' => 'StudienplanUngueltig',
+		//~ 'fehlercode_extern' => null,
+		//~ 'fehlertext' => 'Studienplan %s ist im Ausbildungssemester %s nicht gültig (prestudent_id %s)',
+		//~ 'fehlertyp_kurzbz' => 'error',
+		//~ 'app' => 'core',
+		//~ 'producerLibName' => 'StudienplanUngueltig',
+		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0008',
+		//~ 'producerIsResolver' => false
+	//~ ),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0009',
+		'fehler_kurzbz' => 'FalscheAnzahlAbschlusspruefungen',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Mehrere oder keine bestandenen Abschlussprüfungen (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'FalscheAnzahlAbschlusspruefungen',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0009',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0010',
+		'fehler_kurzbz' => 'DatumAbschlusspruefungFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Kein Abschlussprüfung Datum (prestudent_id %s, abschlusspruefung_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'DatumAbschlusspruefungFehlt',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0010',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0011',
+		'fehler_kurzbz' => 'DatumSponsionFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Kein Sponsionsdatum (prestudent_id %s, abschlusspruefung_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'DatumSponsionFehlt',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0011',
+		'producerIsResolver' => false
+	),
+	//~ array(
+		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0012',
+		//~ 'fehler_kurzbz' => 'BewerberNichtZumRtAngetreten',
+		//~ 'fehlercode_extern' => null,
+		//~ 'fehlertext' => 'Bewerber nicht zum Reihungstest angetreten (prestudent_id %s)',
+		//~ 'fehlertyp_kurzbz' => 'warning',
+		//~ 'app' => 'core',
+		//~ 'producerLibName' => 'BewerberNichtZumRtAngetreten',
+		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0012',
+		//~ 'producerIsResolver' => false
+	//~ ),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0013',
+		'fehler_kurzbz' => 'AktSemesterNull',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Aktuelles Ausbildungssemester ist 0 (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'AktSemesterNull',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0013',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0014',
+		'fehler_kurzbz' => 'AbschlussstatusFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Kein Abschlussstatus (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'warning',
+		'app' => 'core',
+		'producerLibName' => 'AbschlussstatusFehlt',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0014',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0015',
+		'fehler_kurzbz' => 'AktiverStudentstatusOhneKontobuchung',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Keine Kontobuchung bei aktivem Studentstatus (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'AktiverStudentstatusOhneKontobuchung',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0015',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0016',
+		'fehler_kurzbz' => 'DualesStudiumOhneMarkierung',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'StudentIn in dualem Studiengang nicht als dual markiert (prestudent_id %s, Studienplan %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'DualesStudiumOhneMarkierung',
+		'resolverLibName' => 'CORE_STUDENTSTATUS_0016',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0017',
+		'fehler_kurzbz' => 'BeginndatumVorBismeldung',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Statusdatum vor Bismeldedatum eingetragen, nachdem das Bismeldedatum erreicht wurde  (prestudent_id %s, Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'BeginndatumVorBismeldung',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0018',
+		'fehler_kurzbz' => 'StudentstatusNachDiplomand',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Studentstatus nach Diplomandenstatus (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'StudentstatusNachDiplomand',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0019',
+		'fehler_kurzbz' => 'OrgformBewerberUngleichOrgformStudent',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Orgform des Bewerbers (Studienplan) stimmt nicht mit Orgform des ersten Studenten überein (prestudent_id %s, Student Studiensemester %s, Bewerber Studiensemester %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'OrgformBewerberUngleichOrgformStudent',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0020',
+		'fehler_kurzbz' => 'StartsemesterUngleichPersonenkennzeichen',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Semester des ersten Studentstatus stimmt nicht mit Personenkennzeichen überein (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'StartsemesterUngleichPersonenkennzeichen',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0021',
+		'fehler_kurzbz' => 'AbschlusspruefungOderAbsolventFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Keine Abschlussprüfung vor der Bismeldung oder kein Absolventenstatus vor der Bismeldung (prestudent_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'AbschlusspruefungOderAbsolventFehlt',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0022',
+		'fehler_kurzbz' => 'FalscheStatusabfolgeVorStudentstatus',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Falsche Statusabfolge vor Studentstatus (prestudent_id %s, Studiensemester%s, richtige Abfolge: %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'FalscheStatusabfolgeVorStudentstatus',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0001',
+		'fehler_kurzbz' => 'GbDatumWeitZurueck',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Geburtsdatum vor dem 01.01.1920',
+		'fehlertyp_kurzbz' => 'warning',
+		'app' => 'core',
+		'producerLibName' => 'GbDatumWeitZurueck',
+		'resolverLibName' => 'CORE_PERSON_0001',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0002',
+		'fehler_kurzbz' => 'NationNichtOesterreichAberGemeinde',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Nation der Adresse ist ungleich Österreich, es ist aber eine österreichische Gemeinde (%s) angegeben (adresse_id %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'NationNichtOesterreichAberGemeinde',
+		'resolverLibName' => 'CORE_PERSON_0002',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0003',
+		'fehler_kurzbz' => 'FalscheAnzahlHeimatadressen',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Es sind mehrere oder keine Heimatadressen eingetragen',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'FalscheAnzahlHeimatadressen',
+		'resolverLibName' => 'CORE_PERSON_0003',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0004',
+		'fehler_kurzbz' => 'FalscheAnzahlZustelladressen',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Es sind mehrere oder keine Zustelladressen eingetragen',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'FalscheAnzahlZustelladressen',
+		'resolverLibName' => 'CORE_PERSON_0004',
+		'producerIsResolver' => false
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0005',
+		'fehler_kurzbz' => 'geburtsnationFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Geburtsnation nicht vorhanden',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'GeburtsnationFehlt',
+		'resolverLibName' => null,
+		'producerIsResolver' => true
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0006',
+		'fehler_kurzbz' => 'uhstatPersonkennungFehltCore',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Personkennung fehlt (vBpk AS, vBpk BF oder Ersatzkennzeichen fehlt)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core',
+		'producerLibName' => 'UhstatPersonkennungFehltCore',
+		'resolverLibName' => 'CORE_PERSON_0006',
+		'producerIsResolver' => false
+	)
+);
@@ -64,9 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $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['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
@@ -22,9 +22,8 @@ unset($config['student']['searchfields']['email']);
 unset($config['student']['searchfields']['tel']);
 $config['student']['resultfields'] = [
 	"s.student_uid AS uid",
-	"s.matrikelnr AS personenkennzeichen",
+	"s.matrikelnr",
 	"p.person_id",
-	"p.matr_nr AS matrikelnummer",
 	"(p.vorname || ' ' || p.nachname) AS name",
 	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
 	"CASE
@@ -168,32 +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;
-
@@ -31,8 +31,12 @@ class Abgabetool extends Auth_Controller
 	{
 		// TODO: routing from index based on berechtigung?

+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
 		}
@@ -40,8 +44,12 @@ class Abgabetool extends Auth_Controller

 	public function Student($student_uid_prop = '')
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+		
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
 		}
@@ -49,8 +57,12 @@ class Abgabetool extends Auth_Controller

 	public function Mitarbeiter()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
 		}
@@ -58,8 +70,13 @@ class Abgabetool extends Auth_Controller

 	public function Assistenz($stg_kz_prop = '')
 	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
@@ -67,8 +84,12 @@ class Abgabetool extends Auth_Controller
 	
 	public function Deadlines()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, '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
 		{
@@ -20,12 +20,8 @@ class Documents extends Auth_Controller
 			'download' => [self::PERM_LOGGED]
 		]);

-		// Load models
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');

-		// Load libraries
-		$this->load->library('AkteLib');
-
 		$this->loadPhrases([
 			'global',
 			'tools'
@@ -116,12 +112,10 @@ class Documents extends Auth_Controller

 		$selfservice = null;
 		if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
+			$this->load->model('crm/Akte_model', 'AkteModel');
 			$selfservice = [];
 			foreach ($person_ids as $person_id) {
-				$result = $this->aktelib->getByPersonId(
-					$person_id,
-					true
-				);
+				$result = $this->AkteModel->getArchiv($person_id, null, true);
 				if (isError($result))
 					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
@@ -153,13 +147,14 @@ class Documents extends Auth_Controller
 		if (!is_numeric($akte_id))
 			return show_404();

-		$result = $this->aktelib->getByAkteId($akte_id);
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->load($akte_id);
 		if (isError($result))
 			return show_error(getError($result));
 		$akte = getData($result);
 		if (!$akte)
 			return show_404();
-		$akte = reset($akte);
+		$akte = current($akte);

 		$admin_access = false;
 		if ($uid !== null && $this->permissionlib->isBerechtigt('admin')) {
@@ -28,6 +28,12 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'LvPlan']);
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
 	}
 }
@@ -26,6 +26,11 @@ 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']);
 	}
 }
@@ -27,7 +27,13 @@ class MyLvPlan extends Auth_Controller
 	 * @return void
 	 */
 	public function index()
-	{		
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLvPlan']);
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
 	}
 }
@@ -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,15 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
+		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView(getAuthUID());
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>true,
+			'profil_data' => $profil_data,
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}

 	/**
@@ -65,13 +73,23 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView($uid);
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array (
+			'uid' => $uid,
+			'profil_data'=>$profil_data,
+		);
+		if($uid == getAuthUID()){
+			$viewData['editable'] = true;
+		}
+		$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 +119,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 +262,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 +750,6 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+
 }
@@ -64,7 +64,7 @@ class ProfilUpdate extends Auth_Controller
 			{
 				// Get file to be downloaded from DMS
 				$newFilename = $this->uid . "/document_" . $dms_id;
-				$download = $this->dmslib->getOutputFileInfo($dms_id);
+				$download = $this->dmslib->download($dms_id);
 				if (isError($download))
 					return $download;

@@ -84,4 +84,3 @@ class ProfilUpdate extends Auth_Controller
 		}
 	}
 }
-
@@ -29,15 +29,11 @@ class Pub extends Auth_Controller
 	 */
 	public function bild($source, $id)
 	{
-		$person_id_user = getAuthPersonId();
-		$serverzugriff = false;
-		// Default Bild (Dummy Profilbild)
-		$outputFileName = FHCPATH . 'skin/images/profilbild_dummy.jpg';
-		$outputFileContent = '';
-		$mimetype = 'application/jpeg';
-
 		$this->load->model('person/Person_model', 'PersonModel');

+		$person_id_user = '';
+		$serverzugriff = false;
+
 		// Wenn das Bild direkt aufgerufen wird, ist eine Authentifizierung erforderlich
 		// Wenn es vom Server selbst aufgerufen wird, ist keine Auth. notwendig
 		// (z.B. fuer die Erstellung von PDFs)
@@ -49,27 +45,31 @@ class Pub extends Auth_Controller
 					'zugangscode' => $_SESSION['incoming/user']
 				]);
 				if (hasData($result))
-					$person_id_user = getData($result)[0]->person_id;
+					$person_id_user = current(getData($result))->person_id;
 			} elseif (isset($_SESSION['prestudent/user'])) { // Von Prestudententool
 				$result = $this->PersonModel->loadWhere([
 					'zugangscode' => $_SESSION['prestudent/user']
 				]);
 				if (hasData($result))
-					$person_id_user = getData($result)[0]->person_id;
+					$person_id_user = current(getData($result))->person_id;
 			} elseif (isset($_SESSION['bewerbung/personId'])) { // Von Bewerbungstool
 				$person_id_user = $_SESSION['bewerbung/personId'];
+			} else {
+				$person_id_user = getAuthPersonId();
 			}
 		} else {
 			$serverzugriff = true;
 		}

-		// If the picture is from the person table
-		if ($source == 'person' && is_numeric($id)) {
+		// Default Bild (Dummy Profilbild)
+		$cTmpHEX = base64_encode(file_get_contents(FHCPATH . 'skin/images/profilbild_dummy.jpg'));
+
+		if ($source == 'person' && $id) {
 			$foto_gesperrt = false;
 			// Person laden und Fotosperre überprüfen
 			$result = $this->PersonModel->load($id);
 			if (hasData($result)) {
-				$person = getData($result)[0];
+				$person = current(getData($result));
 				if ($person->foto_sperre) {
 					// Wenn der User selbst darauf zugreift darf er das Bild sehen
 					$foto_gesperrt = ($person_id_user != $id);
@@ -77,57 +77,91 @@ class Pub extends Auth_Controller
 					$foto_gesperrt = true;
 				}

-				if (!isEmptyString($person->foto) && !$foto_gesperrt) {
-					$outputFileContent = base64_decode($person->foto);
+				if ($person->foto && !$foto_gesperrt) {
+					$cTmpHEX = base64_decode($person->foto);
 				}
 			}
 		}
-
-		// If the picture is from the akte/dms
-		if($source == 'akte' && is_numeric($id))
+		if($source == 'akte' && $id != '')
 		{
-			$mimetype = '';
-			$this->load->library('AkteLib');
+			$this->load->model('crm/Akte_model', 'AkteModel');

-			$akteResult = $this->aktelib->getByAkteId($id, 'Lichtbil');
+			$this->AkteModel->addJoin('public.tbl_person', 'person_id');
+			$result = $this->AkteModel->loadWhere([
+				'person_id' => $id,
+				'dokument_kurzbz' => 'Lichtbil'
+			]);

-			if (hasData($akteResult)) {
+			if (hasData($result)) {
 				$foto_gesperrt = false;
-				$akte = getData($akteResult)[0];

-				$personResult = $this->PersonModel->load($akte->person_id);
-				if (hasData($personResult)) {
-					$person = getData($personResult)[0];
-					if ($person->foto_sperre) {
-						$foto_gesperrt = ($person_id_user != $id);
-					} elseif (!$person_id_user && !$serverzugriff) {
-						$foto_gesperrt = true;
-					}
+				$akte = current(getData($result));
+				if ($akte->foto_sperre) {
+					// Wenn der User selbst darauf zugreift darf er das Bild sehen
+					$foto_gesperrt = ($person_id_user != $id);
+				} elseif (!$person_id_user && !$serverzugriff) {
+					$foto_gesperrt = true;
 				}

 				// Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
-				if (!isEmptyString($akte->inhalt)) {
-					$outputFileContent = base64_decode($akte->inhalt);
-					$mimetype = $akte->mimetype;
+				if (!$akte->inhalt && $akte->dms_id) {
+					$this->load->model('content/Dms_model', 'DmsModel');
+					$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+					$this->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+					$this->DmsModel->addOrder('version', 'DESC');
+					$this->DmsModel->addLimit(1);
+					$result = $this->DmsModel->load($akte->dms_id);
+
+					if (!hasData($result))
+						die('Kein Dokument vorhanden');
+
+					$dms = current(getData($result));
+
+					$filename = DMS_PATH . $dms->filename;
+
+					$this->DmsVersionModel->update([
+						'dms_id' => $dms->dms_id,
+						'version' => $dms->version
+					], [
+						'letzterzugriff' => date('c')
+					]);
+
+					if (file_exists($filename)) {
+						$handle = fopen($filename, "r");
+						if ($handle) {
+							while (!feof($handle)) {
+								$akte->inhalt .= fread($handle, 8192);
+							}
+							fclose($handle);
+						} else {
+							echo 'Fehler: Datei konnte nicht geoeffnet werden';
+						}
+					} else {
+						echo 'Die Datei existiert nicht';
+					}
+				}
+
+				if ($akte->inhalt && !$foto_gesperrt) {
+					$cTmpHEX = $akte->inhalt;
 				}
 			}
 		}

-		// If file content is provided
-		if (!isEmptyString($outputFileContent))
-		{
-			// If a mimetype is still not found
-			if (isEmptyString($mimetype))
-			{
-				$fo = finfo_open();
-				$mimetype = finfo_buffer($fo, $outputFileContent, FILEINFO_MIME_TYPE);
-			}
-			$this->outputImageByContent($mimetype, $outputFileContent);
-		}
-		else // otherwise use the file
-		{
-			$this->outputImageByFile($mimetype, $outputFileName);
+		// die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
+		// von pdfs kommen kann.
+
+		$im = @imagecreatefromstring(base64_decode($cTmpHEX));
+		if ($im) {
+			@ob_clean();
+			header("Content-type: image/jpeg");
+			exit(imagejpeg($im));
+		} else {
+			// bei manchen Bildern funktioniert die konvertierung nicht
+			// diese werden dann einfach so angezeigt.
+			@ob_clean();
+			header("Content-type: image/gif");
+			exit($cTmpHEX);
 		}
 	}
 }
-
@@ -25,6 +25,11 @@ class Raumsuche extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Raumsuche']);
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, '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']);
-	}
-}
@@ -29,7 +29,10 @@ class Studium extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'studium']);
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
 	}


@@ -1,7 +1,6 @@
 <?php

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

 /**
 *
@@ -14,9 +13,9 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-			array(
-				'index' => 'basis/cis:r'
-			)
+		    array(
+			'index' => 'basis/cis:r'
+		    )
 		);

 		// Load Config
@@ -31,6 +30,16 @@ 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,
+			'timezone' => $this->config->item('timezone')
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
 }
@@ -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]);
+
+	}
+}
@@ -143,7 +143,7 @@ class Documents extends Auth_Controller

 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			if (isError($result))
-				show_error(getError($result));
+				return show_error(getError($result));
 			if (!hasData($result))
 				return show_404();
 			
@@ -226,13 +226,13 @@ class Documents extends Auth_Controller

 		$result = $this->VorlageModel->load($xsl);
 		if (isError($result))
-			show_error(getError($result));
+			return show_error(getError($result));
 		if (!hasData($result))
 			show_404();
 		
 		$vorlage = current(getData($result));
 		if ($sign_user && !$vorlage->signierbar)
-			show_error($this->p->t("stv", "grades_error_sign"));
+			return show_error($this->p->t("stv", "grades_error_sign"));

 		
 		// Filename
@@ -284,23 +284,11 @@ class Documents extends Auth_Controller
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		if (isError($result))
-			show_error(getError($result));
+			return show_error(getError($result));

 		$data = getData($result);

-		// Get the content
-		$contentResult = $this->documentexportlib->getContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
-
-		// If an error occurred
-		if (isError($contentResult)) show_error(getError($contentResult));
-
-		$fileObj = new stdClass();
-		$fileObj->file_content = getData($contentResult);
-		$fileObj->name = $filename;
-		$fileObj->mimetype = isEmptyString($vorlage->mimetype) ? 'application/pdf' : $vorlage->mimetype;
-		$fileObj->disposition = 'attachment';
-
-		// Download
-		$this->outputFile($fileObj);
+		// Output
+		$this->documentexportlib->showContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
 	}
 }
@@ -18,8 +18,6 @@

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

-use \DateTime as DateTime;
-
 class Bookmark extends FHCAPI_Controller
 {

@@ -30,162 +28,111 @@ 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
-		]);
+        ]);

 		$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
 	 */
 	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
 	 */
-	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
 	 */
-	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
+	 * updates bookmark in the bookmark table 
 	 * @access public
 	 * @return void
 	 */
-	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,95 +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)
-	{
-		$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 (!$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		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;
-	}
+    }

+	
+	
 }

@@ -51,8 +51,6 @@ class Documents extends FHCAPI_Controller
 		$this->loadPhrases([
 			'stv'
 		]);
-
-		$this->load->library('DocumentExportLib');
 	}

 	/**
@@ -102,11 +100,23 @@ class Documents extends FHCAPI_Controller
 	{
 		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);

-		$akteData = $akteExportData['akteData'];
-		$exportData = $akteExportData['exportData'];
+		$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
-		$contentResult = $this->documentexportlib->getContent(
+		$result = $this->documentexportlib->showContent(
+			$akteData['akteData']['inhalt'],
 			$exportData['vorlage'],
 			$exportData['xml_data'],
 			$exportData['oe_kurzbz'],
@@ -115,9 +125,7 @@ class Documents extends FHCAPI_Controller
 			$exportData['sign_user']
 		);

-		$content = $this->getDataOrTerminateWithError($contentResult);
-
-		$this->terminateWithFileOutput($akteData['mimetype'], $content, $akteData['titel'] . '.pdf');
+		$this->terminateWithSuccess(true);
 	}

 	/**
@@ -153,10 +161,12 @@ class Documents extends FHCAPI_Controller
 			$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');
 			}

@@ -455,13 +465,18 @@ class Documents extends FHCAPI_Controller
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));

+
+		$this->load->library('DocumentExportLib');
+
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->documentexportlib->addArchiveToData($data);
-		$contentResult = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);

-		$content = $this->getDataOrTerminateWithError($contentResult);
+		// Output
+		$result = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+
+		$content = $this->getDataOrTerminateWithError($result);
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);

@@ -479,4 +494,3 @@ class Documents extends FHCAPI_Controller
 		];
 	}
 }
-
@@ -38,8 +38,7 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED,
-			'semesterAverageGrade' => self::PERM_LOGGED,
+			'Pruefungen' => self::PERM_LOGGED
 		]);
 		
 	}
@@ -101,49 +100,5 @@ 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]);
-	}
 }

@@ -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');

 use CI3_Events as Events;
 use \DateTime as DateTime;
@@ -34,25 +33,19 @@ class LvPlan extends FHCAPI_Controller

 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
-			'Stunden' => self::PERM_LOGGED,
-			'getReservierungen' => 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,
+			'getLv' => self::PERM_LOGGED
 		]);

-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -60,17 +53,17 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));

-		$this->load->library('form_validation');
+        $this->load->library('form_validation');
 	}

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

 	/**
-	 * fetches LvPlan and Moodle events together
-	 * @access public
-	 *
-	 */
+     * fetches LvPlan and Moodle events together
+     * @access public
+     *
+     */
 	public function LvPlanEvents()
 	{
 		$hasLv = $this->input->post('lv_id');
@@ -90,30 +83,24 @@ class LvPlan extends FHCAPI_Controller
 		// 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);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);

 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);

 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
-
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -122,45 +109,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}

-	/**
-	 * 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
 	 *
@@ -174,7 +122,7 @@ class LvPlan extends FHCAPI_Controller
 		$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());

@@ -189,6 +137,7 @@ class LvPlan extends FHCAPI_Controller

 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -197,42 +146,40 @@ class LvPlan extends FHCAPI_Controller
 	}

 	//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));
+	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)
-	{
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
 		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
+		$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);
+		$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()
+    /**
+     * 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);
+        $stunden = $this->getDataOrTerminateWithError($stunden);

 		$this->terminateWithSuccess($stunden);
 	}
@@ -263,10 +210,10 @@ class LvPlan extends FHCAPI_Controller
 		$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
@@ -279,32 +226,25 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$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->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);

 		$result = $this->getDataOrTerminateWithError($result);

 		$this->terminateWithSuccess($result);
 	}

-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
+	public function getLehreinheitStudiensemester($lehreinheit_id){
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -347,68 +287,6 @@ class LvPlan extends FHCAPI_Controller
 		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
 	 *
@@ -416,34 +294,30 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
+	private function fetchMoodleEvents($start_date, $end_date)
 	{
-		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) {
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
 				'start_date' => $start->format('c'),
 				'end_date' => $end->format('c'),
-				'username' => $uid ?? getAuthUID()
+				'username' => getAuthUID()
 			]
 		);

@@ -457,23 +331,23 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date, $uid = null)
+	private function fetchFerienEvents($start_date, $end_date)
 	{
 		$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(),
+				"student_uid" => getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+			
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -483,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}

 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }
@@ -1,76 +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 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');
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // 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;
-
-        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
-        $this->BenutzerModel->addJoin("tbl_person", "person_id");
-        $personResult = $this->BenutzerModel->load([$uid]);
-        $person = hasData($personResult) ? getData($personResult) : null;
-
-        $viewData = [
-            "user_data" => [
-                "username" => $uid,
-                "is_student" => $isStudent,
-                "is_mitarbeiter" => $isMitarbeiter,
-                "foto" => $person[0]->foto,
-                "vorname" => $person[0]->vorname,
-                "nachname" => $person[0]->nachname,
-            ],
-        ];
-
-        $this->terminateWithSuccess($viewData);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // 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,13 +27,13 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'fotoSperre' => 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');
@@ -49,37 +48,28 @@ 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)
-	{
-		$authUid = getAuthUID();
-		$isProfilOfAuthUser = !$uid || $uid === $authUid;
-
+	public function profilViewData($uid=null){
 		$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();
+		$editable = false;
+		if(isset($uid) && $uid != null){
+			$profil_data = $this->profillib->getView($uid);
+			if($uid == getAuthUID()){
+				$editable = true;
+			}
+		}else{
+			$editable = true;
+			$profil_data = $this->profillib->getView(getAuthUID());
 		}
-
+		
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>$editable,
+			'profil_data' => $profil_data,
+		);
 		$this->terminateWithSuccess($viewData);
 	}

-	/**
+    /**
 	 * update column foto_sperre in public.tbl_person
 	 * @access public
 	 * @param  boolean $value  new value for the column
@@ -87,9 +77,9 @@ 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)) {
@@ -97,10 +87,10 @@ class Profil extends FHCAPI_Controller
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-
-		$res = $this->getDataOrTerminateWithError($res);
-
-		$this->terminateWithSuccess(current($res));
+		
+        $res = $this->getDataOrTerminateWithError($res);
+		
+        $this->terminateWithSuccess(current($res));
 	}

 	/**
@@ -119,7 +109,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 +117,30 @@ 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);	
+		
 	}

-
+    
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -160,48 +150,23 @@ 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

-	/**
-	 * 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
-	 */
-	private function getCalendarSyncUrlData()
-	{
-		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),
-			],
-		];
-	}
+	
 }

@@ -136,7 +136,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->uid == $profil_update->uid
 			) {
 				// Get file to be downloaded from DMS
-				$download = $this->dmslib->getOutputFileInfo($dms_id);
+				$download = $this->dmslib->download($dms_id);
 				$download = $this->getDataOrTerminateWithError($download);
 				// Download file
 				$this->outputFile($download);
@@ -456,28 +456,24 @@ class ProfilUpdate extends FHCAPI_Controller
 			$_FILES['files']['error'] = $files['error'][$i];
 			$_FILES['files']['size'] = $files['size'][$i];

-			// File upload
-			$uploadDataResult = $this->uploadFile('files', array('jpg', 'png', 'pdf'));
-			if (isError($uploadDataResult)) $this->addError(getError($uploadDataResult));
-			if (!hasData($uploadDataResult)) $this->addError('Upload failed');
+			$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()",
+			];

-			if (hasData($uploadDataResult))
-			{
-				// Add file to the DMS (DB + file system)
-				$dms_res = $this->dmslib->add(
-					getData($uploadDataResult)['file_name'],
-                        	        getData($uploadDataResult)['file_type'],
-                        	        fopen(getData($uploadDataResult)['full_path'], 'r'),
-                        	        'profil_aenderung', // kategorie_kurzbz
-                        	        null, // dokument_kurzbz
-                        	        null, // beschreibung
-                        	        false, // cis_suche
-                        	        null, // schlagworte
-                        	        getAuthUID() // insertvon
-				);
-				$dms_res = $this->getDataOrTerminateWithError($dms_res);
-				array_push($res, $dms_res);
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+			
+			if(isError($tmp_res)){
+				$this->addError(getError($tmp_res));
 			}
+
+			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
+			array_push($res, $tmp_res);
 		}

 		$this->terminateWithSuccess($res);
@@ -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
-
-}
-
@@ -62,36 +62,21 @@ class Studium extends FHCAPI_Controller

 		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));
-
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
 			$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_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
 			if(!isset($parameter_studienplan))
-				$parameter_studienplan = $student_studienplan;
-
+			$parameter_studienplan = $student_studienplan;
 		}  

 		if(isset($parameter_studiensemester)){
@@ -111,7 +96,8 @@ class Studium extends FHCAPI_Controller

 		// 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;
 		}))){
@@ -230,8 +216,6 @@ class Studium extends FHCAPI_Controller
 		$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;
@@ -40,32 +40,11 @@ class Board extends FHCAPI_Controller

 	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);
+		$this->terminateWithSuccess($result);
 	}

 	public function create()
@@ -103,7 +82,7 @@ class Board extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

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

 	public function delete()
@@ -137,6 +116,6 @@ class Board extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }
@@ -120,7 +120,10 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			} else {
 				$result[$funktion] = [];
 			}
@@ -151,7 +154,7 @@ class Preset extends FHCAPI_Controller

 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$preset_decoded[$widget['widgetid']] = $widget;
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);

 		$preset->preset = json_encode($preset_decoded);

@@ -183,10 +186,8 @@ class Preset extends FHCAPI_Controller

 		$preset_decoded = json_decode($preset->preset, true);

-		if (!isset($preset_decoded[$widgetid]))
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 			show_404();
-		
-		unset($preset_decoded[$widgetid]);

 		$preset->preset = json_encode($preset_decoded);

@@ -48,9 +48,25 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;

-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);

-		$this->terminateWithSuccess($mergedconfig);
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
 	}

 	public function addWidget()
@@ -70,15 +86,26 @@ class User extends FHCAPI_Controller
 		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;
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];

+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
+		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -108,10 +135,18 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);

-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}

 		$override->override = json_encode($override_decoded);
 				
@@ -0,0 +1,200 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class IssueChecker extends FHCAPI_Controller
+{
+	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
+
+	protected $person_id;
+	protected $_extensionName = null;
+	protected $_fehlercodes = [];
+	protected $_apps = [];
+
+	protected $errors = [];
+	protected $infos = [];
+
+	public function __construct($permissions = [])
+	{
+		$default_permissions = [
+			'checkPerson' => self::DEFAULT_PERMISSION,
+			'countPersonOpenIssues' => self::DEFAULT_PERMISSION
+		];
+
+		if(!is_array($permissions))
+		{
+			$this->terminateWithError("Issue Checker: permissions must be an array");
+		}
+
+		$merged_permissions = array_merge($default_permissions, $permissions);
+
+		parent::__construct($merged_permissions);
+
+		$this->load->model('system/Issue_model', 'IssueModel');
+		$this->load->model('system/Fehler_model', 'FehlerModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$producerArgs = [];
+		$resolverArgs = [];
+
+		// get fehler kurzbz from fehlercodes, if fehlercodes provided
+		if (!isEmptyArray($this->_fehlercodes))
+		{
+			$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz');
+			$this->FehlerModel->db->where_in('tbl_fehler.fehlercode', $this->_fehlercodes);
+			$fehlerKurzbzRes = $this->FehlerModel->load();
+
+			if (isError($fehlerKurzbzRes)) $this->terminateWithError(getError($fehlerKurzbzRes), self::ERROR_TYPE_GENERAL);
+			if (hasData($fehlerKurzbzRes))
+			{
+				$producerArgs['fehlerKurzbz'] = array_column(getData($fehlerKurzbzRes), 'fehler_kurzbz');
+				$resolverArgs['fehlercode'] = array_column(getData($fehlerKurzbzRes), 'fehlercode');
+			}
+		}
+		elseif (!isEmptyArray($this->_apps)) // if apps are provided
+		{
+			// get fehlercodes for the apps
+			$fehlerRes = $this->FehlerModel->getByApps($this->_apps);
+			if (hasData($fehlerRes)) $this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
+
+			$producerArgs['apps'] = $this->_apps;
+			$resolverArgs['apps'] = $this->_apps;
+		}
+
+		// load producer and checker libraries with fehler kurbz and fehlercode list
+		$this->load->library(
+			'issues/PlausicheckProducerLib',
+			$producerArgs,
+			'PlausicheckProducerLib'
+		);
+
+		$this->load->library(
+			'issues/PlausicheckResolverLib',
+			$resolverArgs,
+			'PlausicheckResolverLib'
+		);
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'ui'
+			)
+		);
+	}
+
+	public function checkPerson()
+	{
+		$person_id = $this->input->post('person_id', true);
+		$hauptzustaendig = filter_var($this->input->post('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
+
+		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+
+		$this->person_id = intval($person_id);
+		$this->hauptzustaendig = $hauptzustaendig;
+
+		$persRes = $this->PersonModel->load($this->person_id);
+		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
+
+		$this->_produceIssues();
+		$this->_resolveIssues();
+		$this->_produceIssues();
+
+		$openIssueCountRes = $this->_countOpenIssues();
+		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
+
+		$data = array(
+			'person_id' => $this->person_id,
+			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
+		);
+
+		$this->addMeta('errors', $this->errors);
+		$this->addMeta('infos', $this->infos);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function countPersonOpenIssues()
+	{
+		$person_id = $this->input->get('person_id', true);
+		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
+
+		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+
+		$this->person_id = intval($person_id);
+		$this->hauptzustaendig = $hauptzustaendig;
+
+		$persRes = $this->PersonModel->load($this->person_id);
+
+		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
+
+		$openIssueCountRes = $this->_countOpenIssues();
+		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
+
+		$data = array(
+			'person_id' => $this->person_id,
+			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
+		);
+
+		$this->addMeta('errors', $this->errors);
+		$this->addMeta('infos', $this->infos);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	protected function _countOpenIssues()
+	{
+		if (isEmptyArray($this->_fehlercodes)) return success([]);
+
+		// load open issues with given errorcodes
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			$this->_fehlercodes,
+			$this->person_id,
+			$oe_kurzbz = null,
+			$fehlercode_extern = null,
+			$this->hauptzustaendig
+		);
+
+		// log error if occured
+		if (isError($openIssuesRes)) return $openIssuesRes;
+
+		$issues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
+		$issuescount = is_array($issues) || $issues instanceof Countable ? count($issues) : 0;
+
+		return success($issuescount);
+	}
+
+	protected function _produceIssues()
+	{
+		$result = $this->PlausicheckProducerLib->producePlausicheckIssues(
+			array('person_id' => $this->person_id)
+		);
+
+		// log if error, or log info if inserted new issue
+		if (isset($result->errors))
+			$this->errors = array_merge($this->errors, $result->errors);
+		if (isset($result->infos))
+			$this->infos = array_merge($this->infos, $result->infos);
+	}
+
+	protected function _resolveIssues()
+	{
+		// load open issues with given errorcodes
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			$this->_fehlercodes,
+			$this->person_id
+		);
+
+		if (hasData($openIssuesRes))
+		{
+			$openIssues = getData($openIssuesRes);
+
+			$result = $this->PlausicheckResolverLib->resolvePlausicheckIssues($openIssues);
+
+			// log if error, or log info if inserted new issue
+			if (isset($result->errors))
+				$this->errors = array_merge($this->errors, $result->errors);
+			if (isset($result->infos))
+				$this->infos = array_merge($this->infos, $result->infos);
+		}
+	}
+}
@@ -0,0 +1,104 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+
+class Issues extends FHCAPI_Controller
+{
+	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
+
+	public function __construct() {
+
+		parent::__construct(
+			array(
+				'getOpenIssuesByProperties' => Self::DEFAULT_PERMISSION,
+				'getPersonenMitOffenenIssues' => Self::DEFAULT_PERMISSION
+			)
+		);
+
+		// Loads authentication library and starts authenticationfetc
+		$this->load->library('AuthLib');
+
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
+		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('system/Fehler_model','FehlerModel');
+		$this->load->model('system/Issue_model', 'IssueModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	public function getOpenIssuesByProperties()
+	{
+		$person_id = $this->input->get('person_id', true);
+		$oe_kurzbz = $this->input->get('oe_kurzbz', true);
+		$fehlertyp_kurzbz = $this->input->get('fehlertyp_kurzbz', true);
+		$apps = $this->input->get('apps', true);
+		$behebung_parameter = $this->input->get('behebung_parameter', true);
+		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
+
+		if (isset($person_id) && !is_numeric($person_id))
+			$this->terminateWithError('person id is not numeric!');
+
+		if (isset($behebung_parameter) && !is_array($behebung_parameter))
+			$this->terminateWithError('Behebung parameter invalid');
+
+		$issueRes = $this->IssueModel->getOpenIssuesByProperties(
+			$person_id,
+			$oe_kurzbz,
+			$fehlertyp_kurzbz,
+			$apps,
+			$behebung_parameter,
+			$hauptzustaendig
+		);
+
+		if (isError($issueRes))
+		{
+			$this->terminateWithError(getError($issueRes));
+		}
+
+		$this->terminateWithSuccess(hasData($issueRes) ? getData($issueRes) : []);
+	}
+
+	public function getPersonenMitOffenenIssues()
+	{
+
+		$sql = <<<EOSQL
+SELECT
+
+		person_id, uid, vorname, nachname, count(*) AS openissues ,
+		(select count(*) anz_aktiv
+		 from hr.tbl_dienstverhaeltnis dv
+		 where dv.mitarbeiter_uid=uid and dv.von<=now() and
+		       (dv.bis is null OR dv.bis>=now())
+		) aktiv
+FROM
+		system.tbl_issue
+JOIN
+		system.tbl_fehler USING (fehlercode)
+JOIN
+		public.tbl_person USING (person_id)
+JOIN
+		public.tbl_benutzer USING (person_id)
+JOIN
+		public.tbl_mitarbeiter ON uid = mitarbeiter_uid
+WHERE
+		app = 'personalverwaltung' AND verarbeitetamum IS NULL
+GROUP BY
+		person_id, uid, vorname, nachname
+HAVING
+		count(*) > 0
+ORDER BY
+		count(*) DESC;
+
+EOSQL;
+
+		$personenmitissues = $this->IssueModel->execReadOnlyQuery($sql);
+		if( hasData($personenmitissues) )
+		{
+			$this->terminateWithSuccess(getData($personenmitissues));
+		}
+		else
+		{
+			$this->terminateWithSuccess(array());
+		}
+	}
+}
@@ -0,0 +1,17 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+require_once APPPATH.'/controllers/api/frontend/v1/issues/IssueChecker.php';
+
+class StudentIssueChecker extends IssueChecker
+{
+	protected $_apps = array(
+		'core',
+		'dvuh',
+		'bis'
+	);
+
+	//protected $_fehlercodes = array(
+		//~ 'CORE_AA_0001'
+	//);
+}
@@ -158,27 +158,19 @@ class Unterbrechung extends FHCAPI_Controller
 		if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
 			$this->load->library('DmsLib');

+			$dms = $this->config->item('unterbrechung_dms');
+			if (!count(array_filter($dms, function ($v) {
+				return $v !== null;
+			})))
+				$dms = ['kategorie_kurzbz' => 'Akte'];
+			$dms['version'] = 0;

-			$uploadDataResult = $this->uploadFile('attachment', $this->config->item('unterbrechung_dms_filetypes') ?: array('*'));
+			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
+			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);

-			$data = $this->getDataOrTerminateWithError($uploadDataResult);
-
-			// Add file to the DMS (DB + file system)
-			$dms_res = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'studierendenantrag',
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-
-			$dms_data = $this->getDataOrTerminateWithError($dms_res);
-
-			$dms_id = $dms_data->dms_id;
+			$data = $this->getDataOrTerminateWithError($result);
+			
+			$dms_id = $data['dms_id'];
 		}

 		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);
@@ -32,8 +32,8 @@ class Akte extends Auth_Controller
 			'download' => ['admin:w', 'assistenz:w'],
 		]);

-		// Load libraries
-		$this->load->library('AkteLib');
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
 	}

 	//------------------------------------------------------------------------------------------------------------------
@@ -49,22 +49,22 @@ class Akte extends Auth_Controller

 		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');

-		$akteResult = $this->aktelib->getByAkteId($akte_id);
+		$result = $this->AkteModel->load($akte_id);

-		if (!hasData($akteResult)) $this->terminateWithError('Akte not found');
+		if (!hasData($result)) $this->terminateWithError('Akte not found');

-		$data = getData($akteResult)[0];
+		$data = getData($result)[0];

-		if (!isEmptyString($data->inhalt))
+		if (isset($data->inhalt) && $data->inhalt != '')
 		{
-			$fileObj = new stdClass();
-			$fileObj->file_content = base64_decode($data->inhalt);
-			$fileObj->name = $data->filename;
-			$fileObj->mimetype = $data->mimetype;
-			$fileObj->disposition = 'attachment';
-
-			$this->outputFile($fileObj);
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			echo base64_decode($data->inhalt);
+			die();
 		}
 	}
 }
-
@@ -46,9 +46,6 @@ class Archiv extends FHCAPI_Controller
 		$this->load->model('crm/Akte_model', 'AkteModel');
 		$this->load->model('system/Vorlage_model', 'VorlageModel');

-		// Load libraries
-		$this->load->library('AkteLib');
-
 		// Load language phrases
 		$this->loadPhrases([
 			'archiv'
@@ -60,7 +57,7 @@ class Archiv extends FHCAPI_Controller

 	/**
 	 * Get archive documents for a person
-
+	 
 	 * @return void
 	 */
 	public function getArchiv()
@@ -77,11 +74,7 @@ class Archiv extends FHCAPI_Controller
 				$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}

-		$result = $this->aktelib->getByPersonId(
-			$person_id,
-			null, // dokument_kurzbz
-			true // archiv
-		);
+		$result = $this->AkteModel->getArchiv($person_id);

 		$data = $this->getDataOrTerminateWithError($result);

@@ -101,6 +94,51 @@ class Archiv extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}

+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		$fileObj = new stdClass();
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			// Define handle to output stream
+			$tmpFilePointer   = fopen("php://output", 'w');
+			$meta_data = stream_get_meta_data($tmpFilePointer);
+			$filename = $meta_data["uri"];
+			fwrite($tmpFilePointer, $data->inhalt);
+
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			//header('Content-Length: ' . filesize($fileObj->file));
+			//header("Content-type: $data->mimetype");
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			readfile($filename);
+			die();
+		}
+		else
+		{
+			$this->load->library('AkteLib');
+
+			$result = $this->aktelib->get($akte_id);
+		}
+	}
+
 	/**
 	 * Updating an Akte
 	 * @return void
@@ -155,7 +193,7 @@ class Archiv extends FHCAPI_Controller
 			$this->addMeta('content', base64_encode($content));
 		}

-
+		
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
@@ -210,7 +248,7 @@ class Archiv extends FHCAPI_Controller
 				'akte_id' => $akte_id
 			]));
 		}
-
+		
 		$result = $this->AkteModel->delete($akte_id);
 		if (isError($result)) $this->terminateWithError(getError($result));

@@ -27,8 +27,7 @@ class Dokumente extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
-		$this->load->library('AkteLib');
-		$this->load->library('DmsLib');
+		$this->load->library('DmsLib', array('who' => getAuthUID()));

 		// Load language phrases
 		$this->loadPhrases([
@@ -171,6 +170,8 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}

+		$uid = getAuthUID();
+
 		$result = $this->AkteModel->update(
 			[
 				'akte_id' => $this->input->post('akte_id'),
@@ -181,7 +182,7 @@ class Dokumente extends FHCAPI_Controller
 				'titel_intern' => $this->input->post('titel_intern'),
 				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
-				'updatevon' => getAuthUID(),
+				'updatevon' => $uid,
 			]
 		);

@@ -198,6 +199,8 @@ class Dokumente extends FHCAPI_Controller
 		if(!$dokument_kurzbz)
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);

+		$uid = getAuthUid();
+
 		//check if more than 1 dokumentkurzbz
 		//if()

@@ -205,10 +208,10 @@ class Dokumente extends FHCAPI_Controller
 			[
 				'prestudent_id' => $prestudent_id,
 				'dokument_kurzbz' => $dokument_kurzbz,
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'datum' => date('c'),
 				'insertamum' => date('c'),
-				'insertvon' =>  getAuthUID(),
+				'insertvon' =>  $uid,
 			]
 		);

@@ -231,6 +234,7 @@ class Dokumente extends FHCAPI_Controller
 		$nachgereicht = current($dataAkte)->nachgereicht;
 		$inhalt = current($dataAkte)->inhalt;
 		$inhaltVorhanden = $inhalt != '';
+		$uid = getAuthUid();

 		$this->db->trans_start();

@@ -244,15 +248,16 @@ class Dokumente extends FHCAPI_Controller
 			$logdata_dms = "Logdata: " . var_export($logdata_dms, true);

 			//delete from dmsLib
+			$this->load->library('DmsLib');
 			$person_id = current($dataAkte)->person_id;
-			$result = $this->aktelib->removeByPersonIdAndDmsId($person_id, $dms_id);
+			$result = $this->dmslib->delete($person_id, $dms_id);
 			$this->getDataOrTerminateWithError($result);

 			//LOGGING Dms ID
 			$this->load->model('system/Log_model', 'LogModel');
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der DMS_ID ". $dms_id,
 				'sql' => $logdata_dms
 			]);
@@ -269,7 +274,7 @@ class Dokumente extends FHCAPI_Controller
 			//Logging Deletion Akte
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -288,7 +293,7 @@ class Dokumente extends FHCAPI_Controller

 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -303,6 +308,7 @@ class Dokumente extends FHCAPI_Controller

 	public function uploadDokument()
 	{
+		$this->load->library('DmsLib');
 		$prestudent_id = $this->input->post('prestudent_id');
 		$anmerkung_intern = $this->input->post('anmerkung_intern');
 		$titel_intern = $this->input->post('titel_intern');
@@ -325,44 +331,34 @@ class Dokumente extends FHCAPI_Controller
 		}

 		$this->db->trans_start();
+		$uid = getAuthUID();

-		$uploadDataResult = $this->uploadFile('anhang', array('jpg', 'png', 'pdf'));
-		if (isError($uploadDataResult))
+		$dms = array(
+			'kategorie_kurzbz'  => 'Akte',
+			'version'           => 0,
+			'name'              => $_FILES['anhang']['name'],
+			'mimetype'          => $_FILES['anhang']['type'],
+			'insertamum'        => date('c'),
+			'insertvon'         => $uid
+		);
+
+		$result = $this->dmslib->upload($dms, 'anhang', array("jpg", "png", "pdf"));
+
+		if (isError($result))
 		{
-			return $this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
-		// If data exists
-		if (hasData($uploadDataResult))
-		{
-			// Add file to the DMS (DB + file system)
-			$dms_res = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'Akte', // kategorie_kurzbz
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-		}
-
-		// Error occurred or data not found
-		if (isError($dms_res) || !hasData($dms_res)) $this->terminateWithError(getError($dms_res), self::ERROR_TYPE_GENERAL);
-
-		$dms_id = getData($dms_res)->dms_id;
+		$dms_id = $result->retval['dms_id'];

 		$person_id = $this->_getPersonId($prestudent_id);

-		$dokumentResult = $this->DokumentModel->load($dokument_kurzbz);
-		$data = $this->getDataOrTerminateWithError($dokumentResult);
+		$result = $this->DokumentModel->load($dokument_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);

 		$bezeichnung = current($data)->bezeichnung;

-		// Save entry in akte
-		if ($dms_id)
+		//save entry in akte
+		if($dms_id)
 		{
 			$result = $this->AkteModel->insert([
 				'person_id' => $person_id,
@@ -371,7 +367,7 @@ class Dokumente extends FHCAPI_Controller
 				'mimetype' => $_FILES['anhang']['type'],
 				'insertamum' => date('c'),
 				'erstelltam' => date('c'),
-				'insertvon' => getAuthUID(),
+				'insertvon' => $uid,
 				'anmerkung_intern' => $anmerkung_intern,
 				'titel_intern' => $titel_intern,
 				'bezeichnung' => $bezeichnung,
@@ -418,26 +414,28 @@ class Dokumente extends FHCAPI_Controller
 		$filecontentbase64 = $data->inhalt;
 		$filename = $data->titel;

-		if (intval($data->dms_id) > 0)
+		if(intval($data->dms_id) > 0)
 		{
-			$file = $this->dmslib->getOutputFileInfo($data->dms_id, $filename);
+			$dmsdokres = $this->dmslib->read($data->dms_id);
+			if (!hasData($dmsdokres)) $this->terminateWithError('DMS File not found');
+			$dmsdok = getData($dmsdokres)[0];

-			$this->terminateWithFileOutput(getData($file)->mimetype, file_get_contents(getData($file)->file), $filename);
+			$mimetype = $dmsdok->mimetype;
+			$filecontentbase64 = $dmsdok->file_content;
+			$filename = $dmsdok->name;
 		}
-		else
-		{
-			$filecontent = '';

-			if (!empty($filecontentbase64)) {
-				$filecontent = base64_decode($filecontentbase64, true);
+		$filecontent = '';

-				if ($filecontent === false) {
-					$this->terminateWithError('Base64-Dekodierung failed.');
-				}
+		if (!empty($filecontentbase64)) {
+			$filecontent = base64_decode($filecontentbase64, true);
+
+			if ($filecontent === false) {
+				$this->terminateWithError('Base64-Dekodierung failed.');
 			}
-
-			$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 		}
+
+		$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 	}

 	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
@@ -753,7 +751,10 @@ class Dokumente extends FHCAPI_Controller
 		);

 		$data = $this->getDataOrTerminateWithError($result);
-		return hasData($data) ? getData($data)[0]->prestudent_id : null;
+		$student = current($data);
+
+
+		return $student->prestudent_id;
 	}

 	/**
@@ -33,6 +33,11 @@ class Notiz extends Notiz_Controller
 		]);
 	}

+/*	public function getUid()
+	{
+		$this->terminateWithSuccess(getAuthUID());
+	}*/
+

 	public function getNotizen($id, $type)
 	{
@@ -54,6 +59,317 @@ class Notiz extends Notiz_Controller

 	}

+/*	public function loadNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		//$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+		$this->NotizModel->addSelect('*');
+		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->NotizModel->addLimit(1);
+
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+
+	public function updateNotiz()
+	{
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		//update Notiz
+		$uid = getAuthUID();
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = $this->input->post('verfasser');
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
+
+		$result = $this->NotizModel->update(
+			[
+				'notiz_id' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+		$dms_uploaded = null;
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$dms_id_arr = null;
+		}
+		else
+		{
+			$result = getData($result);
+			foreach($result as $doc) {
+				$dms_id_arr[] = array(
+					'name' => $doc->name,
+					'dms_id' => $doc->dms_id
+				);
+			}
+		}
+
+		foreach ($_FILES as $k => $file)
+		{
+			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			if($file["type"] == 'application/x.fhc-dms+json')
+			{
+				$dms_uploaded[] = array(
+					'name' => $file["name"]
+				);
+			}
+			else
+			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
+				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				$result = $this->dmslib->upload($dms, $k, array('*'));
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				$dms_id = $result->retval['dms_id'];
+
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		//update(3) check if Dateien gelöscht wurden
+		if(count($dms_uploaded) != count($dms_id_arr))
+		{
+			if (count($dms_uploaded) == 0)
+			{
+				$filesDeleted = $dms_id_arr;
+			}
+			else
+			{
+				$upload_new_names = array_column($dms_uploaded, "name");
+
+				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+					return !in_array($file["name"], $upload_new_names);
+				});
+			}
+
+			foreach ($filesDeleted as $file)
+			{
+				$result = $this->dmslib->removeAll($file['dms_id']);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->outputJson($result);
+			}
+		}
+		return $this->terminateWithSuccess($result);
+	}*/
+
+
+/*	public function deleteNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+		$type = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		//dms_id auslesen aus notizdokument wenn vorhanden
+		$dms_id_arr = [];
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(hasData($result))
+		{
+			$result = getData($result);
+			foreach ($result as $doc) {
+				$dms_id_arr[] = $doc->dms_id;
+			}
+		}
+
+		if($dms_id_arr)
+		{
+			$this->load->library('DmsLib');
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->dmslib->removeAll($dms_id);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+
+				$this->outputJson($result);
+			}
+		}
+
+		//delete Notizzuordnung
+		if($type == "software_id")
+		{
+			// Loads extension Model
+			$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+			$result = $this->ExtensionnotizzuordnungModel->delete([
+				'notiz_id' => $notiz_id,
+				'id' => strval($id)
+				],
+				[
+				'type_id' => $type
+			]);
+
+		}
+		else
+		{
+			//notizzuordnungsid!
+			$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		}
+
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+
+		//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
+
+		//Löschen von Notiz
+		$result = $this->NotizModel->delete(
+			array('notiz_id' => $notiz_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)));
+	}*/
+
+/*	public function loadDokumente()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+		$result = $this->NotizModel->loadWhere(
+			array('public.tbl_notiz.notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}*/
+
+/*	public function getMitarbeiter($searchString)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}*/
+
 	public function isBerechtigt($id, $typeId)
 	{
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
@@ -63,6 +379,7 @@ class Notiz extends Notiz_Controller
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		return success("berechtigt in überschreibender Funktion");
+/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
 	}

-}
+}
@@ -90,15 +90,6 @@ class Projektarbeit extends FHCAPI_Controller

 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);

-		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-	
-	private function fetchProjektarbeitById($projektarbeit_id) {
-		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -106,10 +97,13 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		return $this->ProjektarbeitModel->loadWhere(
+		$result = $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);

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

 	/**
@@ -138,8 +132,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);

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

@@ -287,7 +280,10 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
-		$result = $this->NoteModel->getAllActive();
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+
+		$result = $this->NoteModel->load();

 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);

@@ -25,6 +25,9 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 */
 class Students extends FHCAPI_Controller
 {
+	private $allowedStgs = [];
+
+
 	public function __construct()
 	{
 		$permissions = [];
@@ -32,17 +35,16 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);

-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$allowedStgs) {
+		if (!$this->allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}

 		// Load Libraries
 		$this->load->library('PhrasesLib');
-		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -109,19 +111,23 @@ class Students extends FHCAPI_Controller
 		]);
 		

-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);

-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -129,13 +135,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		

 		$data = $this->getDataOrTerminateWithError($result);

@@ -155,7 +164,10 @@ class Students extends FHCAPI_Controller
 		]);
 		

-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -175,12 +187,14 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);

-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -188,13 +202,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		

 		$data = $this->getDataOrTerminateWithError($result);

@@ -214,18 +231,23 @@ class Students extends FHCAPI_Controller
 		]);
 		

-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);

-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -233,13 +255,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		

 		$data = $this->getDataOrTerminateWithError($result);

@@ -288,6 +313,8 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';

 		$selectRT = "
@@ -304,38 +331,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;

 		
-		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
+		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];

 		if ($orgform_kurzbz) {
-			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
 		}

 		switch ($filter) {
 			case "interessenten":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				break;
 			case "bewerbungnichtabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum'] = null;
 				break;
 			case "bewerbungabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['ps.bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -347,69 +374,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);

-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				
 				if ($stg->typ == 'm') {
-					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
+					$where['zgvmas_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
+						$where['zgvmas_erfuellt'] = true;
 				} elseif ($stg->typ == 'p') {
-					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
+					$where['zgvdoktor_code IS NOT NULL'] = null;
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
+						$where['zgvdoktor_erfuellt'] = true;
 				} else {
-					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
+					$where['zgv_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgv_erfuellt', true);
+						$where['zgv_erfuellt'] = true;
 				}
 				break;
 			case "reihungstestangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$where['ps.status_kurzbz'] = 'Bewerber';
 				break;
 			case "bewerberrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', true);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = true;
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = false;
 				break;
 			case "aufgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
 				break;
 			case "warteliste":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
+				$where['ps.status_kurzbz'] = 'Wartender';
 				break;
 			case "absage":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
+				$where['ps.status_kurzbz'] = 'Incoming';
 				break;
 			case "absolvent":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
+				$where['ps.status_kurzbz'] = 'Absolvent';
 				break;
 			case "diplomand":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
+				$where['ps.status_kurzbz'] = 'Diplomand';
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -417,9 +444,9 @@ class Students extends FHCAPI_Controller
 					 * show all prestudents in this stg who don't have a status
 					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
 					 */
-					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
+					$where['ps.status_kurzbz'] = null;
 				} else {
-					$this->studentlistlib->addWhere('ps.status_kurzbz', [
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -430,19 +457,21 @@ class Students extends FHCAPI_Controller
 				break;
 		}

-		$this->studentlistlib->addSelect("
+		$this->prepareQuery($studiensemester_kurzbz);
+		
+		$this->PrestudentModel->addSelect("
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
 				THEN ps.ausbildungssemester::text 
 				ELSE ''::text 
 			END AS semester", false);
-		$this->studentlistlib->addSelect("'' AS verband");
-		$this->studentlistlib->addSelect("'' AS gruppe");
-
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere($where);

 		$data = $this->getDataOrTerminateWithError($result);

@@ -545,6 +574,7 @@ class Students extends FHCAPI_Controller
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');

 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -552,29 +582,34 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}

-		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
-		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
+		$this->prepareQuery($studiensemester_kurzbz, '');

-		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+
+
+		$where = [];

 		if ($gruppe_kurzbz !== null) {
-			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
-			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
-			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
 		} else {
-			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
+			$where['v.studiengang_kz'] = $studiengang_kz;

 			if ($semester !== null)
-				$this->studentlistlib->addWhere('v.semester', $semester);
+				$where['v.semester'] = $semester;

 			if ($verband !== null)
-				$this->studentlistlib->addWhere('v.verband', $verband);
+				$where['v.verband'] = $verband;

 			if ($gruppe !== null)
-				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
+				$where['v.gruppe'] = $gruppe;
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->studentlistlib->addWhere(
+				$this->PrestudentModel->db->where(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -588,10 +623,9 @@ class Students extends FHCAPI_Controller
 			}
 		}

-
 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere($where);

 		$data = $this->getDataOrTerminateWithError($result);

@@ -618,8 +652,11 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}

-		
-		$this->studentlistlib->addSelect("COALESCE(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -627,15 +664,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
-		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");

+		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);

 		$data = $this->getDataOrTerminateWithError($result);

@@ -662,13 +700,23 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}

+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();
+

-		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
-		

 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);

@@ -696,13 +744,21 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}

+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');

-		$this->studentlistlib->addWhere('p.person_id', $person_id);
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();

-		
 		$this->addFilter($studiensemester_kurzbz);

-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);

@@ -734,8 +790,29 @@ class Students extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
 		$prestudent_ids = [];
 		$student_uids = [];
+			$this->addMeta('data', $data);
 		foreach ($data as $row) {
 			$dataset = json_decode($row->data);
 			if ($row->type == 'prestudent') {
@@ -745,38 +822,197 @@ class Students extends FHCAPI_Controller
 			}
 		}

-
-		$this->studentlistlib->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-
-
 		if ($prestudent_ids && $student_uids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}

-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->load();

 		$data = $this->getDataOrTerminateWithError($result);

 		$this->terminateWithSuccess($data);
 	}

+	/**
+	 * @param string|null	$studiensemester_kurzbz
+	 * @param string		$type
+	 *
+	 * @return void
+	 */
+	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+		$this->load->config('stv');
+
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
+
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->db->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			}
+			$subQueryTag = "
+			  (
+				SELECT
+				  tag.prestudent_id,
+				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+				FROM (
+				  SELECT DISTINCT ON (n.notiz_id)
+					n.notiz_id AS id,
+					nt.typ_kurzbz,
+					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+					n.text AS notiz,
+					nt.style,
+					n.erledigt AS done,
+					nz.prestudent_id
+				  FROM public.tbl_notizzuordnung AS nz
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+				. $whereTags .
+				"
+				) AS tag
+				GROUP BY tag.prestudent_id
+			  ) AS tag_data_agg
+			";
+		}
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			$type
+		);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('foto');
+		$this->PrestudentModel->addSelect('foto_sperre');
+
+		// semester
+		// verband
+		// gruppe
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->PrestudentModel->addSelect("s.matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
+		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+		// priorisierung_relativ
+
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect('unruly');
+
+		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function addSelectPrioRel()
+	{
+		$this->PrestudentModel->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
+	}
+
 	/**
 	 * Adds additional filters to the query
 	 *
@@ -81,7 +81,7 @@ class Bismeldestichtag extends Auth_Controller
 			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
 		);
 		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
-		$this->BismeldestichtagModel->addOrder('semester_start');
+		$this->BismeldestichtagModel->addOrder('semester_start', 'DESC');
 		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
 		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
 		$this->outputJson($this->BismeldestichtagModel->load());
@@ -358,8 +358,7 @@ class AbgabetoolJob extends JOB_Controller
 		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {

 			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
-			$hasContent = false;
-			
+
 			foreach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$assistenzRow = $tupel[1];
@@ -378,7 +377,6 @@ class AbgabetoolJob extends JOB_Controller
 				if(count($relevantAbgaben) == 0) {
 					continue;
 				}
-				$hasContent = true;

 				// Format the Student Name
 				$s = $relevantAbgaben[0];
@@ -449,12 +447,7 @@ class AbgabetoolJob extends JOB_Controller
 			}

 			$abgabenString .= '</div>';
-			
-			// skip send entirely
-			if (!$hasContent) { 
-				continue;
-			}
-			
+
 			// done with building the change list, now send it
 			$assistenzRow = $tupelArr[0][1];
 			$anrede = $assistenzRow->anrede;
@@ -40,13 +40,6 @@ class AntragJob extends JOB_Controller
 	 */
 	public function sendStglSammelmail()
 	{
-
-		if ($this->config->item('abmeldung_enabled') !== true &&
-			$this->config->item('abmeldung_stg_enabled') !== true &&
-			$this->config->item('unterbrechung_enabled') !== true &&
-			$this->config->item('wiederholung_enabled') !== true)
-			return $this->logError('Konnte Job nicht starten: Keine der Configs "abmeldung_stg_enabled", "abmeldung_enabled", "unterbrechung_enabled",  "wiederholung_enabled" auf true gesetzt');
-
 		$this->load->model('person/Person_model', 'PersonModel');

 		$this->logInfo('Start Job sendStglSammelmail');
@@ -54,38 +47,25 @@ class AntragJob extends JOB_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');

 		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
+		$this->db->group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();

-		if ($this->config->item('abmeldung_enabled') === true)
-		{
-			$this->db->group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();

-		if ($this->config->item('abmeldung_stg_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();

-		if ($this->config->item('unterbrechung_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
-
-		if ($this->config->item('wiederholung_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+		$this->db->group_end();

 		$result =  $this->StudierendenantragModel->load();
 		if(isError($result))
@@ -226,10 +206,6 @@ class AntragJob extends JOB_Controller
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
-
-		if ($this->config->item('unterbrechung_enabled') !== true)
-			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_enabled" nicht auf true gesetzt');
-
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');

 		if (!$modifier)
@@ -387,13 +363,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleWiederholerDeadline');

-		if ($this->config->item('wiederholung_enabled') !== true)
-		{
-			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job handleWiederholerDeadline');
-			return;
-		}
-
 		$this->load->library('PrestudentLib');

 		$insertvon = $this->config->item('antrag_job_systemuser');
@@ -512,13 +481,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleAbmeldungenStglDeadline');

-		if ($this->config->item('abmeldung_stg_enabled') !== true)
-		{
-			$this->logError('Config "abmeldung_stg_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
-			return;
-		}
-
 		$insertvon = $this->config->item('antrag_job_systemuser');
 		if (!$insertvon) {
 			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
@@ -652,13 +614,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer');

-		if ($this->config->item('wiederholung_enabled') !== true)
-		{
-			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job sendAufforderungWiederholer');
-			return;
-		}
-
 		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
@@ -5,58 +5,51 @@
 */
 class IssueResolver extends IssueResolver_Controller
 {
-	public function __construct()
-	{
-		parent::__construct();
-
-		// set fehler codes which can be resolved by the job, with own resolver defined
-		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
-		$this->_codeLibMappings = array(
-			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
-			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
-			'CORE_ZGV_0003' => 'CORE_ZGV_0003',
-			'CORE_ZGV_0004' => 'CORE_ZGV_0004',
-			'CORE_ZGV_0005' => 'CORE_ZGV_0005',
-			'CORE_INOUT_0001' => 'CORE_INOUT_0001',
-			'CORE_INOUT_0002' => 'CORE_INOUT_0002',
-			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
-			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
-			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
-			'CORE_INOUT_0006' => 'CORE_INOUT_0006',
-			'CORE_INOUT_0007' => 'CORE_INOUT_0007',
-			'CORE_INOUT_0008' => 'CORE_INOUT_0008',
-			'CORE_INOUT_0009' => 'CORE_INOUT_0009',
-			'CORE_STG_0001' => 'CORE_STG_0001',
-			'CORE_STG_0002' => 'CORE_STG_0002',
-			'CORE_STG_0003' => 'CORE_STG_0003',
-			'CORE_STG_0004' => 'CORE_STG_0004',
-			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
-			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
-			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
-			'CORE_STUDENTSTATUS_0005' => 'CORE_STUDENTSTATUS_0005',
-			'CORE_STUDENTSTATUS_0006' => 'CORE_STUDENTSTATUS_0006',
-			'CORE_STUDENTSTATUS_0007' => 'CORE_STUDENTSTATUS_0007',
-			'CORE_STUDENTSTATUS_0008' => 'CORE_STUDENTSTATUS_0008',
-			'CORE_STUDENTSTATUS_0009' => 'CORE_STUDENTSTATUS_0009',
-			'CORE_STUDENTSTATUS_0010' => 'CORE_STUDENTSTATUS_0010',
-			'CORE_STUDENTSTATUS_0011' => 'CORE_STUDENTSTATUS_0011',
-			'CORE_STUDENTSTATUS_0012' => 'CORE_STUDENTSTATUS_0012',
-			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
-			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
-			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
-			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
-			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
-			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
-			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
-			'CORE_PERSON_0004' => 'CORE_PERSON_0004',
-			'CORE_PERSON_0005' => 'CORE_PERSON_0005',
-			'CORE_PERSON_0006' => 'CORE_PERSON_0006'
-		);
-
-		// fehler which are resolved by the job the same way as they are produced
-		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
-		$this->_codeProducerLibMappings = array(
-			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
-		);
-	}
+	protected $_fehlercodes = array(
+		'CORE_ZGV_0001',
+		'CORE_ZGV_0002',
+		'CORE_ZGV_0003',
+		'CORE_ZGV_0004',
+		'CORE_ZGV_0005',
+		'CORE_INOUT_0001',
+		'CORE_INOUT_0002',
+		'CORE_INOUT_0003',
+		'CORE_INOUT_0004',
+		'CORE_INOUT_0005',
+		'CORE_INOUT_0006',
+		'CORE_INOUT_0007',
+		'CORE_INOUT_0008',
+		'CORE_INOUT_0009',
+		'CORE_STG_0001',
+		'CORE_STG_0002',
+		'CORE_STG_0003',
+		'CORE_STG_0004',
+		'CORE_STUDENTSTATUS_0001',
+		'CORE_STUDENTSTATUS_0002',
+		'CORE_STUDENTSTATUS_0003',
+		'CORE_STUDENTSTATUS_0004',
+		'CORE_STUDENTSTATUS_0005',
+		'CORE_STUDENTSTATUS_0006',
+		'CORE_STUDENTSTATUS_0007',
+		'CORE_STUDENTSTATUS_0008',
+		'CORE_STUDENTSTATUS_0009',
+		'CORE_STUDENTSTATUS_0010',
+		'CORE_STUDENTSTATUS_0011',
+		'CORE_STUDENTSTATUS_0012',
+		'CORE_STUDENTSTATUS_0013',
+		'CORE_STUDENTSTATUS_0014',
+		'CORE_STUDENTSTATUS_0015',
+		'CORE_STUDENTSTATUS_0016',
+		'CORE_STUDENTSTATUS_0018',
+		'CORE_STUDENTSTATUS_0019',
+		'CORE_STUDENTSTATUS_0020',
+		'CORE_STUDENTSTATUS_0021',
+		'CORE_STUDENTSTATUS_0022',
+		'CORE_PERSON_0001',
+		'CORE_PERSON_0002',
+		'CORE_PERSON_0003',
+		'CORE_PERSON_0004',
+		'CORE_PERSON_0005',
+		'CORE_PERSON_0006'
+	);
 }
@@ -6,7 +6,7 @@
 class PlausiIssueProducer extends PlausiIssueProducer_Controller
 {
 	private $_currentStudiensemester;
-	protected $_app = 'core';
+	protected $_apps = 'core';

 	public function __construct()
 	{
@@ -18,12 +18,12 @@ class PlausiIssueProducer extends PlausiIssueProducer_Controller
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');

 		// get current Studiensemester
-		$studiensemesterRes = $this->StudiensemesterModel->getAkt();
+		$studiensemesterRes = $this->StudiensemesterModel->getAktOrNextSemester(62);
 		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;

 		// set fehler which can be produced by the job
 		// structure: fehler_kurzbz => class (library) name for resolving
-		$this->_fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+		$this->_fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
 	}

 	/**
@@ -73,7 +73,7 @@ class Attachment extends FHC_Controller
 			}
 		}

-		$result = $this->dmslib->getOutputFileInfo($dms_id);
+		$result = $this->dmslib->download($dms_id);
 		if (isError($result))
 			return show_error(getError($result));

@@ -28,9 +28,7 @@ class Studierendenantrag extends FHC_Controller
 			'studierendenantrag'
 		]);

-		$this->load->config('studierendenantrag');
-
-		if (strtolower($this->router->method) === 'leitung')
+        if (strtolower($this->router->method) === 'leitung')
        	$this->_isAllowed([
        		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
        	]);
@@ -56,27 +54,18 @@ class Studierendenantrag extends FHC_Controller
 					'bezeichnungStg' => $antrag->bezeichnung,
 					'bezeichnungOrgform' => $antrag->orgform
 				);
+				
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';

-				if ($this->config->item('wiederholung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
-				}
+				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';

-				if ($this->config->item('unterbrechung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
-				}
-
-				if ($this->config->item('abmeldung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
-				}
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
@@ -99,59 +88,45 @@ class Studierendenantrag extends FHC_Controller

 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
-			'stgL' => $stgL,
-			'abmeldung_enabled' => $this->config->item('abmeldung_stg_enabled')
+			'stgL' => $stgL
 		]);
 	}

 	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('abmeldung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Abmeldung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Abmeldung'
+		]);
 	}

 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{

-		if ($this->config->item('abmeldung_stg_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'AbmeldungStgl'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'AbmeldungStgl'
+		]);
 	}

 	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('unterbrechung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Unterbrechung'
-			]);
-		}
-
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Unterbrechung'
+		]);
 	}

 	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('wiederholung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Wiederholung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Wiederholung'
+		]);
 	}

 	/**
@@ -393,7 +393,7 @@ class approveAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);

 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;

 		// Download file
@@ -282,7 +282,7 @@ class approveAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);

 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;

 		// Download file
@@ -150,12 +150,15 @@ class CreateAnrechnung extends Auth_Controller
 		}
 	
 		// Upload document
-		$result = $this->_uploadFile();
+		$result = self::_uploadFile();
 		
-		if (isError($result)) $this->terminateWithJsonError(getError($result));
+		if (isError($result))
+		{
+			$this->terminateWithJsonError($result->retval);
+		}
 		
 		// Hold just inserted DMS ID
-		$lastInsert_dms_id = getData($result)->dms_id;
+		$lastInsert_dms_id = $result->retval['dms_id'];
 		
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
@@ -224,25 +227,17 @@ class CreateAnrechnung extends Auth_Controller
 	 */
 	private function _uploadFile()
 	{
-		// Upload document
-		$uploadDataResult = $this->uploadFile('uploadfile', array('pdf'));
-
-		// If an error occurred while uploading the file
-		if (isError($uploadDataResult)) return $uploadDataResult;
-		if (!hasData($uploadDataResult)) return error('Upload failed');
-
-		// Add file to the DMS (DB + file system)
-		return $this->_ci->dmslib->add(
-			getData($uploadDataResult)['file_name'],
-			getData($uploadDataResult)['file_type'],
-			fopen(getData($uploadDataResult)['full_path'], 'r'),
-			'anrechnung', // kategorie_kurzbz
-			null, // dokument_kurzbz
-			null, // beschreibung
-			false, // cis_suche
-			null, // schlagworte
-			getAuthUID() // insertvon
+		$dms = array(
+			'kategorie_kurzbz'  => 'anrechnung',
+			'version'           => 0,
+			'name'              => $_FILES['uploadfile']['name'],
+			'mimetype'          => $_FILES['uploadfile']['type'],
+			'insertamum'        => (new DateTime())->format('Y-m-d H:i:s'),
+			'insertvon'         => $this->_uid
 		);
+		
+		// Upload document
+		return $this->dmslib->upload($dms, 'uploadfile', array('pdf'));
 	}
 	
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id, $prestudent_id)
@@ -273,4 +268,4 @@ class CreateAnrechnung extends Auth_Controller
 		return false;
 	}
 	
-}
+}
@@ -83,7 +83,7 @@ class requestAnrechnung extends Auth_Controller
 		$is_expired = $this->_isExpired($studiensemester_kurzbz);
 		
 		// Check if Lehrveranstaltung was already graded with application blocking grades
-		$is_blocked = $this->_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
+		$is_blocked = self::_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
 		
 		// Get Anrechung data
 		$anrechnungData = $this->anrechnunglib->getAnrechnungDataByLv($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id);
@@ -152,24 +152,27 @@ class requestAnrechnung extends Auth_Controller
 		$prestudent_id = getData($result)[0]->prestudent_id;
 		
 		// Exit if application already exists
-		if ($this->_applicationExists($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id))
+		if (self::_applicationExists($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id))
 		{
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
 		// Exit if application is a past ( < actual ) studysemester
-		if ($this->_applicationIsPastSS($studiensemester_kurzbz))
+		if (self::_applicationIsPastSS($studiensemester_kurzbz))
 		{
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
 		}
 		
 		// Upload document
-		$result = $this->_uploadFile();
+		$result = self::_uploadFile();

-		if (isError($result)) return $this->outputJsonError(getError($result));
+		if (isError($result))
+		{
+			return $this->outputJsonError($result->retval);
+		}
 		
 		// Hold just inserted DMS ID
-		$lastInsert_dms_id = getData($result)->dms_id;
+		$lastInsert_dms_id = $result->retval['dms_id'];

 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
@@ -179,8 +182,8 @@ class requestAnrechnung extends Auth_Controller
 			$begruendung_id,
 			$lastInsert_dms_id,
 			$anmerkung,
-			$begruendung_ects,
-			$begruendung_lvinhalt
+            $begruendung_ects,
+            $begruendung_lvinhalt
 		);
 		
 		if (isError($result))
@@ -212,11 +215,11 @@ class requestAnrechnung extends Auth_Controller
 		$this->_checkIfEntitledToReadDMSDoc($dms_id);

 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id);
-		if (isError($download)) return $download;
+        $download = $this->dmslib->download($dms_id);
+        if (isError($download)) return $download;

-		// Download file
-		$this->outputFile(getData($download));
+        // Download file
+        $this->outputFile(getData($download));
 	}

 	/**
@@ -364,25 +367,16 @@ class requestAnrechnung extends Auth_Controller
 	 */
 	private function _uploadFile()
 	{
-		// Upload document
-		$uploadDataResult = $this->uploadFile('uploadfile', array('pdf'));
-
-		// If an error occurred while uploading the file
-		if (isError($uploadDataResult)) return $uploadDataResult;
-		// If an error occurred while uploading the file
-		if (!hasData($uploadDataResult)) return error('Upload failed');
-
-		// Add file to the DMS (DB + file system)
-		return $this->_ci->dmslib->add(
-			getData($uploadDataResult)['file_name'],
-			getData($uploadDataResult)['file_type'],
-			fopen(getData($uploadDataResult)['full_path'], 'r'),
-			'anrechnung',
-			null, // dokument_kurzbz
-			null, // beschreibung
-			false, // cis_suche
-			null, // schlagworte
-			getAuthUID() // insertvon
+		$dms = array(
+			'kategorie_kurzbz'  => 'anrechnung',
+			'version'           => 0,
+			'name'              => $_FILES['uploadfile']['name'],
+			'mimetype'          => $_FILES['uploadfile']['type'],
+			'insertamum'        => (new DateTime())->format('Y-m-d H:i:s'),
+			'insertvon'         => $this->_uid
 		);
+
+		// Upload document
+		return $this->dmslib->upload($dms, 'uploadfile', array('pdf'));
 	}
 }
@@ -237,7 +237,7 @@ class reviewAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);

 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;

 		// Download file
@@ -196,7 +196,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);

 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;

 		// Download file
@@ -1,5 +1,6 @@
+<?php
 /**
- * Copyright (C) 2026 fhcomplete.org
+ * 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
@@ -15,12 +16,42 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-export default {
-	getAllStudienSemester(studiensemester, studiengang, semester, studienplan) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/Studium/getStudienAllSemester/',
-			params: {studiensemester, studiengang, semester, studienplan}
-		};
-	},
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class CLI_Manager extends CLI_Controller
+{
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load libraries
+		$this->load->library('FehlerUpdateLib');
+	}
+
+		/**
+	 *
+	 */
+	public function installAll()
+	{
+		$this->fehlerupdatelib->installAll();
+	}
+
+	/**
+	 *
+	 */
+	public function installFromCore()
+	{
+		$this->fehlerupdatelib->installFromCore();
+	}
+
+	/**
+	 *
+	 */
+	public function installFrom($extensionName)
+	{
+		$this->fehlerupdatelib->installFrom(urldecode($extensionName));
+	}
 }
@@ -0,0 +1,46 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class Manager extends Auth_Controller
+{
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'installAll' => 'admin:rw',
+				'installFromCore' => 'admin:rw'
+			)
+		);
+
+		// Load libraries
+		$this->load->library('FehlerUpdateLib');
+	}
+
+	/**
+	 *
+	 */
+	public function installAll()
+	{
+		$this->fehlerupdatelib->installAll();
+	}
+
+	/**
+	 *
+	 */
+	public function installFromCore()
+	{
+		$this->fehlerupdatelib->installFromCore();
+	}
+
+	/**
+	 *
+	 */
+	public function installFrom($fehlerConfigDirectory)
+	{
+		$this->fehlerupdatelib->installFrom($fehlerConfigDirectory);
+	}
+}
@@ -179,7 +179,6 @@ class InfoCenter extends Auth_Controller
 		// Loads libraries
 		$this->load->library('PersonLogLib');
 		$this->load->library('WidgetLib');
-		$this->load->library('AkteLib');

 		$this->load->config('infocenter');

@@ -453,7 +452,8 @@ class InfoCenter extends Auth_Controller

 		if (isset($akte_id) && isset($person_id))
 		{
-			$akte = $this->aktelib->getByAkteId($akte_id);
+			$this->load->library('AkteLib');
+			$akte = $this->aktelib->get($akte_id);

 			if (hasData($akte))
 			{
@@ -1169,6 +1169,8 @@ class InfoCenter extends Auth_Controller
 	 */
 	public function outputAkteContent($akte_id)
 	{
+		$this->load->library('DmsLib');
+
 		$akte = $this->AkteModel->load($akte_id);

 		if (isError($akte))
@@ -1176,7 +1178,7 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($akte));
 		}

-		$aktecontent = $this->aktelib->getByAkteId($akte_id);
+		$aktecontent = $this->dmslib->getAkteContent($akte_id);

 		if (isError($aktecontent))
 		{
@@ -2466,4 +2468,4 @@ class InfoCenter extends Auth_Controller

 		$this->outputJsonSuccess("Success");
 	}
-}
+}
@@ -88,9 +88,11 @@ class IssuesKonfiguration extends Auth_Controller

 		// get all Fehler, optionally filtered by app
 		$params = array('fehlercode_extern' => null);
+		$this->FehlerModel->addDistinct();
 		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertyp_kurzbz, fehlertext');
+		$this->FehlerModel->addJoin('system.tbl_fehler_app', 'fehlercode');
 		$this->FehlerModel->addOrder('fehlercode');
-		if (!isEmptyString($app)) $params['app'] = $app;
+		if (!isEmptyString($app)) $params['tbl_fehler_app.app'] = $app;
 		$fehlerRes = $this->FehlerModel->loadWhere($params);

 		if (isError($fehlerRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerLaden'));
@@ -69,10 +69,7 @@ class IssuesZustaendigkeiten extends Auth_Controller
 	{
 		$app = $this->input->get('app');

-		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertext, fehlertyp_kurzbz, app');
-		$this->FehlerModel->addOrder('fehlercode');
-
-		$fehlerRes = isset($app) ? $this->FehlerModel->loadWhere(array('app' => $app)) : $this->FehlerModel->load();
+		$fehlerRes = $this->FehlerModel->getByApps($app);

 		$this->outputJson($fehlerRes);
 	}
@@ -5,6 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 class Plausichecks extends Auth_Controller
 {
 	const GENERIC_ISSUE_OCCURED_TEXT = 'Issue aufgetreten';
+	const APPS = ['core', 'dvuh', 'bis'];

 	public function __construct()
 	{
@@ -16,8 +17,7 @@ class Plausichecks extends Auth_Controller
 		);

 		// Load libraries
-		$this->load->library('issues/PlausicheckProducerLib', array('app' => 'core'));
-		$this->load->library('issues/PlausicheckDefinitionLib');
+		$this->load->library('issues/PlausicheckProducerLib', array('apps' => self::APPS));
 		$this->load->library('WidgetLib');

 		// Load models
@@ -46,37 +46,31 @@ class Plausichecks extends Auth_Controller

 		// issues array for passing issue texts
 		$allIssues = array();
-		// all fehler kurzbz which are going to be checked
-		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckdefinitionlib->getFehlerKurzbz();
-		$fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+
+		$fehler_kurzbz_arr = isEmptyString($fehler_kurzbz) ? array_keys($this->plausicheckproducerlib->getFehlerMappings()) : [$fehler_kurzbz];
+
+		$this->FehlerModel->addOrder('fehler_kurzbz, fehlercode');
+		$this->FehlerModel->db->where_in('fehler_kurzbz', $fehler_kurzbz_arr);
+		$fehlerRes = $this->FehlerModel->load();
+
+		if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
+		if (!hasData($fehlerRes)) return $this->outputJsonSuccess([]);
+
+		// all fehler which are going to be checked
+		$fehlerArr = getData($fehlerRes);
+
 		// set Studiengang to null if not passed
 		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;

 		// get the data returned by Plausicheck
-		foreach ($fehlerKurzbz as $fehler_kurzbz)
+		foreach ($fehlerArr as $fehler)
 		{
-			// get Text and fehlercode of the Fehler
-			$this->FehlerModel->addSelect('fehlercode, fehlertext, fehlertyp_kurzbz');
-			$fehlerRes = $this->FehlerModel->loadWhere(array('fehler_kurzbz' => $fehler_kurzbz));
-
-			if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
-
-			// do not check error if no data
-			if (!hasData($fehlerRes)) continue;
-
-			// get the error data
-			$fehler = getData($fehlerRes)[0];
-
 			// initialize issue array
-			$allIssues[$fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
-
-			// get library name for producing issue
-			$libName = $fehlerLibMappings[$fehler_kurzbz];
+			$allIssues[$fehler->fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());

 			// execute the check
 			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$libName,
-				$fehler_kurzbz,
+				$fehler->fehler_kurzbz,
 				array(
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'studiengang_kz' => $studiengang_kz
@@ -107,7 +101,7 @@ class Plausichecks extends Auth_Controller
 						{
 							// replace placeholder with params, if present
 							if (count($fehlertext_params) != substr_count($fehlerText, '%s'))
-								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler_kurzbz);
+								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler->fehler_kurzbz);

 							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
 						}
@@ -118,7 +112,7 @@ class Plausichecks extends Auth_Controller
 						$issueObj = new StdClass();
 						$issueObj->fehlertext = $fehlerText;
 						$issueObj->type = $fehlerTyp;
-						$allIssues[$fehler_kurzbz]['data'][] = $issueObj;
+						$allIssues[$fehler->fehler_kurzbz]['data'][] = $issueObj;
 					}
 					else // if no issue text found, use generic text
 					{
@@ -157,7 +151,7 @@ class Plausichecks extends Auth_Controller

 		if (isError($studiengaengeRes)) show_error(getError($studiengaengeRes));

-		$fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$fehlerKurzbz = array_keys($this->plausicheckproducerlib->getFehlerMappings());

 		$db = new DB_Model();

@@ -168,7 +162,9 @@ class Plausichecks extends Auth_Controller
 			FROM
 				system.tbl_fehler
 			WHERE
-				fehler_kurzbz IN ?',
+				fehler_kurzbz IN ?
+			ORDER BY
+				fehler_kurzbz, fehlercode',
 			array($fehlerKurzbz)
 		);

@@ -184,6 +180,8 @@ class Plausichecks extends Auth_Controller
 			}
 		}

+		ksort($fehlerKurzbzCodeMappings);
+
 		return array(
 			'semester' => hasData($studiensemesterRes) ? getData($studiensemesterRes) : array(),
 			'currsemester' => hasData($currSemRes) ? getData($currSemRes) : array(),
@@ -136,77 +136,37 @@ abstract class FHC_Controller extends CI_Controller
 	/**
 	 * To download the given file represented by the fileObj parameter.
 	 * fileObj has the following structure:
-	 * 	$fileObj->file OR $fileObj->file_content
+	 * 	$fileObj->filename
+	 * 	$fileObj->file
 	 * 	$fileObj->name
 	 * 	$fileObj->mimetype
-	 * 	$fileObj->disposition (inline OR attachment)
+	 * 	$fileObj->disposition
 	 */
 	protected function outputFile($fileObj)
 	{
 		// If the file exists
-		if ((isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
-		|| (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content)))
+		if (isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
 		{
-			$content_length = 0;
-
-			// If file content has been provided
-			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
-			{
-				$content_length = strlen($fileObj->file_content);
-			}
-			else // otherwise the path + name of the file
-			{
-				$content_length = filesize($fileObj->file);
-			}
-
 			header('Content-Description: File Transfer');
 			header('Content-Type: '. $fileObj->mimetype);
-			header('Content-Length: ' . $content_length);
-			header('Content-Transfer-Encoding: binary');
-			header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
-			header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-			header('Expires: ' . date("D, d M Y H:i:s", time()));
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
 			header('Pragma: public');
+			header('Content-Length: ' . filesize($fileObj->file));

-			// Clean the output buffer
-			flush();
-
-			// If file content has been provided
-			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
+			if (isset($fileObj->disposition)
+				&& ($fileObj->disposition == 'inline' || $fileObj->disposition == 'attachment'))
 			{
-				echo $fileObj->file_content;
-			}
-			else // otherwise get the content from file system
-			{
-				readfile($fileObj->file);
+				header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
 			}

-			// Terminate the execution
-			exit();
+			readfile($fileObj->file); // reads the file content to the output buffer
+		}
+		else
+		{
+			// Otherwise print an error
+			show_error('The provided file does not exist: '.(isset($fileObj->file) ? $fileObj->file : 'file not given'));
 		}
-
-		// Otherwise return an error
-		show_error('The provided file does not exist or file content is empty');
-	}
-
-	/**
-	 *
-	 */
-	protected function outputImageByContent($mimetype, $file_content)
-	{
-		if (isEmptyString($file_content)) show_error('The provided file content is not valid');
-
-		$this->_outputImage($mimetype, $file_content);
-	}
-
-	/**
-	 *
-	 */
-	protected function outputImageByFile($mimetype, $file_name)
-	{
-		if (!file_exists($file_name)) show_error('The provided file does not exist');
-
-		$this->_outputImage($mimetype, null, $file_name);
 	}

 	/**
@@ -218,29 +178,6 @@ abstract class FHC_Controller extends CI_Controller
 		return json_decode($this->input->raw_input_stream);
 	}

-	/**
-	 * Utility function to upload a file
-	 * - post_field_name: the name of the field in the HTTP POST payload, this is also the index in the super global $_FILES array
-	 * - allowed_types: a list of file extensions that are allowed to be uploaded (ex. array('pdf', 'odt') or array('jpg', 'jpeg', 'gif')
-	 */
-	protected function uploadFile($post_field_name, $allowed_types = array('*'))
-	{
-		$this->load->library(
-			'upload',
-			array(
-				'upload_path' => sys_get_temp_dir(),
-				'allowed_types' => $allowed_types,
-				'overwrite' => true
-			)
-		);
-
-		// If the upload was a success then return the uploaded file info
-		if ($this->upload->do_upload($post_field_name)) return success($this->upload->data());
-
-		// If an error occurred then return it without tags
-		return error($this->upload->display_errors('', ''));
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods

@@ -256,44 +193,5 @@ abstract class FHC_Controller extends CI_Controller
 			show_error('This web site cannot work correctly without the HTTPS protocol enabled');
 		}
 	}
-
-	/**
-	 *
-	 */
-	private function _outputImage($mimetype, $file_content = null, $file_name = null)
-	{
-		$content_length = 0;
-
-		// If file content has been provided
-		if ($file_content != null)
-		{
-			$content_length = strlen($file_content);
-		}
-		else // otherwise the path + name of the file
-		{
-			$content_length = filesize($file_name);
-		}
-
-		header('Content-Type: '. $mimetype);
-		header('Content-Length: ' . $content_length);
-		header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-		header('Expires: ' . date("D, d M Y H:i:s", time()));
-
-		// Clean the output buffer
-		flush();
-
-		// If file content has been provided
-		if ($file_content != null)
-		{
-			echo $file_content;
-		}
-		else // otherwise get the content from file system
-		{
-			readfile($file_name);
-		}
-
-		// Terminate the execution
-		exit();
-	}
 }

@@ -5,11 +5,8 @@
 */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
-	protected $_codeLibMappings = [];
-
-	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
-	protected $_codeProducerLibMappings = [];
+	// codes of fehler to be resolved
+	protected $_fehlercodes = [];

 	public function __construct()
 	{
@@ -24,25 +21,18 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
+		// initialize librariy with provided fehlercodes
 		$this->load->library(
 			'issues/PlausicheckResolverLib',
 			[
-				'extensionName' => $this->_extensionName ?? null,
-				'codeLibMappings' => $this->_codeLibMappings,
-				'codeProducerLibMappings' => $this->_codeProducerLibMappings
+				'fehlercodes' => $this->_fehlercodes
 			]
 		);

 		$this->logInfo("Issue resolve job started");

-		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
-		);
-
-		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
-
-		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
+		// resolve the issues
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues();

 		// log if error, or log info if inserted new issue
 		foreach ($result->errors as $error) $this->logError($error);
@@ -196,39 +196,26 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$dms_id_arr = [];
 		foreach ($_FILES as $k => $file)
 		{
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
 			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 			//Todo define in dms component: readFile, downloadFile
-			$uploadDataResult = $this->uploadFile($k);
-			if (isError($uploadDataResult))
+			$result = $this->dmslib->upload($dms, $k, ['*']);
+			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
+			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if (!hasData($uploadDataResult))
-			{
-				$this->db->trans_rollback();
-				$this->terminateWithError('Upload failed', self::ERROR_TYPE_GENERAL);
-			}
-
-			// Add file to the DMS (DB + file system)
-			$addResult = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'notiz', // kategorie_kurzbz
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-
-			// If error occurred
-			if (isError($addResult) || !hasData($addResult))
-				$this->terminateWithError(getError($addResult), self::ERROR_TYPE_GENERAL);
-
-			$dms_id_arr[] = getData($addResult)->dms_id;
+			$dms_id_arr[] = $result->retval['dms_id'];
 		}

 		//save entry in Notizdokument
@@ -332,40 +319,22 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			}
 			else
 			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
 				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 				//Todo define in dms component: readFile, downloadFile
-				$uploadDataResult = $this->uploadFile($k);
-				if (isError($uploadDataResult))
-				{
-					$this->db->trans_rollback();
-					$this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
-				}
-				if (!hasData($uploadDataResult))
-				{
-					$this->db->trans_rollback();
-					$this->terminateWithError('Upload failed', self::ERROR_TYPE_GENERAL);
-				}
+				$result = $this->dmslib->upload($dms, $k, array('*'));

-				// Add file to the DMS (DB + file system)
-				$addResult = $this->dmslib->add(
-					getData($uploadDataResult)['file_name'],
-					getData($uploadDataResult)['file_type'],
-					fopen(getData($uploadDataResult)['full_path'], 'r'),
-					'notiz', // kategorie_kurzbz
-					null, // dokument_kurzbz
-					null, // beschreibung
-					false, // cis_suche
-					null, // schlagworte
-					getAuthUID() // insertvon
-				);
-
-				// If error occurred
-				if (isError($addResult) || !hasData($addResult))
-					$this->terminateWithError(getError($addResult), self::ERROR_TYPE_GENERAL);
-
-				$addResult = $this->getDataOrTerminateWithError($addResult);
-				$dms_id = $addResult['dms_id'];
+				$result = $this->getDataOrTerminateWithError($result);
+				$dms_id = $result['dms_id'];

 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));

@@ -5,14 +5,23 @@
 */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerLibMappings = [];
-	protected $_app;
+	protected $_fehlerKurzbz = [];
+	protected $_apps = [];
+
+	/**
+	 * Runs issue production job.
+	 */
+	public function run()
+	{
+		// producing issues
+		$this->producePlausicheckIssues(array());
+	}

 	protected function producePlausicheckIssues($params)
 	{
 		$this->load->library(
 			'issues/PlausicheckProducerLib',
-			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
+			['apps' => $this->_apps, 'fehlerKurzbz' => $this->_fehlerKurzbz]
 		);

 		$this->logInfo("Plausicheck issue producer job started");
@@ -418,10 +418,10 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 if (!function_exists('array_is_list')) {
    function array_is_list(array $arr)
    {
-	if ($arr === []) {
-	    return true;
-	}
-	return array_keys($arr) === range(0, count($arr) - 1);
+        if ($arr === []) {
+            return true;
+        }
+        return array_keys($arr) === range(0, count($arr) - 1);
    }
 }

@@ -1,21 +1,12 @@
 <?php

-/* Copyright (C) 2025 fhcomplete.net
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+/**
+ * FH-Complete
 *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2022 fhcomplete.net
+ * @license             GPLv3
 */

 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -130,32 +121,90 @@ class AkteLib
 	 * Gets akte data and associated dms data by akte Id
 	 * Returns success with akte and dms data or error
 	 */
-	public function getByAkteId($akte_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
+	public function get($akte_id)
 	{
-		return $this->_get(
-			$akte_id,
-			null, // person_id
-			$dokument_kurzbz,
-			$archiv,
-			$signiert,
-			$stud_selfservice
-		);
+		// get Akte data
+		$this->_ci->AkteModel->addSelect('person_id, dokument_kurzbz, mimetype, erstelltam, titel, bezeichnung,
+											gedruckt, uid, dms_id, nachgereicht, nachgereicht_am, anmerkung,
+											ausstellungsnation, formal_geprueft_amum, archiv, signiert,
+											stud_selfservice, akzeptiertamum, insertvon, insertamum, updatevon, updateamum');
+		$this->_ci->AkteModel->load($akte_id);
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		if (isError($akteResult)) return $akteResult;
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$resultObject = getData($akteResult)[0];
+
+		// set properties with same name in Akte and Dms table
+		$resultObject->akte_mimetype = $resultObject->mimetype;
+
+		// get dms data
+		$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
+
+		if (isError($dmsResult)) return $dmsResult;
+
+		// properties to retrieve from dms
+		$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte', DmsLib::FILE_CONTENT_PROPERTY);
+
+		// set dms properties
+		if (hasData($dmsResult))
+		{
+			$dmsData = getData($dmsResult);
+
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
+			}
+		}
+		else
+		{
+			// set null if no dms result found
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = null;
+			}
+		}
+
+		// return the object containing akte and dms data
+		return success($resultObject);
 	}

 	/**
 	 * Gets Akte data and associated dms data by person Id and dokument_kurzbz
 	 * Returns success with result array with akte and dms data or error
 	 */
-	public function getByPersonId($person_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
+	public function getByPersonIdAndDocumentType($person_id, $dokument_kurzbz)
 	{
-		return $this->_get(
-			null, // akte_id
-			$person_id,
-			$dokument_kurzbz,
-			$archiv,
-			$signiert,
-			$stud_selfservice
+		// load all Akte entries for given person and dokument_kurzbz
+		$this->_ci->AkteModel->addSelect('akte_id');
+		$akteResult = $this->_ci->AkteModel->loadWhere(
+			array(
+				'person_id' => $person_id,
+				'dokument_kurzbz' => $dokument_kurzbz
+			)
 		);
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$akteData = getData($akteResult);
+
+		$resultArr = array();
+
+		// for each found akte entry
+		foreach ($akteData as $akte)
+		{
+			// get dms and akte data from akte Id
+			$getAkteDmsResult = $this->get($akte->akte_id);
+
+			if (isError($getAkteDmsResult)) return $getAkteDmsResult;
+
+			$resultArr[] = getData($getAkteDmsResult);
+		}
+
+		// return all found entries
+		return success($resultArr);
 	}

 	/**
@@ -164,184 +213,56 @@ class AkteLib
 	 */
 	public function remove($akte_id)
 	{
-		return $this->_remove($akte_id, null, null);
-	}
-
-	/**
-	 * Removes Akte by $person_id and $dms_id, removes all associated dms entries and versions, and deletes all associated files
-	 * Returns success with removed version numbers or error
-	 */
-	public function removeByPersonIdAndDmsId($person_id, $dms_id)
-	{
-		return $this->_remove(null, $person_id, $dms_id);
-	}
-
-	/**
-	 *
-	 */
-	private function _get($akte_id = null, $person_id = null, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
-	{
-		$dbModel = new DB_Model();
-
-		$query = 'SELECT akte_id,
-				person_id,
-				dokument_kurzbz,
-				inhalt,
-				CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden,
-				mimetype,
-				erstelltam,
-				gedruckt,
-				titel,
-				bezeichnung,
-				updateamum,
-				updatevon,
-				insertamum,
-				insertvon,
-				uid,
-				dms_id,
-				nachgereicht,
-				anmerkung,
-				titel_intern,
-				anmerkung_intern,
-				nachgereicht_am,
-				ausstellungsnation,
-				formal_geprueft_amum,
-				archiv,
-				signiert,
-				stud_selfservice,
-				akzeptiertamum
-			FROM public.tbl_akte
-			WHERE TRUE';
-
-		// Query parameters
-		$paramArray = array();
-
-		// akte_id
-		if (is_numeric($akte_id) || is_array($akte_id))
-		{
-			$paramArray[] = $akte_id;
-			if (is_numeric($akte_id)) $query .= ' AND akte_id = ?';
-			if (is_array($akte_id)) $query .= ' AND akte_id IN ?';
-		}
-
-		// person_id
-		if (is_numeric($person_id) || is_array($person_id))
-		{
-			$paramArray[] = $person_id;
-			if (is_numeric($person_id)) $query .= ' AND person_id = ?';
-			if (is_array($person_id)) $query .= ' AND person_id IN ?';
-		}
-
-		// dokument_kurzbz
-		if (!isEmptyString($dokument_kurzbz))
-		{
-			$paramArray[] = $dokument_kurzbz;
-			$query .= ' AND dokument_kurzbz = ?';
-		}
-
-		// archiv
-		if (is_bool($archiv))
-		{
-			$paramArray[] = $archiv;
-			$query .= ' AND archiv = ?';
-		}
-
-		// signiert
-		if (is_bool($signiert))
-		{
-			$paramArray[] = $signiert;
-			$query .= ' AND signiert = ?';
-		}
-
-		// stud_selfservice
-		if (is_bool($stud_selfservice))
-		{
-			$paramArray[] = $stud_selfservice;
-			$query .= ' AND stud_selfservice = ?';
-		}
-
-		// If no parameters has been provided exit
-		if (isEmptyArray($paramArray)) return error('Called without giving any parameter');
-
-		// Loads data from DB
-		$akteResult = $dbModel->execReadOnlyQuery($query, $paramArray);
-
-		// If error or data not found then exit
-		if (isError($akteResult)) return $akteResult;
-		if (!hasData($akteResult)) return error('Akte not found');
-
-		// For each record from the akte
-		foreach (getData($akteResult) as $resultObject)
-		{
-			// get dms data
-			$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
-
-			if (isError($dmsResult)) return $dmsResult;
-
-			// properties to retrieve from dms
-			$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte');
-
-			// set dms properties
-			if (hasData($dmsResult))
-			{
-				$dmsData = getData($dmsResult)[0];
-
-				foreach ($dmsProperties as $dmsProperty)
-				{
-					// If the property is _not_ 'mimetype' _or_
-					// If the mimetype from the akte table is null then overwrite it with the one from the DMS
-					if ($dmsProperty != 'mimetype' || ($dmsProperty == 'mimetype' && $resultObject->{$dmsProperty} == null))
-					{
-						$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
-					}
-				}
-			}
-			else
-			{
-				// Set null if no dms result found
-				foreach ($dmsProperties as $dmsProperty)
-				{
-					if ($dmsProperty != 'mimetype') $resultObject->{$dmsProperty} = null;
-				}
-			}
-		}
-
-		// return the object containing akte and dms data
-		return success(getData($akteResult));
-	}
-
-	/**
-	 * Removes Akte by akte Id, person id and/or dms id
-	 * Removes all associated dms entries and versions, and deletes all associated files
-	 * Returns success with removed version numbers or error
-	 */
-	private function _remove($akte_id = null, $person_id = null, $dms_id = null)
-	{
-		// Get dms_id for akte
-		$this->_ci->AkteModel->addSelect('akte_id');
+		// get dms_id for akte
 		$this->_ci->AkteModel->addSelect('dms_id');
-
-		$paramArray = array();
-
-		if (is_numeric($akte_id)) $paramArray['akte_id'] = $akte_id;
-		if (is_numeric($person_id)) $paramArray['person_id'] = $person_id;
-		if (is_numeric($dms_id)) $paramArray['dms_id'] = $dms_id;
-
-		$akteResult = $this->_ci->AkteModel->loadWhere($paramArray);
+		$akteResult = $this->_ci->AkteModel->load($akte_id);

 		if (isError($akteResult)) return $akteResult;

-		if (!hasData($akteResult)) return error('Akte not found');
+		if (!hasData($akteResult)) return error("Akte not found");

-		// Delete Akte
-		$deleteResult = $this->_ci->AkteModel->delete(getData($akteResult)[0]->akte_id);
+		$dms_id = getData($akteResult)[0]->dms_id;
+		$error = null;

-		if (isError($deleteResult)) return $deleteResult;
+		// Start DB transaction to avoid deleting only part of the data
+		$this->_ci->db->trans_begin();

-		// Remove all dms entry for dms of the akte
-		$removeAllResult = $this->_ci->dmslib->removeAll(getData($akteResult)[0]->dms_id);
+		// delete Akte
+		$deleteResult = $this->_ci->AkteModel->delete($akte_id);

-		return $removeAllResult;
+		if (isError($deleteResult))
+		{
+			$error = $deleteResult;
+		}
+		else
+		{
+			// remove all dms entry for dms of the akte
+			$removeAllResult = $this->_ci->dmslib->removeAll($dms_id);
+
+			if (isError($removeAllResult))
+				$error = $removeAllResult;
+		}
+
+		// Transaction complete!
+		$this->_ci->db->trans_complete();
+
+		// Check if everything went ok during the transaction
+		if ($this->_ci->db->trans_status() === false || isset($error))
+		{
+			$this->_ci->db->trans_rollback();
+
+			// return occured error
+			if (isset($error))
+				return $error;
+			else
+				return error("Error occured when deleting, rolled back");
+		}
+		else
+		{
+			$this->_ci->db->trans_commit();
+
+			// return removed dms entry data
+			return $removeAllResult;
+		}
 	}
 }
-
@@ -1657,7 +1657,7 @@ class AntragLib

 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
 		if (isError($result))
-			return $result;
+		return $result;

 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
@@ -1709,7 +1709,6 @@ class AntragLib
 		$result->statustyp = $antrag->statustyp;
 		$result->status_insertvon = $antrag->status_insertvon;
 		$result->grund = $antrag->grund;
-		$result->status_grund = $antrag->status_grund;
 		$result->studierendenantrag_id = $antrag->studierendenantrag_id;
 		$result->typ = $antrag->typ;
 		$result->datum = $antrag->datum;
@@ -1,21 +1,12 @@
 <?php

-/* Copyright (C) 2025 fhcomplete.net
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+/**
+ * FH-Complete
 *
+ * @package		FHC-Helper
+ * @author		FHC-Team
+ * @copyright		Copyright (c) 2022 fhcomplete.net
+ * @license		GPLv3
 */

 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -24,17 +15,24 @@ use \stdClass as stdClass;

 class DmsLib
 {
-	const DMS_SYS_NAME = 'DMS System';
+	const FILE_CONTENT_PROPERTY = 'file_content'; // property name for file content

 	private $_ci; // code igniter instance
+	private $_who; // who added this document

 	/**
 	 * Object initialization
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance();

+		// Set the the _who property
+		$this->_who = 'DMS system'; // default
+		// It is possible to set it using the who parameter
+		if (!isEmptyArray($params) && isset($params['who']) && !isEmptyString($params['who'])) $this->_who = $params['who'];
+
+		$this->_ci->load->model('crm/Akte_model', 'AkteModel'); // deprecated, should not be used here!
 		$this->_ci->load->model('content/Dms_model', 'DmsModel');
 		$this->_ci->load->model('content/DmsVersion_model', 'DmsVersionModel');
 		$this->_ci->load->model('content/DmsFS_model', 'DmsFSModel');
@@ -48,85 +46,69 @@ class DmsLib
 	 * Returns success info of added dms entry (dms_id, version, filename) or error
 	 */
 	public function add(
-		// Required parameters
-		$name, $mimetype, $fileHandle,
-		// Optional parameters
-		$kategorie_kurzbz = null, $dokument_kurzbz = null, $beschreibung = null, $cis_suche = false, $schlagworte = null, $insertvon = self::DMS_SYS_NAME
+		$name, $mimetype, $fileHandle, // Required parameters
+		$kategorie_kurzbz = null, $dokument_kurzbz = null, $beschreibung = null, $cis_suche = false, $schlagworte = null
 	)
 	{
-		// If the file handle is not valid
-		if ($fileHandle === false) return error('Was not possible to open the given file');
+			// create unique filename, using original document name to detect file extension
+			$filename = $this->_getUniqueFilename($name);

-		// Create unique filename, using original document name to detect file extension
-		$filename = $this->_getUniqueFilename($name);
+			// copy file from fileHandle to dms folder
+			$copyFileResult = $this->_copyFile($fileHandle, $filename);

-		// Copy file from fileHandle to dms folder
-		$copyFileResult = $this->_copyFile($fileHandle, $filename);
+			if (isError($copyFileResult)) return $copyFileResult;

-		// If an error occrured while copying the file
-		if (isError($copyFileResult)) return $copyFileResult;
-
-		// Insert the new DMS
-		$dmsResult = $this->_ci->DmsModel->insert(
-			array(
-				'kategorie_kurzbz' => $kategorie_kurzbz,
-				'dokument_kurzbz' => $dokument_kurzbz
-			)
-		);
-
-		// If an error occurred
-		if (isError($dmsResult)) return $dmsResult;
-
-		// If a DMS in the previous insert returned the new PK value
-		if (hasData($dmsResult))
-		{
-			$dms_id = getData($dmsResult);
-
-			// Insert the DMS version
-			$dmsVersion = array(
-				'dms_id' => $dms_id,
-				'version' => 0,
-				'filename' => $filename,
-				'mimetype' => $mimetype,
-				'name' => $name,
-				'beschreibung' => $beschreibung,
-				'cis_suche' => $cis_suche,
-				'schlagworte' => $schlagworte,
-				'insertvon' => $insertvon,
-				'insertamum' => date('Y-m-d H:i:s')
+			// if file written successful, insert dms
+			$dmsResult = $this->_ci->DmsModel->insert(
+				array(
+					'kategorie_kurzbz' => $kategorie_kurzbz,
+					'dokument_kurzbz' => $dokument_kurzbz
+				)
 			);

-			$dmsVersionResult = $this->_ci->DmsVersionModel->insert($dmsVersion);
+			if (isError($dmsResult)) return $dmsResult;

-			// If an error occured
-			if (isError($dmsVersionResult)) return $dmsVersionResult;
+			if (hasData($dmsResult))
+			{
+				$dms_id = getData($dmsResult);
+				$version = 0;

-			// Return dms info
-			$resObj = new stdClass();
-			$resObj->dms_id = $dms_id;
-			$resObj->version = 0;
-			$resObj->filename = $filename;
+				// insert dms version
+				$dmsVersion = array(
+					'dms_id' => $dms_id,
+					'version' => $version,
+					'filename' => $filename,
+					'mimetype' => $mimetype,
+					'name' => $name,
+					'beschreibung' => $beschreibung,
+					'cis_suche' => $cis_suche,
+					'schlagworte' => $schlagworte,
+					'insertvon' => $this->_who,
+					'insertamum' => date('Y-m-d H:i:s')
+				);

-			return success($resObj);
-		}
-		else
-			return success();
+				$dmsVersionResult = $this->_ci->DmsVersionModel->insert($dmsVersion);
+
+				if (isError($dmsVersionResult)) return $dmsVersionResult;
+
+				// return dms info
+				$resObj = new stdClass();
+				$resObj->dms_id = $dms_id;
+				$resObj->version = $version;
+				$resObj->filename = $filename;
+
+				return success($resObj);
+			}
+			else
+				return error("error when inserting DMS");
 	}

 	/**
 	 * Writes a new file with content of fileHandle, adds a new dms version (max version number + 1) for the written file
 	 * Returns success with info of added dms version (version, filename) or error
 	 */
-	public function addNewVersion(
-		// Required parameters
-		$dms_id, $fileHandle,
-		// Optional parameters
-		$name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null, $insertvon = self::DMS_SYS_NAME
-	)
+	public function addNewVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
 	{
-		// If the file handle is not valid
-		if ($fileHandle === false) return error('Was not possible to open the given file');
-
 		// get the latest version
 		$lastVersionResult = $this->getLastVersion($dms_id);

@@ -159,7 +141,7 @@ class DmsLib
 				'beschreibung' => isset($beschreibung) ? $beschreibung : $lastVersion->beschreibung,
 				'cis_suche' => isset($cis_suche) ? $cis_suche : $lastVersion->cis_suche,
 				'schlagworte' => isset($schlagworte) ? $schlagworte : $lastVersion->schlagworte,
-				'insertvon' => $insertvon,
+				'insertvon' => $this->_who,
 				'insertamum' => date('Y-m-d H:i:s')
 			);

@@ -175,7 +157,7 @@ class DmsLib
 			return success($resObj);
 		}
 		else
-			return success();
+			return error("last version not found");
 	}

 	/**
@@ -185,9 +167,6 @@ class DmsLib
 	 */
 	public function updateLastVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
 	{
-		// If the file handle is not valid
-		if ($fileHandle === false) return error('Was not possible to open the given file');
-
 		// get the latest version
 		$lastVersionResult = $this->getLastVersion($dms_id);

@@ -229,12 +208,12 @@ class DmsLib
 			return success($resObj);
 		}
 		else
-			return success();
+			return error("last version not found");
 	}

 	/**
 	 * Gets dms version with highest number
-	 * Returns success with dms data or error
+	 * Returns success with dms data and fileHandle with file content or error
 	 */
 	public function getLastVersion($dms_id)
 	{
@@ -258,12 +237,12 @@ class DmsLib
 			return $this->getVersion($dms_id, $lastDmsVersion);
 		}
 		else
-			return success();
+			return error("Dms last version not found");
 	}

 	/**
 	 * Gets specified dms version
-	 * Returns success with dms data or error
+	 * Returns success with dms data and fileHandle with file content or error
 	 */
 	public function getVersion($dms_id, $version)
 	{
@@ -275,7 +254,34 @@ class DmsLib
 			)
 		);

-		return $dmsVersionResult;
+		if (isError($dmsVersionResult)) return $dmsVersionResult;
+
+		if (hasData($dmsVersionResult))
+		{
+			$dmsVersion = getData($dmsVersionResult)[0];
+
+			// get file content as file pointer
+			$fileHandleResult = $this->_ci->DmsFSModel->openRead($dmsVersion->filename);
+
+			if (isError($fileHandleResult)) return $fileHandleResult;
+
+			if (hasData($fileHandleResult))
+			{
+				$fileHandle = getData($fileHandleResult);
+				$dmsVersion->{self::FILE_CONTENT_PROPERTY} = $fileHandle;
+
+				// close file pointer
+				$closeResult = $this->_ci->DmsFSModel->close($fileHandle);
+
+				if (isError($closeResult)) return $closeResult;
+
+				return success($dmsVersion);
+			}
+			else
+				return error("File could not be opened");
+		}
+		else
+			return error("Dms version not found");
 	}

 	/**
@@ -414,34 +420,6 @@ class DmsLib
 		return success($removeVersionResultObj);
 	}

-	/**
-	 * Get info from the DMS to be provided to the FHC_Controller->outputFile
-	 */
-	public function getOutputFileInfo($dms_id, $file_name = '', $disposition = 'attachment')
-	{
-		// Loads the last DMS version from database
-		$lastVersionResult = $this->getLastVersion($dms_id);
-
-		// If an error occurred then return it
-		if (isError($lastVersionResult)) return $lastVersionResult;
-
-		// If has been found
-		if (hasData($lastVersionResult))
-		{
-			$lastVersion = getData($lastVersionResult)[0];
-
-			$fileObj = new stdClass();
-			$fileObj->file = DMS_PATH.$lastVersion->filename;
-			$fileObj->name = isEmptyString($file_name) ? $lastVersion->name : $file_name;
-			$fileObj->mimetype = $lastVersion->mimetype;
-			$fileObj->disposition = $disposition;
-
-			return success($fileObj);
-		}
-
-		return success();
-	}
-
 	// -----------------------------------------------------------------------------------------------------------
 	// Private methods

@@ -496,5 +474,432 @@ class DmsLib

 		return $uniqueFilename;
 	}
-}

+	// -----------------------------------------------------------------------------------------------------------
+	// Deprecated methods, not to be used
+
+	/**
+	 * Load a DMS Document.
+	 * If no version is particularly given, the latest version is loaded.
+	 *
+	 * @param $dms_id
+	 * @param integer $version
+	 * @return array
+	 */
+	public function load($dms_id, $version = null)
+	{
+		if (is_numeric($dms_id))
+		{
+			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+			$this->_ci->DmsModel->addOrder('version', 'DESC');
+			$this->_ci->DmsModel->addLimit(1);
+
+			if (!is_numeric($version))
+			{
+				return $this->_ci->DmsModel->load($dms_id);
+			}
+			else
+			{
+				return $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
+			}
+		}
+
+		return error('The parameter DMS ID must be a number');
+	}
+
+	/**
+	 * Read a DMS Document from the Filesystem
+	 * @param int $dms_id ID of the Document.
+	 * @param int $version The version of the Document (latest if null).
+	 * @return object success or error
+	 */
+	public function read($dms_id, $version = null)
+	{
+		$result = error('Wrong dms_id parameter');
+
+		if (isset($dms_id))
+		{
+			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+			$this->_ci->DmsModel->addOrder('version', 'DESC');
+			$this->_ci->DmsModel->addLimit(1);
+
+			if (!isset($version))
+			{
+				$result = $this->_ci->DmsModel->load($dms_id);
+			}
+			else
+			{
+				$result = $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
+			}
+
+			// If a dms has been found
+			if (hasData($result))
+			{
+				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[0]->filename);
+				if (isError($resultFS)) return $resultFS; // if an error occurred return it
+
+				$result->retval[0]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get all accepted Documents of a Person
+	 *
+	 * @param int $person_id ID of the person.
+	 * @param string $dokument_kurzbz Type of document.
+	 * @param bool $no_file If null then loads also the content.
+	 * @return object success or error
+	 */
+	public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null, $no_file = null)
+	{
+		$result = $this->_ci->AkteModel->getAktenAcceptedDms($person_id, $dokument_kurzbz);
+
+		if (hasData($result) && $no_file == null)
+		{
+			for ($i = 0; $i < count(getData($result)); $i++)
+			{
+				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[$i]->filename);
+				if (isError($resultFS)) return $resultFS; // if an error occurred return it
+
+				$result->retval[$i]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Uploads a document and saves it to DMS
+	 * @param $dms DMS assoc array
+	 * @param $field_name  Name of the HTML uploadfile input name attribute
+	 * @param array $allowed_types Default: all. Param example: array(jpg, pdf)
+	 * @return array
+	 */
+	public function upload($dms, $field_name, $allowed_types = array('*'))
+	{
+		// Init upload configs
+		$this->_loadUploadLibrary($allowed_types);
+
+		if (!$this->_ci->upload->do_upload($field_name))
+		{
+			return error($this->_ci->upload->display_errors());
+		}
+
+		$upload_data = $this->_ci->upload->data();  // data about the uploaded file
+
+		// Insert to DMS table
+		$insDmsResult = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
+		if (isError($insDmsResult)) return $insDmsResult;
+
+		$upload_data['dms_id'] = getData($insDmsResult);
+		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
+			$dms['mimetype'] = $upload_data['file_type'];
+
+		// Insert DMS version
+		$insVersionResult = $this->_ci->DmsVersionModel->insert(
+			$this->_ci->DmsVersionModel->filterFields(
+				$dms,
+				$upload_data['dms_id'],
+				$upload_data['file_name']
+			)
+		);
+		if (isError($insVersionResult)) return $insVersionResult;
+
+		// Return result of uploaded data
+		return success($upload_data);
+	}
+
+	/**
+	 * Download a document.
+	 *
+	 * @param $dms_id
+	 * @param string $filename $filename If String is given, it will be used as filename on download
+	 * @param string $disposition [inline | attachment]
+	 *        Inline opens doc in new tab. Attachment displays download dialog box.
+	 */
+	public function download($dms_id, $filename = null, $disposition = 'inline')
+	{
+		// Retrieves info about the given dms
+		$fileInfoResult = $this->getFileInfo($dms_id);
+		if (isError($fileInfoResult)) return error(getError($fileInfoResult));
+
+		// If data have been found
+		if (hasData($fileInfoResult))
+		{
+			$fileObj = getData($fileInfoResult);
+
+			// Change filename, if filename is provided
+			if (!isEmptyString($filename)) $fileObj->name = $filename;
+
+			// Add file disposition if disposition has a valid value
+			if ($disposition == 'attachment' || $disposition == 'inline')
+			{
+				$fileObj->disposition = $disposition;
+			}
+
+			return success($fileObj);
+		}
+
+		// If no data have been found then return an empty success
+		return success();
+	}
+
+	/**
+	 * Get file information.
+	 *
+	 * @param $dms_id
+	 * @param integer $version
+	 * @return array with File Object.
+	 */
+	public function getFileInfo($dms_id, $version = null)
+	{
+		// Checks the dms_id parameter
+		if (!is_numeric($dms_id)) return error('Wrong parameter');
+
+		// Load DMS from database
+		$result = $this->load($dms_id, $version);
+		if (isError($result)) return error(getError($result));
+
+		// If data have been found
+		if (hasData($result))
+		{
+			// Store file information in fileObj
+			$fileObj = new stdClass();
+			$fileObj->filename = getData($result)[0]->filename;
+			$fileObj->file = DMS_PATH.getData($result)[0]->filename;
+			$fileObj->name = getData($result)[0]->name;   // original user filename
+			$fileObj->mimetype = getData($result)[0]->mimetype;
+
+			return success($fileObj);
+		}
+
+		// If no data have been found return an empty success
+		return success();
+	}
+
+	/**
+	 * Saves a Document
+	 * @param object $dms DMS Object ot be saved.
+	 * @return object
+	 */
+	public function save($dms)
+	{
+		$result = null;
+
+		if (isset($dms['new']) && $dms['new'] == true)
+		{
+			// Remove new parameter to avoid DB insert errors
+			unset($dms['new']);
+
+			$result = $this->_saveFileOnInsert($dms);
+			if (isSuccess($result))
+			{
+				$filename = getData($result);
+				if (isset($dms['dms_id']) && $dms['dms_id'] != '')
+				{
+					$result = $this->_ci->DmsVersionModel->insert(
+						$this->_ci->DmsVersionModel->filterFields($dms, $dms['dms_id'], $filename)
+					);
+				}
+				else
+				{
+					$result = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
+					if (isSuccess($result))
+					{
+						$result = $this->_ci->DmsVersionModel->insert(
+							$this->_ci->DmsVersionModel->filterFields($dms, getData($result), $filename)
+						);
+					}
+				}
+			}
+		}
+		else
+		{
+			$result = $this->_saveFileOnUpdate($dms);
+			if (isSuccess($result))
+			{
+				$result = $this->_ci->DmsModel->update($dms['dms_id'], $this->_ci->DmsModel->filterFields($dms));
+				if (isSuccess($result))
+				{
+					$result = $this->_ci->DmsVersionModel->update(
+						array(
+							$dms['dms_id'],
+							$dms['version']
+						),
+						$this->_ci->DmsVersionModel->filterFields($dms)
+					);
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Deletes a Akte of a Person
+	 * @param int $person_id ID of the person.
+	 * @param int $dms_id Id of the Document.
+	 * @return object
+	 */
+	public function delete($person_id, $dms_id)
+	{
+		$result = null;
+
+		// If the parameters are valid
+		if (is_numeric($person_id) && is_numeric($dms_id))
+		{
+			// Start DB transaction
+			$this->_ci->db->trans_start(false);
+
+			// Get akte_id from table tbl_akte
+			$result = $this->_ci->AkteModel->loadWhere(array('person_id' => $person_id, 'dms_id' => $dms_id));
+			if (isSuccess($result))
+			{
+				// Delete all entries in tbl_akte
+				for ($i = 0; $i < count(getData($result)); $i++)
+				{
+					$this->_ci->AkteModel->delete(getData($result)[$i]->akte_id);
+				}
+
+				// Get all filenames related to this dms
+				$resultFileNames = $this->_ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id));
+				if (isSuccess($resultFileNames))
+				{
+					// Delete from tbl_dms_version
+					$result = $this->_ci->DmsVersionModel->delete(array('dms_id' => $dms_id));
+					if (isSuccess($result))
+					{
+						// Delete from tbl_dms
+						$result = $this->_ci->DmsModel->delete($dms_id);
+					}
+				}
+			}
+
+			// Transaction complete!
+			$this->_ci->db->trans_complete();
+
+			// Check if everything went ok during the transaction
+			if ($this->_ci->db->trans_status() === false || isError($result))
+			{
+				$this->_ci->db->trans_rollback();
+				$result = error('An error occurred while performing a delete operation', EXIT_ERROR);
+			}
+			else
+			{
+				$this->_ci->db->trans_commit();
+				$result = success('Dms successfully removed from DB');
+			}
+
+			// If everything is ok
+			if (isSuccess($result))
+			{
+				// Remove all files related to this person and dms
+				for ($i = 0; $i < count(getData($resultFileNames)); $i++)
+				{
+					$this->_ci->DmsFSModel->removeBase64(getData($resultFileNames)[$i]->filename);
+				}
+			}
+		}
+		else
+		{
+			$result = error('Invalid parameters');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Loads the Content of an akte
+	 * @param int $akte_id Id of the akte.
+	 * @return object with document content or error
+	 */
+	public function getAkteContent($akte_id)
+	{
+		$akte = $this->_ci->AkteModel->load($akte_id);
+		if (hasData($akte))
+		{
+			if (getData($akte)[0]->inhalt != '')
+			{
+				return success(base64_decode(getData($akte)[0]->inhalt));
+			}
+			elseif (getData($akte)[0]->dms_id != '')
+			{
+				$dmscontent = $this->read(getData($akte)[0]->dms_id);
+				if (isSuccess($dmscontent))
+				{
+					return success(base64_decode(getData($dmscontent)[0]->file_content));
+				}
+				else
+				{
+					return error(getError($dmscontent));
+				}
+			}
+			else
+			{
+				return error('No Content available');
+			}
+		}
+		else
+		{
+			return error(getError($akte));
+		}
+	}
+
+	/**
+	 * Saves the Content of a DMS in the Filesystem
+	 * @param object $dms DMS object to be saved.
+	 * @return object
+	 */
+	private function _saveFileOnInsert($dms)
+	{
+		$filename = uniqid().'.'.pathinfo($dms['name'], PATHINFO_EXTENSION);
+
+		$result = $this->_ci->DmsFSModel->writeBase64($filename, $dms['file_content']);
+		if (isSuccess($result))
+		{
+			$result = success($filename);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Updates the File in the Filesystem
+	 * @param object $dms DMS object to update.
+	 * @return object
+	 */
+	private function _saveFileOnUpdate($dms)
+	{
+		$result = null;
+
+		if (isset($dms['version']))
+		{
+			$result = $this->read($dms['dms_id'], $dms['version']);
+
+			if (hasData($result))
+			{
+				$result = $this->_ci->DmsFSModel->writeBase64(getData($result)[0]->filename, $dms['file_content']);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Loads the upload library of CI
+	 */
+	private function _loadUploadLibrary($allowed_types)
+	{
+		$config = array();
+		$config['upload_path'] = DMS_PATH;
+		$config['allowed_types'] = implode('|', $allowed_types);
+		$config['overwrite'] = true;
+		$config['file_name'] = uniqid().'.pdf';
+
+		$this->_ci->load->library('upload', $config);
+		$this->_ci->upload->initialize($config);
+	}
+}
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 fhcomplete.net
+/* Copyright (C) 2024 fhcomplete.net
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as
@@ -34,11 +34,15 @@ use SimpleXMLElement as SimpleXMLElement;
 * modifiing said data (sign()/setXMLTag_archivierbar()) or adding
 * images (addImage()) and then call output() and close().
 * Now the create, output and close functions are combined into one function and adding data and images is done via parameters.
+ * There are now two functions getContent() and showContent() where showContent() equals to output(false) and getContent equals to output(true)
 * Instead of calling addDataArray, addDataXML or addDataURL just call
 * getDataArray, getDataXML or getDataURL respectevily and use the return
- * value as $xml_data parameter in the getContent call.
+ * value as $xml_data parameter in the showContent and getContent calls.
 * Instead of calling addImages just create an array and pass it as $images
- * parameter to the getContent function.
+ * parameter to the showContent/getContent function.
+ * The old setFilename() function is now a parameter in showContent(). It is
+ * not needed in getContent() since that function does not do anything that
+ * requires a filename.
 * To get/show a signed document just pass a valid uid as $sign_user
 * parameter.
 *
@@ -59,10 +63,21 @@ use SimpleXMLElement as SimpleXMLElement;
 * 	'name' => $imagename,
 * 	'contenttype' => $imagecontenttype
 * ]];
+ * $this->documentexportlib->showContent(
+ * 	$filename,
+ * 	$vorlage,
+ * 	$xml_data,
+ * 	$oe_kurzbz,
+ * 	$version,
+ * 	$outputformat,
+ * 	null,
+ * 	null,
+ * 	$images
+ * );
 */
 class DocumentExportLib
 {
-	private $_ci;
+	private $unoconv_version;

 	/**
 	 * Constructor
@@ -70,14 +85,33 @@ class DocumentExportLib
 	public function __construct()
 	{
 		// Gets CI instance
-		$this->_ci =& get_instance();
+		$this->ci =& get_instance();

-		// Load phrases
-		$this->_ci->load->library('PhrasesLib', ['document_export', null], 'DocumentExportPhrases');
+		// Load Phrases
+		$this->ci->load->library('PhrasesLib', ['document_export', null], 'documentExportPhrases');

-		// Load libraries
-		$this->_ci->load->library('DocumentLib');
-		$this->_ci->load->library('SignatureLib');
+		// Which document converter has to be used
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+		{
+			// Use docsbox!!
+		}
+		else
+		{
+			exec('unoconv --version', $ret_arr);
+
+			if(isset($ret_arr[0]))
+			{
+				$hlp = explode(' ', $ret_arr[0]);
+				if(isset($hlp[1]))
+				{
+					$this->unoconv_version = $hlp[1];
+				}
+				else
+					show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv_version"));
+			}
+			else
+				show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv"));
+		}
 	}

 	/**
@@ -138,7 +172,7 @@ class DocumentExportLib
 		$xml_data = new DOMDocument;

 		if (!$xml_data->load($xml_url))
-			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_xml_load", [
+			return error($this->ci->documentExportPhrases->t("document_export", "error_xml_load", [
 				"url" => $xml_url,
 				"xml" => $xml,
 				"params" => $params
@@ -202,7 +236,7 @@ class DocumentExportLib

 		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);

-		$createResult = $this->createAndSignContent(
+		$result = $this->createAndSignContent(
 			$temp_folder,
 			$outputformat,
 			$vorlage,
@@ -213,26 +247,118 @@ class DocumentExportLib
 			$sign_user,
 			$sign_profile
 		);
-		if (isError($createResult)) {
+		if (isError($result)) {
 			$this->close($temp_folder, $source_folder);
-			return $createResult;
+			return $result;
 		}
-		$temp_filename = getData($createResult);
+		$temp_filename = getData($result);

 		$fsize = filesize($temp_filename);
 		$handle = fopen($temp_filename, 'r');
 		if (!$handle)
-			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_file_load"));
-		$fileContentResult = fread($handle, $fsize);
+			return error($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+		$result = fread($handle, $fsize);
 		fclose($handle);

 		$this->close($temp_folder, $source_folder);

-		return success($fileContentResult);
+		return success($result);
 	}

 	/**
-	 * Helper function for getContent
+	 * Sets the headers and displays the Document.
+	 * On failure the exit() function will be called
+	 *
+	 * @param string				$filename
+	 * @param stdClass				$vorlage A db entry from tbl_vorlage
+	 * @param DomDocument			$xml_data
+	 * @param string				$oe_kurzbz
+	 * @param integer|null			$version (optional)
+	 * @param string				$outputformat (optional)
+	 * @param string				$sign_user (optional) Must be a valid uid
+	 * @param string				$sign_profile (optional) Signatureprofile for signing
+	 * @param array					$images (optional) Each element should have a property path, name & contenttype which are all strings
+	 *
+	 * @return void
+	 */
+	public function showContent(
+		$filename,
+		$vorlage,
+		$xml_data,
+		$oe_kurzbz,
+		$version = null,
+		$outputformat = null,
+		$sign_user = null,
+		$sign_profile = null,
+		$images = []
+	) {
+		$source_folder = getcwd();
+		$temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
+
+		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
+
+		$result = $this->createAndSignContent(
+			$temp_folder,
+			$outputformat,
+			$vorlage,
+			$oe_kurzbz,
+			$version,
+			$xml_data,
+			$images,
+			$sign_user,
+			$sign_profile
+		);
+		if (isError($result)) {
+			$this->close($temp_folder, $source_folder);
+			exit(getError($result));
+		}
+		$temp_filename = getData($result);
+
+		$fsize = filesize($temp_filename);
+		$handle = fopen($temp_filename, 'r');
+		if (!$handle) {
+			$this->close($temp_folder, $source_folder);
+			exit($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+		}
+
+		if (headers_sent()) {
+			$this->close($temp_folder, $source_folder);
+			exit($this->ci->documentExportPhrases->t("document_export", "error_headers"));
+		}
+
+		switch ($outputformat) {
+			case 'pdf':
+				header('Content-type: application/pdf');
+				header('Content-Disposition: attachment; filename="' . $filename . '.pdf"');
+				header('Content-Length: ' . $fsize);
+				break;
+
+			case 'doc':
+				header('Content-type: application/vnd.ms-word');
+				header('Content-Disposition: attachment; filename="' . $filename . '.doc"');
+				header('Content-Length: ' . $fsize);
+				break;
+
+			case 'odt':
+				header('Content-type: application/vnd.oasis.opendocument.text');
+				header('Content-Disposition: attachment; filename="' . $filename . '.odt"');
+				header('Content-Length: ' . $fsize);
+				break;
+			default:
+				$this->close($temp_folder, $source_folder);
+				exit($this->ci->documentExportPhrases->t("document_export", "error_outputformat_missing"));
+		}
+
+		while (!feof($handle)) {
+			echo fread($handle, 8192);
+		}
+		fclose($handle);
+
+		$this->close($temp_folder, $source_folder);
+	}
+
+	/**
+	 * Helper function for getContent and showContent.
 	 * Creates the temp folder and calls create and sign functions.
 	 *
 	 * @param string				$temp_folder
@@ -261,13 +387,13 @@ class DocumentExportLib
 		mkdir($temp_folder);
 		chdir($temp_folder);

-		$this->_ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+		$this->ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');

-		$result = $this->_ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
+		$result = $this->ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_template_missing"));
+			return error($this->ci->documentExportPhrases->t("document_export", "error_template_missing"));
 		$vorlage_stg = current(getData($result));
 		foreach ($vorlage_stg as $k => $v)
 			$vorlage->$k = $v;
@@ -311,7 +437,7 @@ class DocumentExportLib
 	{
 		$content_xsl = new DOMDocument();
 		if (!$content_xsl->loadXML($vorlage->text))
-			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_xsl_load"));
+			return error($this->ci->documentExportPhrases->t("document_export", "error_xsl_load"));

 		$proc = new XSLTProcessor();
 		$proc->importStyleSheet($content_xsl);
@@ -328,7 +454,7 @@ class DocumentExportLib
 		if ($vorlage->style) {
 			$styles_xsl = new DOMDocument();
 			if (!$styles_xsl->loadXML($vorlage->style))
-				return error($this->_ci->DocumentExportPhrases->t("document_export", "error_styles_load"));
+				return error($this->ci->documentExportPhrases->t("document_export", "error_styles_load"));
 			$style_proc = new XSLTProcessor();
 			$style_proc->importStyleSheet($styles_xsl);

@@ -356,7 +482,7 @@ class DocumentExportLib
 		$tempname_zip = $temp_folder . '/out.zip';

 		if (!copy($zipfile, $tempname_zip))
-			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_file_copy"));
+			return error($this->ci->documentExportPhrases->t("document_export", "error_file_copy"));

 		exec("zip $tempname_zip content.xml");
 		if (!is_null($styles_xsl))
@@ -376,7 +502,7 @@ class DocumentExportLib

 			$manifest_xml = new DOMDocument;
 			if (!$manifest_xml->loadXML($manifest))
-				return error($this->_ci->DocumentExportPhrases->t("document_export", "error_manifest"));
+				return error($this->ci->documentExportPhrases->t("document_export", "error_manifest"));

 			//root-node holen
 			$root = $manifest_xml->getElementsByTagName('manifest')->item(0);
@@ -403,16 +529,42 @@ class DocumentExportLib

 		clearstatcache();

-		$temp_filename = $temp_folder . '/out.' . $outputformat;
 		switch ($outputformat) {
 			case 'pdf':
 			case 'doc':
-				$converResult = $this->_ci->documentlib->convert($tempname_zip, $temp_filename, $outputformat);
+				$ret = 0;
+				$temp_filename = $temp_folder . '/out.' . $outputformat;

-				if (isError($converResult))
-					return error($this->_ci->DocumentExportPhrases->t('document_export', 'error_conv_timeout'));
+				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true) {
+					// Use docsbox
+
+					$this->ci->load->library("DocsboxLib");
+
+					$docboxlib = get_class($this->ci->docboxlib);
+
+					$ret = $docboxlib::convert($tempname_zip, $temp_filename, $outputformat);
+				} else {
+					// Use unoconv
+
+					// Unoconv Version 0.6 hat eine Bug wodurch die Berechtigungen des PDF/Doc nicht korrekt gesetzt
+					// werden. Deshalb wird dies hier speziell behandelt.
+					// Die 2. Variante hat den Vorteil dass hier eine bessere Fehlerbehandlung moeglich ist
+					if ($this->unoconv_version == '0.6')
+						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . '  %2$s > %1$s';
+					else
+						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . ' --output %s %s 2>&1';
+
+					$command = sprintf($command, $temp_filename, $tempname_zip);
+
+					exec($command, $out, $ret);
+				}
+
+				if ($ret)
+					return error($this->ci->documentExportPhrases->t("document_export", "error_conv_timeout"));
 				break;
 			case 'odt':
+			default:
+				$temp_filename = $tempname_zip;
 		}

 		return success($temp_filename);
@@ -432,15 +584,63 @@ class DocumentExportLib
 	 */
 	protected function sign($temp_folder, $temp_filename, $outputformat, $user, $profile)
 	{
-		if ($outputformat != 'pdf') return error($this->_ci->DocumentExportPhrases->t('document_export', 'error_sign_pdf'));
+		if ($outputformat != 'pdf')
+			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_pdf"));

-		$signed_filename = $this->_ci->signaturelib->sign($temp_folder, $temp_filename, $user, $profile);
+		// Load the File
+		$file_data = file_get_contents($temp_filename);

-		// If fine then return it
-		if (isSuccess($signed_filename)) return $signed_filename;
+		$data = new stdClass();
+		$data->document = base64_encode($file_data);

-		// Otherwise it is an error
-		return error($this->_ci->DocumentExportPhrases->t('global', 'unknown_error', ['error' => getError($signed_filename)]));
+		// Signatur Profil
+		if (!is_null($profile))
+			$data->profile = $profile;
+		else
+			$data->profile = SIGNATUR_DEFAULT_PROFILE;
+
+		// Username des Endusers der die Signatur angefordert hat
+		$data->user = $user;
+
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_URL, SIGNATUR_URL . '/' . SIGNATUR_SIGN_API);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 7);
+		curl_setopt($ch, CURLOPT_USERAGENT, "FH-Complete");
+
+		// SSL Zertifikatsprüfung deaktivieren
+		// Besser ist es das Zertifikat am Server zu installieren!
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+		$data_string = json_encode($data, JSON_FORCE_OBJECT);
+
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, [
+			'Content-Type: application/json',
+			'Content-Length:' . mb_strlen($data_string),
+			'Authorization: Basic ' . base64_encode(SIGNATUR_USER . ":" . SIGNATUR_PASSWORD)
+		]);
+
+		$result = curl_exec($ch);
+		if (curl_errno($ch)) {
+			curl_close($ch);
+			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_timeout"));
+		}
+		curl_close($ch);
+		$resultdata = json_decode($result);
+
+		// If it is success
+		if (isset($resultdata->error) && $resultdata->error == 0) {
+			$signed_filename = $temp_folder . '/signed.pdf';
+			file_put_contents($signed_filename, base64_decode($resultdata->retval));
+			return success($signed_filename);
+		}
+
+		// otherwise if it is an error
+		return error($resultdata->retval ?? $this->ci->documentExportPhrases->t("global", "unknown_error", ["error" => $result]));
 	}

 	/**
@@ -517,4 +717,3 @@ class DocumentExportLib
 		return 'pdf';
 	}
 }
-
@@ -4,8 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');

 class DocumentLib
 {
-	private $_ci;
-	private $_unoconv_version;
+	private $unoconv_version;

 	/**
 	 * Constructor
@@ -13,10 +12,7 @@ class DocumentLib
 	public function __construct()
 	{
 		// Gets CI instance
-		$this->_ci =& get_instance();
-
-		// Load phrases
-		$this->_ci->load->library('PhrasesLib', ['document_export', null], 'DocumentExportPhrases');
+		$this->ci =& get_instance();

 		// Which document converter has to be used
 		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
@@ -32,13 +28,13 @@ class DocumentLib
 				$hlp = explode(' ', $ret_arr[0]);
 				if(isset($hlp[1]))
 				{
-					$this->_unoconv_version = $hlp[1];
+					$this->unoconv_version = $hlp[1];
 				}
 				else
-					show_error($this->_ci->DocumentExportPhrases->t('document_export', 'error_unoconv_version'));
+					show_error('Could not get Unoconv Version');
 			}
 			else
-				show_error($this->_ci->DocumentExportPhrases->t('document_export', 'error_unoconv'));
+				show_error('Unoconv not found - Please install Unoconv');
 		}
 	}

@@ -60,7 +56,7 @@ class DocumentLib
 			case 'image/jpeg':
 			case 'image/jpg':
 			case 'image/pjpeg':
-				$this->_jpegToPdf($filename, $outFile);
+				$this->_jpegtopdf($filename, $outFile);
 				return success($outFile);
 			case 'application/vnd.oasis.opendocument.spreadsheet':
 			case 'application/msword':
@@ -76,19 +72,23 @@ class DocumentLib
 				else
 				{
 					// Unoconv Version 0.6 seems to fail on converting TXT Files
-					if ($this->_unoconv_version == '0.6') return error('Unoconv Version 0.6 does not convert TXT Files correctly');
+					if ($this->unoconv_version == '0.6')
+						return error();
 				}

-				// Convertion
 				$ret = $this->convert($filename, $outFile, 'pdf');
-				if(isSuccess($ret)) return success($outFile);
-
-				// Error
-				return $ret;
+				if(isSuccess($ret))
+				{
+					return success($outFile);
+				}
+				else
+				{
+					return error(getError($ret));
+				}
 			case 'application/pdf':
 				return success($filename);
 			default:
-				return error('Unknown Mimetype:' . $mimetype);
+				return error('Unknown Mimetype:'.$mimetype);
 		}
 	}

@@ -101,20 +101,20 @@ class DocumentLib
 	 */
 	public function mergePDF($files, $outFile)
 	{
-		$cmd = 'gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$outFile ';
+		$cmd = "gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$outFile ";
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);

 		// add all pdf files to the command
 		foreach ($files as $f)
 		{
-			$cmd .= $f.' ';
+			$cmd .= $f." ";
 			if (!file_exists($f))
 			{
 				return error("File not found: '$f'");
 			}
-			if (finfo_file($finfo, $f) != 'application/pdf')
+			if (finfo_file($finfo, $f) != "application/pdf")
 			{
-				return error('Wrong format('.finfo_file($finfo, $f)."): '$f'");
+				return error("Wrong format(".finfo_file($finfo, $f)."): '$f'");
 			}
 		}

@@ -144,13 +144,13 @@ class DocumentLib
 		// If it is set to use docsbox
 		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
 		{
-			require_once(dirname(__FILE__).'/DocsboxLib.php');
+			require_once(dirname(__FILE__).'/../application/libraries/DocsboxLib.php');

 			$ret = DocsboxLib::convert($inFile, $outFile, $format);
 		}
 		else // otherwise use unoconv
 		{
-			if ($this->_unoconv_version == '0.6')
+			if ($this->unoconv_version == '0.6')
 				$command = 'unoconv -f %1$s  %3$s > %2$s';
 			else
 				$command = 'unoconv -f %s --output %s %s 2>&1';
@@ -175,7 +175,7 @@ class DocumentLib
 	 * @param string $outfile Path to Output (pdf) File.
 	 * @return success or error object
 	 */
-	private function _jpegToPdf($filename, $outfile)
+	private function _jpegtopdf($filename, $outfile)
 	{
 		if (!file_exists($filename))
 			return error('File does not exists');
@@ -230,4 +230,3 @@ class DocumentLib
 		return true;
 	}
 }
-
@@ -0,0 +1,382 @@
+<?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 FehlerUpdateLib
+{
+	// Who adds phrases into the database
+	const UPSERT_BY = 'FehlerUpdate';
+
+	const CONFIG_DIRECTORY = 'config';
+	const CONFIG_FEHLER_NAME = 'fehler';
+	const CONFIG_FEHLER_INDEX = 'fehler';
+
+	const TYPE_STRING = 'string';
+	const TYPE_ARRAY = 'array';
+
+	//~ // Array elements names
+	const FEHLERCODE = 'fehlercode';
+	const FEHLER_KURZBZ = 'fehler_kurzbz';
+	const FEHLERTEXT = 'fehlertext';
+	const FEHLERTYP_KURZBZ = 'fehlertyp_kurzbz';
+	const APP = 'app';
+	const FEHLERCODE_EXTERN = 'fehlercode_extern';
+
+	// structure of a fehler
+	// type default: string
+	const FEHLER_ATTRIBUTES = [
+		self::FEHLERCODE => ['required' => true],
+		self::FEHLER_KURZBZ  => ['required' => false],
+		self::FEHLERTEXT => ['required' => true, 'updateable' => false],
+		self::FEHLERTYP_KURZBZ => ['required' => false, 'updateable' => true],
+		self::APP => ['required' => true, 'types' => [self::TYPE_STRING, self::TYPE_ARRAY]],
+		self::FEHLERCODE_EXTERN => ['required' => false]
+	];
+
+	private $_ci; // Code igniter instance
+	private $_updateHistory = [];
+
+	/**
+	 * Loads parser library
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		// Loads EPrintfLib
+		$this->_ci->load->library('EPrintfLib');
+
+		// Loads the Models
+		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
+		$this->_ci->load->model('system/App_model', 'AppModel');
+
+		// Loads extensions lib
+		$this->_ci->load->library('ExtensionsLib');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * Install all possible fehler, from core and extensions
+	 */
+	public function installAll()
+	{
+		$this->installFromCore();
+
+		// load fehler entries of extensions
+		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
+
+		if (hasData($extensions))
+		{
+			$extensionArray = array();
+
+			$extensionsData = getData($extensions);
+
+			foreach ($extensionsData as $ext)
+			{
+				$this->installFrom($ext->name);
+			}
+		}
+	}
+
+	/**
+	 * Install fehler from the core
+	 */
+	public function installFromCore()
+	{
+		$this->_installFehler();
+	}
+
+	/**
+	 * Install fehler from the given path
+	 */
+	public function installFrom($extensionName)
+	{
+		if (!isset($extensionName))
+		{
+			$this->_ci->eprintflib->printError('Extension name missing!');
+			return;
+		}
+
+		$this->_installFehler(ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName.'/'.FehlerUpdateLib::CONFIG_FEHLER_NAME);
+
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Install fehler from the given directory
+	 */
+	private function _installFehler($fehlerConfigDirectory = null)
+	{
+		// check that fehler config file exists
+		$configDir = isset($fehlerConfigDirectory) ? $fehlerConfigDirectory : self::CONFIG_FEHLER_NAME;
+
+		$configFilename = APPPATH.self::CONFIG_DIRECTORY.'/'.$configDir.'.php';
+
+		if (!file_exists($configFilename))
+		{
+			return;
+		}
+
+		// Load Fehler Entries
+		$this->_ci->load->config($configDir);
+		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
+
+		if (!isset($configArray) || !is_array($configArray)) // check if fehler config entries could be loaded
+		{
+			$this->_ci->eprintflib->printError(
+				'Fehler config array could not be loaded, directory '.$configDir.' index '.self::CONFIG_FEHLER_INDEX
+			);
+			return;
+		}
+
+		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
+		$this->_ci->eprintflib->printInfo('Fehler installation started, directory '.$configDir);
+
+		foreach ($configArray as $idx => $configEntry)
+		{
+			// create fehler from config entry
+			$createFehlerResult = $this->_createFehlerFromEntry($configEntry);
+
+			// write error if creation failed
+			if (isError($createFehlerResult))
+			{
+				$this->_ci->eprintflib->printError(
+					getError($createFehlerResult).', directory '.$configDir.', index '.$idx
+				);
+			}
+			elseif (hasData($createFehlerResult))
+			{
+				// add fehler to db
+				$addFehlerResult = $this->_updateFehler(getData($createFehlerResult));
+
+				if (isError($addFehlerResult))
+				{
+					$this->_ci->eprintflib->printError(
+						getError($addFehlerResult).', directory'.$configDir.', index '.$idx
+					);
+				}
+			}
+		}
+
+		$this->_ci->eprintflib->printInfo('Fehler installation ended');
+		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
+	}
+
+	/**
+	 * Add a new fehler to the database
+	 */
+	private function _updateFehler($fehler)
+	{
+		$fehlerReferences = $fehler['references'];
+		$fehler = $fehler['fehler'];
+
+		// Checks if the fehler already exists in the database
+		$this->_ci->FehlerModel->db->where(self::FEHLERCODE.' = ', $fehler[self::FEHLERCODE]);
+		if (isset($fehler[self::FEHLER_KURZBZ]) && !isEmptyString($fehler[self::FEHLER_KURZBZ]))
+			$this->_ci->FehlerModel->db->or_where(self::FEHLER_KURZBZ.' = ', $fehler[self::FEHLER_KURZBZ]);
+		$fehlerResult = $this->_ci->FehlerModel->load();
+
+		// If an error occurred then return the error itself
+		if (isError($fehlerResult)) return $fehlerResult;
+
+		$updateRes = null;
+
+		// if fehler has been found
+		if (hasData($fehlerResult))
+		{
+			$foundFehler = getData($fehlerResult)[0];
+
+			// check if fehlercode - fehler kurzbz combination is correct
+			if ($foundFehler->{self::FEHLERCODE} != $fehler[self::FEHLERCODE]
+				|| $foundFehler->{self::FEHLER_KURZBZ} != ($fehler[self::FEHLER_KURZBZ] ?? null)
+			) {
+				return error("Wrong fehlercode - fehler kurzbz combination: ".$fehler[self::FEHLERCODE].", ".$fehler[self::FEHLER_KURZBZ]);
+			}
+
+			$this->_ci->eprintflib->printMessage(
+				"Fehler ".$fehler[self::FEHLERCODE]
+					.(isset($fehler[self::FEHLER_KURZBZ]) ? " (".$fehler[self::FEHLER_KURZBZ].")" : "")
+					." already exists in database"
+			);
+
+			$updateArr = [];
+
+			// update fehler, if needed
+			foreach (self::FEHLER_ATTRIBUTES as $attributeName => $attributeInfo)
+			{
+				// set attributes to be updated
+				if (isset($attributeInfo['updateable']) && $attributeInfo['updateable'] && $foundFehler->{$attributeName} != $fehler[$attributeName])
+				{
+					$updateArr[$attributeName] = $fehler[$attributeName];
+
+					if (isset($this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName])
+						&& $this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName] != $fehler[$attributeName]
+					) {
+						return error("Conflicting update values for attribute ".$attributeName.", fehler ".$foundFehler->{self::FEHLERCODE});
+					}
+					$this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName] = $fehler[$attributeName];
+				}
+			}
+
+			if (!isEmptyArray($updateArr))
+			{
+				$updateRes = $this->_ci->FehlerModel->update(
+					[self::FEHLERCODE => $foundFehler->{self::FEHLERCODE}],
+					array_merge($updateArr, ['updateamum' => 'NOW()', 'updatevon' => self::UPSERT_BY])
+				);
+				if (isError($updateRes)) return $updateRes;
+
+				$this->_ci->eprintflib->printMessage(
+					"Fehler ".$fehler[self::FEHLERCODE].(isset($fehler[self::FEHLER_KURZBZ]) ? " (".$fehler[self::FEHLER_KURZBZ].")" : "")." updated"
+				);
+			}
+		}
+		else
+		{
+			// no fehler has been found
+
+			// then add the fehler to the database
+			$updateRes = $this->_ci->FehlerModel->insert(
+				array_merge($fehler, ['insertamum' => 'NOW()', 'insertvon' => self::UPSERT_BY])
+			);
+
+			// If an error occurred then return the error itself
+			if (isError($updateRes)) return $updateRes;
+
+			// Prints info about the new added fehler
+			$this->_ci->eprintflib->printMessage(
+				sprintf(
+					'A new fehler has been added into the database: '.
+					'fehlercode => %s | fehler_kurzbz => %s | fehlertyp => %s',
+					$fehler[self::FEHLERCODE],
+					$fehler[self::FEHLER_KURZBZ],
+					$fehler[self::FEHLERTYP_KURZBZ]
+				)
+			);
+		}
+
+		// handle references
+		if (isset($fehlerReferences[self::APP]))
+		{
+			$this->_ci->load->model('system/FehlerApp_model', 'FehlerAppModel');
+			$apps = $fehlerReferences[self::APP];
+
+			// load all assigned apps
+			$this->_ci->FehlerAppModel->addSelect(self::APP);
+			$fehlerAppRes = $this->_ci->FehlerAppModel->loadWhere([self::FEHLERCODE => $fehler[self::FEHLERCODE]]);
+
+			$fehlerApps = hasData($fehlerAppRes) ? array_column(getData($fehlerAppRes), self::APP) : [];
+
+			$appsToInsert = array_diff($apps, $fehlerApps);
+
+			foreach ($appsToInsert as $app)
+			{
+				// check if app exists in db
+				$fehlerAppsInsertRes = $this->_ci->FehlerAppModel->insert(
+					[self::FEHLERCODE => $fehler[self::FEHLERCODE], self::APP => $app, 'insertamum' => 'NOW()', 'insertvon' => self::UPSERT_BY]
+				);
+
+				if (isError($fehlerAppsInsertRes)) return $fehlerAppsInsertRes;
+
+				$this->_ci->eprintflib->printMessage(
+					"Added app ".$app." to fehler ".$fehler[self::FEHLERCODE]
+				);
+			}
+		}
+
+		// If here then no blocking errors occurred
+		return success();
+	}
+
+	/**
+	 * Create an array with fehler data from config entry
+	 */
+	private function _createFehlerFromEntry($configEntry)
+	{
+		$fehler = ['fehler' => [], 'references' => []];
+		foreach (self::FEHLER_ATTRIBUTES as $attributeName => $attributeInfo)
+		{
+			$required = isset($attributeInfo['required']) && $attributeInfo['required'];
+			if (!isset($configEntry[$attributeName]))
+			{
+				if ($required) return error('attribute'.$attributeName.' is missing');
+				continue;
+			}
+
+			$attributeValue = $configEntry[$attributeName];
+			$validType = false;
+			if (isset($attributeInfo['types']) && is_array($attributeInfo['types']))
+			{
+				foreach ($attributeInfo['types'] as $type)
+				{
+					switch ($type)
+					{
+						case self::TYPE_STRING:
+							if (is_string($attributeValue) || is_null($attributeValue)) $validType = true;
+							break;
+						case self::TYPE_ARRAY:
+							if (is_array($attributeValue) && !($required && isEmptyArray($attributeValue))) $validType = true;
+							break;
+						//~ default:
+							//~ if (is_string($configEntry[$attributeName]) || is_null($configEntry[$attributeName])) $validType = true;
+					}
+				}
+			}
+			else
+			{
+				$validType = is_string($attributeValue) || is_null($attributeValue);
+			}
+
+			if (!$validType)
+			{
+				return error('attribute'.$attributeName.' has invalid type');
+			}
+
+			if ($attributeName == self::APP)
+			{
+				if (is_string($attributeValue)) $attributeValue = [$attributeValue];
+
+				foreach ($attributeValue as $app)
+				{
+					// check if app exists in db
+					$this->_ci->AppModel->addSelect('1');
+					$appRes = $this->_ci->AppModel->loadWhere(['app' => $app]);
+
+					if (!hasData($appRes)) return error("App ".$app." does not exist");
+				}
+			}
+
+			if (isset($attributeInfo['types']) && is_array($attributeInfo['types']) && in_array(self::TYPE_ARRAY, $attributeInfo['types']))
+			{
+				$fehler['references'][$attributeName] = $attributeValue;
+			}
+			else
+			{
+				$fehler['fehler'][$attributeName] = $attributeValue;
+			}
+
+		}
+		return success($fehler);
+	}
+}
@@ -20,6 +20,10 @@ class IssuesLib
 	const ERRORTYPE_CODE = 'error';
 	const WARNINGTYPE_CODE = 'warning';

+	const STATUS_KURZBZ = 'status_kurzbz';
+	const VERARBEITET_AMUM = 'verarbeitetamum';
+	const VERARBEITET_VON = 'verarbeitetvon';
+
 	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance();
@@ -91,12 +95,16 @@ class IssuesLib
 			return error("fehlercode_extern missing");

 		// get external fehlercode (unique for each app)
-		$this->_ci->FehlerModel->addSelect('fehlercode');
-		$fehlerRes = $this->_ci->FehlerModel->loadWhere(
-			array(
-				'fehlercode_extern' => $fehlercode_extern,
-				'app' => $this->_app
-			)
+		$fehlerRes = $this->_ci->FehlerModel->execReadOnlyQuery(
+			'
+				SELECT
+					fehlercode
+				FROM
+					system.tbl_fehler fe
+				WHERE
+					fehlercode_extern = ?
+					AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode AND app = ?)',
+			[$fehlercode_extern, $this->_app]
 		);

 		if (isError($fehlerRes))
@@ -105,8 +113,10 @@ class IssuesLib
 		// check if there is a predefined custom error for the external issue
 		if (hasData($fehlerRes))
 		{
-			$fehlerData = getData($fehlerRes)[0];
 			// if found, use the code
+			$fehlerData = getData($fehlerRes);
+			if (count($fehlerData) > 1) return error("Multiple fehlercode_extern ".$fehlercode_extern. " for app ".$this->_app);
+			$fehlerData = getData($fehlerRes)[0];
 			$fehlercode = $fehlerData->fehlercode;
 		}
 		else
@@ -128,9 +138,9 @@ class IssuesLib
 	public function setBehoben($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_BEHOBEN,
-			'verarbeitetvon' => $user,
-			'verarbeitetamum' => date('Y-m-d H:i:s')
+			self::STATUS_KURZBZ => self::STATUS_BEHOBEN,
+			self::VERARBEITET_VON => $user,
+			self::VERARBEITET_AMUM => date('Y-m-d H:i:s')
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -145,8 +155,8 @@ class IssuesLib
 	public function setInBearbeitung($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_IN_BEARBEITUNG,
-			'verarbeitetvon' => $user
+			self::STATUS_KURZBZ => self::STATUS_IN_BEARBEITUNG,
+			self::VERARBEITET_VON => $user
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -161,9 +171,9 @@ class IssuesLib
 	public function setNeu($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_NEU,
-			'verarbeitetvon' => null,
-			'verarbeitetamum' => null
+			self::STATUS_KURZBZ => self::STATUS_NEU,
+			self::VERARBEITET_VON => null,
+			self::VERARBEITET_AMUM => null
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -185,13 +195,18 @@ class IssuesLib
 			return error("Issue Id must be set correctly.");

 		// check if given status is same as existing
-		$this->_ci->IssueModel->addSelect('status_kurzbz');
+		$this->_ci->IssueModel->addSelect(self::STATUS_KURZBZ.', '.self::VERARBEITET_AMUM);
 		$currStatus = $this->_ci->IssueModel->load($issue_id);

 		if (hasData($currStatus))
 		{
-			if (getData($currStatus)[0]->status_kurzbz == $data['status_kurzbz'])
+			$currStatusData = getData($currStatus)[0];
+			// if same status set, and verarbeitet amum is not being newly set
+			if ($currStatusData->{self::STATUS_KURZBZ} == $data[self::STATUS_KURZBZ]
+				&& !(isset($data[self::VERARBEITET_AMUM]) && !isset($currStatusData->{self::VERARBEITET_AMUM}))
+			) {
 				return success("Same status already set");
+			}
 		}
 		else
 			return error("Error when getting status");
@@ -228,10 +243,10 @@ class IssuesLib
 		$inhalt_extern = null
 	) {
 		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
-			return error("Person_id or oe_kurzbz must be set.");
+			return error("Person_id or oe_kurzbz must be set, fehlercode: $fehlercode");

 		// get fehlertextVorlage and replace it with params
-		$fehlerRes = $this->_ci->FehlerModel->load($fehlercode);
+		$fehlerRes = $this->_ci->FehlerModel->loadWhere(['fehlercode' => $fehlercode]);

 		if (hasData($fehlerRes))
 		{
@@ -241,7 +256,7 @@ class IssuesLib
 			if (!isEmptyArray($fehlertext_params))
 			{
 				if (count($fehlertext_params) != substr_count($fehlertextVorlage, '%s'))
-					return error('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehlercode);
+					return error('Wrong number of parameters for Fehlertext, fehlercode ' . $fehlercode);

 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
@@ -263,59 +263,6 @@ class ProfilLib{
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
 		}, $mailverteiler_res);
-
-		$this->ci->load->model("crm/Student_model", "StudentModel");
-		$this->ci->StudentModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_student.student_uid");
-		$this->ci->StudentModel->addJoin("tbl_person", "tbl_benutzer.person_id = tbl_person.person_id");
-		$this->ci->StudentModel->addJoin("tbl_studiengang", "tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz");
-		$this->ci->StudentModel->addSelect("matr_nr, semester, verband, gruppe, kurzbzlang");
-
-		$studentResult = $this->ci->StudentModel->loadWhere(["student_uid" => $uid]);
-		if (isError($studentResult)) {
-			return error(getData($studentResult));
-		}
-
-		$studentResultData = getData($studentResult);
-		$studentData = null;
-		if (is_array($studentResultData) && count($studentResultData)) {
-			$studentData = $studentResultData[0];
-		}
-
-		if ($studentData && $studentData->matr_nr) {
-			$this->ci->load->library("phrasesLib", ["profil"], "phrases");
-			$standardCourseVerteiler = trim($studentData->kurzbzlang) . "_STD";
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $standardCourseVerteiler,
-				"gruppe_kurzbz" => $standardCourseVerteiler,
-				"mailto" => "mailto:" . strtolower($standardCourseVerteiler) . "@" . DOMAIN,
-			];
-
-			$semesterVerteiler = trim($studentData->kurzbzlang) . trim($studentData->semester);
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $semesterVerteiler,
-				"gruppe_kurzbz" => $semesterVerteiler,
-				"mailto" => "mailto:" . strtolower($semesterVerteiler) . "@" . DOMAIN,
-			];
-
-			if ($studentData->verband && strlen(trim($studentData->verband))) {
-				$verbandVerteiler = $semesterVerteiler . trim($studentData->verband);
-				$mailverteiler_res[] = [
-					"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $verbandVerteiler,
-					"gruppe_kurzbz" => $verbandVerteiler,
-					"mailto" => "mailto:" . strtolower($verbandVerteiler) . "@" . DOMAIN,
-				];
-
-				if ($studentData->gruppe && strlen(trim($studentData->gruppe))) {
-					$gruppeVerteiler = $verbandVerteiler . trim($studentData->gruppe);
-					$mailverteiler_res[] = [
-						"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $gruppeVerteiler,
-						"gruppe_kurzbz" => $gruppeVerteiler,
-						"mailto" => "mailto:" . strtolower($gruppeVerteiler) . "@" . DOMAIN,
-					];
-				}
-			}
-		}
-
 		return $mailverteiler_res;
 	}

@@ -36,7 +36,15 @@ class SignatureLib
 		try
 		{
 			// Dont send Document if it is bigger than 30 MB (Limit of Signature Server)
-			if (filesize($inputFileName) > 30000000) return $this->_returnObject(1, 1, 'File too big');
+			if (filesize($inputFileName) > 30000000)
+			{
+				$returnObject = new stdClass();
+				$returnObject->code = 1;
+				$returnObject->error = 1;
+				$returnObject->retval = 'File to big';
+
+				return $returnObject;
+			}

 			// Get the content of the given file
 			$inputFileContent = file_get_contents($inputFileName);
@@ -74,80 +82,4 @@ class SignatureLib
 		// Otherwise return a null as error
 		return null;
 	}
-
-	/**
-	 *
-	 */
-	public function sign($temp_folder, $inputFileName, $user, $profile)
-	{
-		// Load the File
-		$file_data = file_get_contents($inputFileName);
-
-		$data = new stdClass();
-		$data->document = base64_encode($file_data);
-
-		// Signatur Profil
-		if (!is_null($profile))
-				$data->profile = $profile;
-		else
-				$data->profile = SIGNATUR_DEFAULT_PROFILE;
-
-		// Username des Endusers der die Signatur angefordert hat
-		$data->user = $user;
-
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_URL, SIGNATUR_URL . '/' . SIGNATUR_SIGN_API);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 7);
-		curl_setopt($ch, CURLOPT_USERAGENT, "FH-Complete");
-
-		// SSL Zertifikatsprüfung deaktivieren
-		// Besser ist es das Zertifikat am Server zu installieren!
-		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-		$data_string = json_encode($data, JSON_FORCE_OBJECT);
-
-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, [
-				'Content-Type: application/json',
-				'Content-Length:' . mb_strlen($data_string),
-				'Authorization: Basic ' . base64_encode(SIGNATUR_USER . ':' . SIGNATUR_PASSWORD)
-		]);
-
-		$result = curl_exec($ch);
-		if (curl_errno($ch)) {
-				curl_close($ch);
-				return $this->_returnObject(1, 1, 'CURL error');
-		}
-		curl_close($ch);
-		$resultdata = json_decode($result);
-
-		// If it is success
-		if (isset($resultdata->error) && $resultdata->error == 0)
-		{
-			$signed_filename = $temp_folder . '/signed.pdf';
-			file_put_contents($signed_filename, base64_decode($resultdata->retval));
-			return $this->_returnObject(0, 0, $signed_filename);
-		}
-
-		// Otherwise it is an error
-		return $this->_returnObject(1, 1, 'Error while signing the given document');
-	}
-
-	/**
-	 *
-	 */
-	private function _returnObject($code, $error, $retval)
-	{
-		$returnObject = new stdClass();
-		$returnObject->code = $code;
-		$returnObject->error = $error;
-		$returnObject->retval = $retval;
-
-		return $returnObject;
-	}
 }
-
@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();

 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');

-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -220,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();

@@ -231,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');

-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));

 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -360,10 +357,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -451,24 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}

-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################

 	// function used to sort an array of studiensemester strings
@@ -37,9 +37,7 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->loadWhere([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);

 		if (hasData($result))
 		{
@@ -49,21 +47,17 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedUserConfig($dashboard_id, $uid)
+	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
-		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
-		$sourceconfig = array_map(function ($value) {
-			return ['source' => $value['source']];
-		}, $defaultconfig);
-		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
 		
 		return $mergedconfig;
 	}
 	
-	protected function getUserBaseConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -93,11 +87,7 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$preset = array_map(function ($value) use ($presetobj) {
-						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-						return $value;
-					}, $preset);
-					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -105,7 +95,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	protected function getUserOverrideConfig($dashboard_id, $uid)
+	public function getUserConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -134,7 +124,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '[]';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
@@ -153,7 +143,8 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$emptypreset->preset = '[]';
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -218,4 +209,44 @@ class DashboardLib
 		
 		return $result;
 	}
+
+	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+	{
+		foreach ($addwigets as $widget)
+		{
+			if(!isset($widget['widgetid']))
+			{
+				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+			}
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+		}
+	}
+	
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
+		{
+			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
+		}
+		
+		$widgets[$section]["widgets"][$widgetid] = $widget;
+	}
+	
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
+		{
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }
@@ -9,48 +9,45 @@ class PlausicheckDefinitionLib
 {
 	// set fehler for core plausichecks
 	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerLibMappings = array(
-		'AbbrecherAktiv' => 'AbbrecherAktiv',
-		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
-		'AktSemesterNull' => 'AktSemesterNull',
-		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
-		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
-		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
-		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
-		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
-		//'StudienplanUngueltig' => 'StudienplanUngueltig'
-		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
+	private $_fehlerKurzbz = array(
+		'AbbrecherAktiv',
+		'AbschlussstatusFehlt',
+		'AbschlusspruefungOderAbsolventFehlt',
+		'AktSemesterNull',
+		'AktiverStudentOhneStatus',
+		'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'DatumAbschlusspruefungFehlt',
+		'DatumSponsionFehlt',
+		'DatumStudiensemesterFalscheReihenfolge',
+		'FalscheAnzahlAbschlusspruefungen',
+		'FalscheAnzahlHeimatadressen',
+		'FalscheAnzahlZustelladressen',
+		'FalscheStatusabfolgeVorStudentstatus',
+		'GbDatumWeitZurueck',
+		'InaktiverStudentAktiverStatus',
+		'IncomingHeimatNationOesterreich',
+		'IncomingOhneIoDatensatz',
+		'IncomingOrGsFoerderrelevant',
+		'InskriptionVorLetzerBismeldung',
+		'NationNichtOesterreichAberGemeinde',
+		'OrgformBewerberUngleichOrgformStudent',
+		'OrgformStgUngleichOrgformPrestudent',
+		'PrestudentMischformOhneOrgform',
+		'StartsemesterUngleichPersonenkennzeichen',
+		'StgPrestudentUngleichStgStudienplan',
+		'StgPrestudentUngleichStgStudent',
+		'StudentstatusNachDiplomand',
+		'StudentstatusNachAbbrecher',
+		'DualesStudiumOhneMarkierung'
+		//'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten'
 	);

-	/**
-	 * Gets all fehler_kurzbz-library mappings for fehler which need to be checked.
-	 */
-	public function getFehlerLibMappings()
-	{
-		return $this->_fehlerLibMappings;
-	}
-
 	/**
 	 * Gets all fehler_kurzbz for fehler which need to be checked.
 	 */
 	public function getFehlerKurzbz()
 	{
-		return array_keys($this->_fehlerLibMappings);
+		return $this->_fehlerKurzbz;
 	}
 }
@@ -6,36 +6,43 @@ class PlausicheckProducerLib
 {
 	const CI_PATH = 'application';
 	const CI_LIBRARY_FOLDER = 'libraries';
-	const EXTENSIONS_FOLDER = 'extensions';
 	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
 	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
+	const CONFIG_FEHLER_NAME = 'fehler';
+	const CONFIG_FEHLER_INDEX = 'fehler';
+	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
+	const PRODUCER_LIB_NAME = 'producerLibName';
+	const EXTENSION_NAME = 'extensionName';

 	private $_ci; // ci instance
-	private $_extensionName; // name of extension
 	private $_konfiguration = []; // configuration parameters
+	private $_fehlerKurzbz = []; // fehler to produce
 	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
-	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
+	private $_apps = []; // apps of fehler to produce

 	public function __construct($params = null)
 	{
-		// set extension name if called from extension
-		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
-		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
-		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
-
-		// set application
-		$app = isset($params['app']) ? $params['app'] : null;
+		// set application(s))
+		if (isset($params['apps']))
+		{
+			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
+			if (is_array($params['apps'])) $this->_apps = $params['apps'];
+		}

 		$this->_ci =& get_instance(); // get ci instance

 		// load libraries
 		$this->_ci->load->library('IssuesLib');
+		$this->_ci->load->library('ExtensionsLib');

 		// load models
+		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');

-		// get all configuration parameters for the application
-		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($app);
+		$this->_ci->load->config(self::CONFIG_FEHLER_NAME);
+
+		// get all configuration parameters for the application(s))
+		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($this->_apps);

 		if (hasData($fehlerkonfigurationRes))
 		{
@@ -46,10 +53,88 @@ class PlausicheckProducerLib
 				$this->_konfiguration[$fk->fehler_kurzbz][$fk->konfigurationstyp_kurzbz] = $fk->konfiguration;
 			}
 		}
+
+		// get all fehler to be produced (by kurzbz array or app)
+		if (isset($params['fehlerKurzbz']) && !isEmptyArray($params['fehlerKurzbz']))
+		{
+			$this->_fehlerKurzbz = $params['fehlerKurzbz'];
+		}
+		else
+		{
+			// get fehler by apps
+			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
+
+			if (hasData($fehlerRes)) $this->_fehlerKurzbz = array_column(getData($fehlerRes), 'fehler_kurzbz');
+		}
+
+		// get producer file paths for the fehler
+
+		// Load Fehler Entries of Core
+		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
+
+		if (isset($configArray) && is_array($configArray))
+		{
+			foreach ($configArray as $coreEntry)
+			{
+				if (!isset($coreEntry[self::FEHLER_KURZBZ_NAME])
+					|| !isset($coreEntry[self::PRODUCER_LIB_NAME])
+					|| !in_array($coreEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
+				) {
+					continue;
+				}
+
+				$this->_fehlerLibMappings[$coreEntry[self::FEHLER_KURZBZ_NAME]][self::PRODUCER_LIB_NAME] = $coreEntry[self::PRODUCER_LIB_NAME];
+			}
+		}
+
+		// load fehler entries of extensions
+		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
+
+		if (hasData($extensions))
+		{
+			$extensionArray = array();
+
+			$extensionsData = getData($extensions);
+
+			foreach ($extensionsData as $ext)
+			{
+				$configFilePath = ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
+				$configFilename = APPPATH.'config/'.$configFilePath;
+
+				// if fehler config file exists in extension
+				if (file_exists($configFilename))
+				{
+					$config = array(); // default value
+
+					// include the config file
+					include($configFilename);
+
+					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
+					{
+						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
+						{
+							if (
+								!isset($extensionEntry[self::FEHLER_KURZBZ_NAME])
+								|| !isset($extensionEntry[self::PRODUCER_LIB_NAME])
+								|| !in_array($extensionEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
+							) {
+								continue;
+							}
+
+							// add extension config data to fehler lib mappings
+							$fehler_kurzbz = $extensionEntry[self::FEHLER_KURZBZ_NAME];
+
+							$this->_fehlerLibMappings[$fehler_kurzbz][self::PRODUCER_LIB_NAME] = $extensionEntry[self::PRODUCER_LIB_NAME];
+							$this->_fehlerLibMappings[$fehler_kurzbz][self::EXTENSION_NAME] = $ext->name;
+						}
+					}
+				}
+			}
+		}
 	}

 	/**
-	 * Produces multiple plausicheck issues at once and saved them to db.
+	 * Produces multiple plausicheck issues at once, and saves them in the database.
 	 * @param array $params passed to each plausicheck
 	 * @return result object with occured error and info
 	 */
@@ -59,10 +144,17 @@ class PlausicheckProducerLib
 		$result->errors = [];
 		$result->infos = [];

-		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+		$mappingFehlerKurbz = array_keys($this->_fehlerLibMappings);
+
+		// check if all issues to produce could be found in database
+		//~ $notFoundFehlerKurzbz = array_diff($this->_fehlerKurzbz, $mappingFehlerKurbz);
+
+		//~ if (!isEmptyArray($notFoundFehlerKurzbz))
+			//~ $result->errors[] = error('Fehler to produce not defined in config: '.implode(', ', $notFoundFehlerKurzbz));
+
+		foreach ($mappingFehlerKurbz as $fehler_kurzbz)
 		{
 			$plausicheckRes = $this->producePlausicheckIssue(
-				$libName,
 				$fehler_kurzbz,
 				$params
 			);
@@ -96,14 +188,23 @@ class PlausicheckProducerLib

 	/**
 	 * Executes plausicheck using a given library, returns the result.
-	 * @param $libName string name of library producing the issue
 	 * @param $fehler_kurzbz string unique short name of fehler, for which issue is produced
 	 * @param $params parameters passed to issue production method
 	 */
-	public function producePlausicheckIssue($libName, $fehler_kurzbz, $params)
+	public function producePlausicheckIssue($fehler_kurzbz, $params)
 	{
+		//if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return error("Mapping for Fehler " . $fehler_kurzbz . " was not found");
+		if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return success(null);
+
+		$mapping = $this->_fehlerLibMappings[$fehler_kurzbz];
+
+		if (!isset($mapping[self::PRODUCER_LIB_NAME]) || isEmptyString($mapping[self::PRODUCER_LIB_NAME]))
+			return error("No producer lib name set for Fehler " . $fehler_kurzbz);
+
+		$libName = $mapping[self::PRODUCER_LIB_NAME];
+
 		// if called from extension (extension name set), path includes extension names
-		$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+		$libRootPath = isset($mapping[self::EXTENSION_NAME]) ? ExtensionsLib::EXTENSIONS_DIR_NAME . '/' . $mapping[self::EXTENSION_NAME] . '/' : '';

 		// path for loading issue library
 		$issuesLibPath = $libRootPath . self::PLAUSI_ISSUES_FOLDER . '/';
@@ -121,7 +222,7 @@ class PlausicheckProducerLib
 		// load library connected to fehlercode
 		$this->_ci->load->library(
 			$issuesLibPath . $libName,
-			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+			['configurationParams' => $config]
 		);

 		$lowercaseLibName = mb_strtolower($libName);
@@ -133,4 +234,13 @@ class PlausicheckProducerLib
 		// call the function for checking for issue production
 		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($params);
 	}
+
+	/**
+	 * Get fehler kurzbz -> library mappings.
+	 * @return array with fehler kurzbz as key and fehlerinfo as values
+	 */
+	public function getFehlerMappings()
+	{
+		return $this->_fehlerLibMappings;
+	}
 }
@@ -9,43 +9,177 @@ class PlausicheckResolverLib
 	const EXTENSIONS_FOLDER = 'extensions';
 	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
 	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
+	const CONFIG_FEHLER_NAME = 'fehler';
+	const FEHLERCODE_NAME = 'fehlercode';
+	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
+	const RESOLVER_LIB_NAME = 'resolverLibName';
+	const PRODUCER_IS_RESOLVER_NAME = 'producerIsResolver';
+	const EXTENSION_NAME = 'extensionName';
+

 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
+	private $_fehlercodes = []; // fehlercodes to resolve
+	private $_apps = []; // apps for which issues should be resolved
 	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
-	private $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced
+	private $_defaultIssueParams = ['issue_id' => 'issue_id', 'issue_person_id' => 'person_id', 'issue_oe_kurzbz' => 'oe_kurzbz'];

 	public function __construct($params = null)
 	{
-		// set extension name if called from extension
-		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
-		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
-		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
+		// set application(s))
+		if (isset($params['apps']))
+		{
+			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
+			if (is_array($params['apps'])) $this->_apps = $params['apps'];
+		}

 		$this->_ci =& get_instance(); // get ci instance

+		// get all fehler to be produced (by kurzbz array or app)
+		if (isset($params['fehlercodes']) && !isEmptyArray($params['fehlercodes']))
+		{
+			$this->_fehlercodes = $params['fehlercodes'];
+		}
+		elseif (isset($params['apps']) && !isEmptyArray($params['apps']))
+		{
+			$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
+			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
+
+			if (hasData($fehlerRes))
+			{
+				$this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
+			}
+		}
+
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
+		$this->_ci->load->library('ExtensionsLib');
+
+		$this->_ci->load->config('fehler');
+
+		// Load Fehler Entries of Core
+		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_NAME);
+
+		foreach ($configArray as $coreEntry)
+		{
+			// each entry must have fehlercode
+			if (!isset($coreEntry[self::FEHLERCODE_NAME])
+				|| !in_array($coreEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
+			) {
+				continue;
+			}
+
+			// fill code lib mappings with needed values
+			$fehlercode = $coreEntry[self::FEHLERCODE_NAME];
+
+			if (isset($coreEntry[self::FEHLER_KURZBZ_NAME]))
+				$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $coreEntry[self::FEHLER_KURZBZ_NAME];
+
+			$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME] = $coreEntry[self::RESOLVER_LIB_NAME] ?? null;
+			$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
+				= $coreEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
+		}
+
+		// load fehler entries of extensions
+		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
+
+		if (hasData($extensions))
+		{
+			$extensionArray = array();
+
+			$extensionsData = getData($extensions);
+
+			foreach ($extensionsData as $ext)
+			{
+				$configFilename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
+
+				// if fehler config file exists in teh extension
+				if (file_exists($configFilename))
+				{
+					$config = array(); // default value
+
+					// include config data
+					include($configFilename);
+
+					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
+					{
+						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
+						{
+							if (
+								!isset($extensionEntry[self::FEHLERCODE_NAME])
+								|| !in_array($extensionEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
+							) {
+								continue;
+							}
+
+							// add extension config data to fehlercode lib mappings
+							$fehlercode = $extensionEntry[self::FEHLERCODE_NAME];
+							if (isset($extensionEntry[self::FEHLER_KURZBZ_NAME]))
+								$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $extensionEntry[self::FEHLER_KURZBZ_NAME];
+
+							$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME]
+								= $extensionEntry[self::RESOLVER_LIB_NAME] ?? null;
+							$this->_codeLibMappings[$fehlercode][self::EXTENSION_NAME] = $ext->name;
+							$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
+								= $extensionEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
+						}
+					}
+				}
+			}
+		}
 	}

 	/**
 	 * Reseolves multiple plausicheck issues at once.
-	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
-	 * @param array $openIssues passed issues to resolve
+	 * @param array $openIssues passed issues to resolve. If null, issues with fehlercodes in _fehlercodes property are loaded
 	 * @return result object with occured error and info
 	 */
-	public function resolvePlausicheckIssues($openIssues)
+	public function resolvePlausicheckIssues($openIssues = null)
 	{
+		// loading producer lib with fehler kurzbz of provided code mappings, for "self resolving" issues
+		$this->_ci->load->library(
+			'issues/PlausicheckProducerLib',
+			['fehlerKurzbz' => array_column($this->_codeLibMappings, self::FEHLER_KURZBZ_NAME)], 'PlausicheckResolverProducerLib'
+		);
+
+		if (!isset($openIssues))
+		{
+			if (!isEmptyArray($this->_fehlercodes))
+			{
+				$this->_ci->load->model('system/Issue_model', 'IssueModel');
+
+				// load open issues with given errorcodes
+				$openIssuesRes = $this->_ci->IssueModel->getOpenIssues(
+					$this->_fehlercodes
+				);
+
+				$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
+			}
+		}
+
+
 		$result = new StdClass();
 		$result->errors = [];
 		$result->infos = [];

+		// check if all issues to resolve could be found in database
+		//~ $mappingFehlerCodes = array_keys($this->_codeLibMappings);
+		//~ $notFoundFehlerCodes = array_diff($this->_fehlercodes, $mappingFehlerCodes);
+
+		//~ if (!isEmptyArray($notFoundFehlerCodes))
+			//~ $result->errors[] = error('Fehler to resolve not defined in config: '.implode(', ', $notFoundFehlerCodes));
+
 		foreach ($openIssues as $issue)
 		{
+			$params = [];
+			foreach ($this->_defaultIssueParams as $index => $propertyName)
+			{
+				$params[$index] = $issue->{$propertyName};
+			}
+
 			// add person id and oe kurzbz automatically as params, merge it with additional params
 			// decode bewerbung_parameter into assoc array
 			$params = array_merge(
-				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+				$params,
 				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
 			);

@@ -54,69 +188,72 @@ class PlausicheckResolverLib
 			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
 			if (isset($this->_codeLibMappings[$issue->fehlercode]))
 			{
-				$libName = $this->_codeLibMappings[$issue->fehlercode];
+				$codeLibMapping = $this->_codeLibMappings[$issue->fehlercode];
+				$libName = $codeLibMapping[self::RESOLVER_LIB_NAME] ?? null;
+				$extensionName = $codeLibMapping[self::EXTENSION_NAME] ?? null;
+				$producerIsResolver = $codeLibMapping[self::PRODUCER_IS_RESOLVER_NAME] ?? false;

-				// if called from extension (extension name set), path includes extension names
-				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
-
-				// path for loading issue library
-				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-
-				// file path of library for check if file exists
-				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-				// check if library file exists
-				if (!file_exists($issuesLibFilePath))
+				if ($producerIsResolver)
 				{
-					// log error and continue with next issue if not
-					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-					continue;
-				}
+					// execute same check as used for issue production
+					$issueResolvedRes = $this->_ci->PlausicheckResolverProducerLib->producePlausicheckIssue(
+						$issue->fehler_kurzbz,
+						$params
+					);

-				// load library connected to fehlercode
-				$this->_ci->load->library($issuesLibPath . $libName);
-
-				$lowercaseLibName = mb_strtolower($libName);
-
-				// check if method is defined in library class
-				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-				{
-					// log error and continue with next issue if not
-					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
-					continue;
-				}
-
-				// call the function for checking for issue resolution
-				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-				if (isError($issueResolvedRes))
-				{
-					$result->errors[] = getError($issueResolvedRes);
+					if (isError($issueResolvedRes))
+					{
+						$result->errors[] = getError($issueResolvedRes);
+					}
+					else
+					{
+						$issueResolved = !hasData($issueResolvedRes);
+					}
 				}
 				else
 				{
-					$issueResolved = getData($issueResolvedRes) === true;
-				}
-			}
-			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
-			{
-				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
+					// if called from extension (extension name set), path includes extension names
+					$libRootPath = isset($extensionName) ? self::EXTENSIONS_FOLDER . '/' . $extensionName . '/' : '';

-				// execute same check as used for issue production 
-				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
-					$libName,
-					$issue->fehler_kurzbz,
-					$params
-				);
+					// path for loading issue library
+					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';

-				if (isError($issueResolvedRes))
-				{
-					$result->errors[] = getError($issueResolvedRes);
-				}
-				else
-				{
-					$issueResolved = !hasData($issueResolvedRes);
+					// file path of library for check if file exists
+					$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+						. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+					// check if library file exists
+					if (!file_exists($issuesLibFilePath))
+					{
+						// log error and continue with next issue if not
+						$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+						continue;
+					}
+
+					// load library connected to fehlercode
+					$this->_ci->load->library($issuesLibPath . $libName);
+
+					$lowercaseLibName = mb_strtolower($libName);
+
+					// check if method is defined in library class
+					if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+					{
+						// log error and continue with next issue if not
+						$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+						continue;
+					}
+
+					// call the function for checking for issue resolution
+					$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+					if (isError($issueResolvedRes))
+					{
+						$result->errors[] = getError($issueResolvedRes);
+					}
+					else
+					{
+						$issueResolved = getData($issueResolvedRes) === true;
+					}
 				}
 			}

@@ -23,7 +23,11 @@ class AbbrecherAktiv extends PlausiChecker
 			AND benutzer.aktiv=true";

 	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
-	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
+	protected $_params_for_checking = [
+		'studiengang_kz' => " AND stg.studiengang_kz = ?",
+		'prestudent_id' => " AND pre.prestudent_id = ?",
+		'person_id' => " AND pre.person_id = ?"
+	];
 	protected $_fehlertext_params = ['prestudent_id'];
 	protected $_resolution_params = ['prestudent_id'];
 }
@@ -0,0 +1,156 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ *
+ */
+class AbschlusspruefungOderAbsolventFehlt extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getAbschlusspruefungOderAbsolventFehlt(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			$prestudent_id,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
+					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * If there is a final exam, there should be an absolvent status (and vice versa).
+	 * @param studiensemester_kurzbz Status from this and previous semester is checked
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAbschlusspruefungOderAbsolventFehlt($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+
+		$qry = "
+				SELECT DISTINCT ON (prestudent_id) person_id, prestudent_id, studiengang_kz, prestudent_stg_oe_kurzbz FROM (
+					WITH meldestichtag AS (
+						SELECT
+							meldestichtag, studiensemester_kurzbz
+						FROM
+							bis.tbl_bismeldestichtag";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
+
+			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
+
+			$semesterArr = array($studiensemester_kurzbz);
+
+			if (hasData($prevStudiensemesterRes))
+			{
+				// if Studiensemester given, check only if has status in current or previous semester
+				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
+			}
+
+			$qry .= " WHERE studiensemester_kurzbz IN ?";
+
+			$params[] = $semesterArr;
+		}
+
+			$qry .= "
+					)
+					SELECT
+						prestudent.person_id, prestudent.prestudent_id,
+						stg.studiengang_kz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
+						EXISTS (
+							SELECT 1
+							FROM
+								lehre.tbl_abschlusspruefung pr
+							WHERE
+								student_uid = benutzer.uid
+								AND abschlussbeurteilung_kurzbz <> 'nicht'
+								AND pr.datum < meldestichtag.meldestichtag
+						) AS hat_pruefung,
+						(status.status_kurzbz IS NOT NULL) AS hat_absolvent,
+						(status.ausbildungssemester = stg.max_semester) AS absolvent_in_letztem_semester
+					FROM
+						meldestichtag
+						CROSS JOIN public.tbl_student student
+						JOIN public.tbl_prestudent prestudent USING (prestudent_id)
+						JOIN public.tbl_benutzer benutzer ON (benutzer.uid = student.student_uid)
+						JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+						LEFT JOIN public.tbl_prestudentstatus status
+							ON status.prestudent_id = prestudent.prestudent_id
+							AND status.status_kurzbz = 'Absolvent'
+							AND status.datum < meldestichtag.meldestichtag
+						WHERE EXISTS (
+							SELECT 1
+							FROM
+								public.tbl_prestudentstatus
+							WHERE
+								prestudent_id = prestudent.prestudent_id
+								AND studiensemester_kurzbz = meldestichtag.studiensemester_kurzbz
+						)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		$qry .=	"
+				) prestudenten
+				WHERE
+					(hat_absolvent AND absolvent_in_letztem_semester AND hat_pruefung = FALSE)
+					OR (hat_pruefung AND hat_absolvent = FALSE)";
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}
@@ -19,12 +19,14 @@ class AbschlussstatusFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAbschlussstatusFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -55,6 +57,7 @@ class AbschlussstatusFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -62,6 +65,7 @@ class AbschlussstatusFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -101,23 +105,26 @@ class AbschlussstatusFehlt extends PlausiChecker

 		if (isset($studiensemester_kurzbz))
 		{
+			$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);

 			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;

+			$semesterArr = array($studiensemester_kurzbz);
+
 			if (hasData($prevStudiensemesterRes))
 			{
 				// if Studiensemester given, check only if has status in current or previous semester
-				$prevStudiensemester = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-				$qry .= " AND EXISTS (
-							SELECT 1
-							FROM public.tbl_prestudentstatus ps
-							WHERE studiensemester_kurzbz IN (?, ?)
-							AND ps.prestudent_id = pre.prestudent_id
-						)";
-				$params[] = $prevStudiensemester;
-				$params[] = $studiensemester_kurzbz;
+				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
 			}
+
+			$qry .= " AND EXISTS (
+						SELECT 1
+						FROM public.tbl_prestudentstatus ps
+						WHERE studiensemester_kurzbz IN ?
+						AND ps.prestudent_id = pre.prestudent_id
+					)";
+			$params[] = $semesterArr;
 		}

 		if (isset($studiengang_kz))
@@ -132,6 +139,12 @@ class AbschlussstatusFehlt extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pre.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,9 +19,10 @@ class AktSemesterNull extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -56,11 +57,17 @@ class AktSemesterNull extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
+	public function getAktSemesterNull(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
 		$params = array($studiensemester_kurzbz);

 		$qry = "
@@ -89,6 +96,12 @@ class AktSemesterNull extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pre.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -18,9 +18,10 @@ class AktiverStudentOhneStatus extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -48,10 +49,11 @@ class AktiverStudentOhneStatus extends PlausiChecker
 	 * Students with active Benutzer should have a status in the current semester.
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -88,6 +90,12 @@ class AktiverStudentOhneStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND prestudent.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAktiverStudentstatusOhneKontobuchung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -61,6 +63,7 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,6 +71,7 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -109,6 +113,13 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pers.person_id = ?";
+			$params[] = $person_id;
+		}
+
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -64,6 +66,7 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -71,6 +74,7 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz, $studiensemester_kurzbz, $studiensemester_kurzbz);
@@ -105,6 +109,12 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND prestudent.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -0,0 +1,122 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ *
+ */
+class BeginndatumVorBismeldung extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getBeginndatumVorBismeldung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			$prestudent_id,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz,
+					),
+					'resolution_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * Beginndatum shouldn't be before Bismeldedatum if the Bismeldedatum has already  been reached.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getBeginndatumVorBismeldung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+
+		$bismeldestichtagRes = $this->_ci->BismeldestichtagModel->getByStudiensemester($studiensemester_kurzbz);
+
+		if (isError($bismeldestichtagRes)) return $bismeldestichtagRes;
+
+		if (!hasData($bismeldestichtagRes)) return success(array());
+
+		$bismeldestichtag = getData($bismeldestichtagRes)[0]->meldestichtag;
+
+		$params = array($bismeldestichtag, $studiensemester_kurzbz, $bismeldestichtag);
+
+		$qry = "
+			SELECT
+				prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent prestudent
+				JOIN public.tbl_prestudentstatus status ON(prestudent.prestudent_id=status.prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				LEFT JOIN bis.tbl_orgform USING(orgform_kurzbz)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				status.datum < ?::date
+				AND status.studiensemester_kurzbz = ?
+				AND status.insertamum > ?::date + interval '1' day
+				AND stg.melderelevant
+				AND prestudent.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}
@@ -19,12 +19,14 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getBewerberNichtZumRtAngetreten(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -58,6 +60,7 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,6 +68,7 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
@@ -112,6 +116,12 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND prestudent.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumAbschlusspruefungFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -58,6 +60,7 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param abschlusspruefung_id int if check is to be executed for a certain Abschlussprüfung
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,6 +68,7 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -112,6 +116,12 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pre.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class DatumSponsionFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumSponsionFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -58,6 +60,7 @@ class DatumSponsionFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param abschlusspruefung_id int if check is to be executed only for a certain Abschlussprüfung
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,6 +68,7 @@ class DatumSponsionFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -112,6 +116,12 @@ class DatumSponsionFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pre.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -18,9 +18,10 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -50,11 +51,16 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 	 * Status Dates and status studysemester dates should be in correct order.
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if check is to be executed only for certain Studiengaenge
 	 * @return success with prestudents or error
 	 */
-	public function getDatumStudiensemesterFalscheReihenfolge($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
+	public function getDatumStudiensemesterFalscheReihenfolge(
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
 		$params = array();

 		// all active students with Status student in current semester
@@ -97,6 +103,12 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -61,6 +63,7 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,6 +71,7 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -132,6 +136,12 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND tbl_person.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,14 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getFalscheAnzahlAbschlusspruefungen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -55,6 +57,7 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -62,6 +65,7 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -111,6 +115,12 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

+		if (isset($person_id))
+		{
+			$qry .= " AND pre.person_id = ?";
+			$params[] = $person_id;
+		}
+
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,12 +19,13 @@ class FalscheAnzahlHeimatadressen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$personRes = $this->getFalscheAnzahlHeimatadressen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexei Karpenko	805fd34d17	issue AbschlusspruefungOderAbsolventFehlt: added Studiensemester and moved distinct for correct resolving, added status fehler to fehler.php and IssueResolver	2026-05-27 23:23:56 +02:00
Alexei Karpenko	79b4625ed4	Merge branch 'feature-68834/Fehlermonitoring_Issues_weitere_features' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2026-05-26 15:38:53 +02:00
Alexei Karpenko	2076752f40	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-05-26 13:30:13 +02:00
Alexei Karpenko	d25d181d04	Merge branch 'master' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2026-05-25 16:40:51 +02:00
Alexei Karpenko	40c3a13a0c	Merge branch 'master' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2026-05-02 00:24:23 +02:00
Alexei Karpenko	0c002b3969	issue checker: added space between heading and refresh symbol, removed px class for more flexibility	2026-04-29 16:13:46 +02:00
Alexei Karpenko	2307565696	Plausicheckresolverlib: changed comment	2026-04-20 15:37:08 +02:00
Alexei Karpenko	ace2057166	Plausichecks InaktiverStudentAktiverStatus, ZuVieleZweckeIncomingPlausi: ptimized for issue production without Datenverbund, semester for resolving InaktiverStudentAktiverStatus optional	2026-04-17 16:01:33 +02:00
Alexei Karpenko	2428589bca	Issues: Geburtsnation fehlt, Falscher Incoming Zweck: added person Id, added issue checker component to Studierendenverwaltung header, added comments to issues, set some issues to self-resolving, Plausicheck GUI: issues from core, dvuh and bis are displayed	2026-04-16 02:12:01 +02:00
Alexei Karpenko	953a04f24a	added person id param to core plausichecks	2026-04-13 11:37:36 +02:00
Alexei Karpenko	82d640b1f4	plausichecks: uhstatpersonenkennungfehlt issue: removed oe_kurzbz, added datenverbund issues to core plausicheck gui	2026-04-03 11:52:22 +02:00
Alexei Karpenko	5b4e632526	issues, plausichecks: added producer for some core issues, producer lib: fehler with no config mappings are just ignored, plausicheck page optimizations (sorting etc)	2026-03-25 11:44:36 +01:00
Alexei Karpenko	5c2038fb79	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-03-19 16:54:05 +01:00
Alexei Karpenko	1b400f7d42	issuechecker: made details list optional, producer_controller: default value for apps	2026-02-12 22:36:42 +01:00
Alexei Karpenko	43811d5724	fehler/issue monitoring: enabled resolving/producing by app only, improved error messages, code layout, removed error: fehler to produce is not defined in config	2026-02-12 14:46:49 +01:00
Alexei Karpenko	4c03668082	PlausiIssueProducer Controller: added default run method	2026-02-10 17:34:17 +01:00
Alexei Karpenko	10d52caa98	Issue system: adapted to work with multiple apps per fehler	2026-02-03 15:39:11 +01:00
Alexei Karpenko	2de6278603	IssueChecker: changed expected prop type of isseListStyle and issueListStyleBreakpoints	2026-01-29 11:46:52 +01:00
Alexei Karpenko	85db467cff	issuechecker: layout, commented out _app property	2026-01-28 17:50:37 +01:00
Alexei Karpenko	1c65d6e076	plausicheckproducerlib, plausicheckresolverlib: added comments, resolver lib: loading producer lib only when calling resolvePlausicheckIssues, because producerlib is only needed for self-resolving logic in the resolvePlausicheckIssues method	2026-01-28 17:49:06 +01:00
Alexei Karpenko	f72ea1a655	Pausicheckproducerlib: loading fehler config files with php without code igniter, due to naming index conflicts	2026-01-28 17:28:10 +01:00
Alexei Karpenko	413ccba64b	fehler.php config: changed some fehler to warnings	2026-01-23 14:18:33 +01:00
Alexei Karpenko	9ccbb7b9e2	issuechecker: detailed issue list on click	2026-01-21 16:16:33 +01:00
Alexei Karpenko	d6803a3947	Fehler update: enabled updating of fehler columns, added insertaum, insertvon, updateamum, insertvon	2026-01-20 18:56:43 +01:00
Alexei Karpenko	545e2b0445	Fehlerupdate: additional extension check, fehler_kurzbz optional	2026-01-20 17:02:47 +01:00
Alexei Karpenko	131ec86dee	fehlerupdate: added check for app (existing in database?), code layout	2026-01-19 15:27:54 +01:00
Alexei Karpenko	cd03264ab4	Fehler: added fehlerupdate for adding missing fehler from config files to database	2026-01-16 13:09:11 +01:00
Alexei Karpenko	c6232f7959	plausicheckresolver bugfixes, removed CONFIG_FEHLER_FILENAME constants	2026-01-15 17:08:05 +01:00
Alexei Karpenko	cf2cc796b3	plausicheckproducerlib: extension fehler config files are loaded using code igniter	2026-01-15 16:26:16 +01:00
Alexei Karpenko	475888d4ac	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-01-14 16:52:55 +01:00
Alexei Karpenko	4b8b3c90fb	plausicheck resolver: by default, all issues for fehlercodes provided in constructor are resolved	2026-01-14 16:15:33 +01:00
Alexei Karpenko	b168ebb5f6	issues: changed logic to read producable issues from config file	2026-01-14 14:13:23 +01:00
Alexei Karpenko	a259db2e7b	issues: renamed method PersonenMitOffenenIssues, added expose to components	2025-12-19 16:09:38 +01:00
Alexei Karpenko	3e77d80d26	Issues: added possibility to display issues only when user is hauptzustaendig	2025-12-18 15:19:02 +01:00
Alexei Karpenko	2d71a436f6	IssueList: possible to pass endpoint dynamically	2025-12-16 17:30:25 +01:00
Alexei Karpenko	026bd6e247	moved issues controller to another folder	2025-12-15 18:00:05 +01:00
Alexei Karpenko	9c37215e62	issues: added issue controller for displaying issues, added issuechecker controller and component	2025-12-15 17:20:56 +01:00
Alexei Karpenko	733a6a8c15	issues: added vue component for displaying issues in a table	2025-11-26 16:28:16 +01:00
Alexei Karpenko	a24483188b	issueproducer: use next studiensemester as well to avoid problems with semester august gap	2025-11-26 16:24:30 +01:00
Alexei Karpenko	ab99806335	Merge branch 'master' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-07-31 08:31:11 +02:00
Alexei Karpenko	2cbc169484	Merge branch 'feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-07-29 11:09:42 +02:00
Alexei Karpenko	0acf604213	issues: enabled issue resolving without resolver for new studentstatus issues	2024-06-27 00:01:48 +02:00
Alexei Karpenko	8ab96fd1c4	Merge branch 'feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-06-26 23:02:36 +02:00
Alexei Karpenko	2db4e596cf	Status loeschen in FAS: corrected text when no rights	2024-06-26 23:00:47 +02:00
Alexei Karpenko	d58d386993	prestudent status checks: left join to get all prestudents (regardless if they are already students)	2024-06-15 13:43:07 +02:00
Alexei Karpenko	342afe9e82	Plausicheck OrgformBewerberUngleichorgform: changed name to correct camel case	2024-06-10 15:05:26 +02:00
Alexei Karpenko	2e0a4ef7a0	Plausicheck OrgformBewerberUngleichorgform: only studienplan orgform is checked	2024-06-10 15:04:45 +02:00
KarpAlex	6369202f99	resolver CORE_INOUT_0002.php: added "no direct access allowed" line	2024-06-08 00:32:46 +02:00
KarpAlex	13a27d7e6f	Prestudentstatus checks: order, Diplomand, orgform..., exceptionBisValidation: pass as boolean	2024-06-08 00:32:03 +02:00
KarpAlex	c9db3bbc1f	added new plausichecks AbschlusspruefungOderAbsolventFehlt, OrgformBewerbungUngleichOrgformStudent, StartsemesterUngleichPersonenzeichen, StudentstatusNachDiplomand, improved FalscheStatusabfolgeVorStudentstatus, BeginndatumVorBismeldung	2024-06-08 00:23:36 +02:00
KarpAlex	65f4fbd775	Bismeldestichtag GUI: descending semester sort	2024-06-08 00:16:17 +02:00
KarpAlex	a9653f79cf	Plausichecks GUI: sort dropdown by fehler kurzbz	2024-06-08 00:15:03 +02:00
KarpAlex	de9bb454e4	Merge branch 'feature-39602/Fas_Statusbearbeitung_bei_Sperre' of github.com:FH-Complete/FHC-Core into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-06-03 11:17:41 +02:00
Alexei Karpenko	b2d2c3e2c3	Plausichecks: added BeginndatumVorBismeldung and FalscheStatusabfolgeVorStudentstatus, improved AbschlusstatusFehlt	2024-06-02 17:46:51 +02:00
Alexei Karpenko	98e3872b6b	Merge branch 'master' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-06-02 16:52:13 +02:00
KarpAlex	0fab316927	Merge branch 'master' into feature-39602/Fas_Statusbearbeitung_bei_Sperre	2024-05-28 11:30:18 +02:00
ma0068	21170abd53	right to delete All Stati Abgewiesen permission RT-Aufsicht	2024-05-24 09:25:46 +02:00
ma0068	dfc5a38d2e	Version without extra button	2024-05-16 08:56:01 +02:00
ma0068	4152a7d969	abitlity to delete Status Abgewiesen with Permission RTAufsicht	2024-05-16 07:41:38 +02:00
ma0068	6bf22cfef6	Edit Ausbildungssemester if not Studentstatus	2024-05-15 15:28:51 +02:00
ma0068	458db654c2	Bearbeiten Statusgrund	2024-05-15 11:43:44 +02:00