refactor

.gitignore

@@ -1,6 +1,5 @@
 documents/
 vendor/
-public/vendor
 
 /nbproject/
 .vscode

application/config/abgabe.php

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

application/config/infocenter.php

@@ -3,4 +3,3 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
-$config['infocenter_qualifikationskurs_kz'] = '10002';

application/config/lvverwaltung.php

@@ -8,15 +8,4 @@ $config['lvverwaltung_tags'] = [
 ];
 */
 
-$config['lvverwaltung_tags'] = [];
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		// NOTE: 'default' & 'joins' like in stv.php config are currently not available here
-	]
-];
-*/
-
+$config['lvverwaltung_tags'] = [];

application/config/navigation.php

@@ -170,13 +170,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 51,
 					'requiredPermissions' => 'vertrag/mitarbeiter:r'
-				),
-				'studierendenverwaltung' => array(
-					'link' => site_url('studentenverwaltung'),
-					'description' => 'Studierendenverwaltung',
-					'expand' => true,
-					'sort' => 52,
-					'requiredPermissions' => ['admin:r', 'assistenz:r']
 				)
 			)
 		),
@@ -193,7 +186,7 @@ $config['navigation_header'] = array(
 					'description' => 'Extensions Manager',
 					'expand' => true,
 					'sort' => 10,
-					'requiredPermissions' => 'system/extensions:r'
+					'requiredPermissions' => 'admin:r'
 				),
 				'logsviewer' => array(
 					'link' => site_url('system/LogsViewer'),
@@ -206,14 +199,7 @@ $config['navigation_header'] = array(
 					'link' => site_url('system/jq/JobsQueueViewer'),
 					'description' => 'Jobs Queue Viewer',
 					'expand' => true,
-					'sort' => 30,
-					'requiredPermissions' => 'system/developer:r'
-				),
-				'phrasesviewer' => array(
-					'link' => site_url('system/phrases/PhrasesViewer'),
-					'description' => 'Phrases viewer',
-					'expand' => true,
-					'sort' => 40,
+					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
 				),
                 'anrechnungen' => array(
@@ -392,7 +378,7 @@ $config['navigation_menu']['apps'] = [
 	],
 	'lav' => [
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
-		'description' => 'Lehrauftragsverwaltung',
+		'description' => 'Lehraufträge',
 		#'icon' => 'person-chalkboard',
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]

application/config/routes.php

@@ -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';
@@ -75,67 +72,52 @@ $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
 $route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
 $route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
 
-// Studierendenverwaltung App Routes
-$route['studvw'] = 'studentenverwaltung/index';
-$route['studvw/.*'] = 'studentenverwaltung/index';
-// Old routes
-$route['studentenverwaltung'] = 'redirect/301/studvw';
-$route['studentenverwaltung/(:any)'] = 'redirect/301/studvw/stdsem/$1';
-$route['studentenverwaltung/(:any)/(prestudent|student|person|search)/(:any)'] = 'redirect/301/studvw/stdsem/$1/$2/$3';
-$route['studentenverwaltung/(:any)/prestudent/(:any)/tab/:any'] = 'redirect/301/studvw/stdsem/$1/prestudent/$2';
-$route['studentenverwaltung/(:any)/search/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/search/$2/$3';
-$route['studentenverwaltung/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/stg/$2';
-
 // Studierendenverwaltung List Routes
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/incoming/1'] = 'api/frontend/v1/stv/students/getIncoming/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/outgoing/1'] = 'api/frontend/v1/stv/students/getOutgoing/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/shared_studies/1'] = 'api/frontend/v1/stv/students/getGemeinsamestudien/$1';
+$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1';
+// (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2';
+// (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2';
+// (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3';
+// (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+// (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgformSpezialgruppe/$1/$3/$2/$4/$5';
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/prestudent/(:any)'] = 'api/frontend/v1/stv/students/getPrestudent/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/student/(:any)'] = 'api/frontend/v1/stv/students/getStudent/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/person/(:any)'] = 'api/frontend/v1/stv/students/getPerson/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/index';
-
-// Lvverwaltung List Routes
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
+// // (studiensemester_kurzbz)/uid/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/prestudent/(prestudent_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
+// // (studiensemester_kurzbz)/person/(person_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
 
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];

application/config/searchcis.php

@@ -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

application/config/studierendenantrag.php

@@ -168,40 +168,3 @@ $config['stgkz_blacklist_wiederholung'] = [];
  * @var array           An array of noten ids
  */
 $config['note_blacklist_wiederholung'] = [];
-
-/**
- *  Enable/disable the Abmeldung StG process
- *
- * @var bool
- */
-$config['abmeldung_stg_enabled'] = true;
-
-/**
- *  Enable/disable the Abmeldung process
- *
- * @var bool
- */
-$config['abmeldung_enabled'] = true;
-
-/**
- *  Enable/disable the Unterbrecher process
- *
- * @var bool
- */
-$config['unterbrechung_enabled'] = true;
-
-/**
- *  Enable/disable the Wiederholer process
- *
- * @var bool
- */
-$config['wiederholung_enabled'] = true;
-
-/**
- * Modal with Infotext of TLC
- * if true, there will be shown an info modal in the studentsView after the first button ABMELDUNG
- *
- * @var boolean
- */
-$config['showInfoModalAbmeldung'] = true;
-

application/config/stv.php

@@ -1,27 +1,6 @@
 <?php
 
 $config['number_displayed_past_studiensemester_default'] = 5;
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		'default' => "SQL SELECT statement for value",
-		'joins' => [
-			// additional joins needed for the SELECT statement above
-			[
-				'tablename',
-				'join condition', // single fieldname for USING or full condition for ON
-				'LEFT|RIGHT', // optional - join type
-				'after_xxx|before_xxx|end' // optional - position in query
-			]
-			// ...
-		]
-	]
-];
-*/
-
 $config['tabs'] =
 	[
 		'details' => [
@@ -81,13 +60,7 @@ $config['tabs'] =
 		],
 		'notes' => [
 			//if true, the count of Messages will be shown in the header of the Tab Messages
-			'showCountNotes' => true,
-
-			//if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'
-			'showErweitert' => false,
-
-			//notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
-			'notizLayout' => 'popupModal'
+			'showCountNotes' => true
 		],
 		'combinePeople' => [
 			//multitab should only be shown with this length of selection
@@ -160,25 +133,13 @@ $config['students_tab_order'] = [
 
 $config['stv_prestudent_tags'] = [
 	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => false],
+	'priotwo' => ['readonly' => true],
 	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => false],
-	'hinweis_kf' => ['readonly' => false],
+	'hinweis_assistenz' => ['readonly' => true],
+	'hinweis_kf' => ['readonly' => true],
 	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => false],
-	'finished_stg' => ['readonly' => false],
-	'finished_kf' => ['readonly' => false],
-	'inwork_kf' => ['readonly' => false],
-	'dd_auto' => ['readonly' => true],
-	'wh_auto' => ['readonly' => true],
-	'prewh_auto' => ['readonly' => true],
-	'out_auto' => ['readonly' => true],
-	'zgv_auto' => ['readonly' => true],
-	'unterbrecher_auto' => ['readonly' => true],
-	'stbtr_erh_auto' => ['readonly' => true],
-	'jgv_auto' => ['readonly' => true],
-	'in_auto' => ['readonly' => true],
-	'preabbr_auto' => ['readonly' => true],
+	'hinweis_stg_kf' => ['readonly' => true],
+	'finished_stg' => ['readonly' => true],
+	'finished_kf' => ['readonly' => true],
+	'inwork_kf' => ['readonly' => true],
 ];
-
-$config['userAutomatedTags'] = 'sftest';

application/config/treemenu.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['stv'] = [
-	"library" => "treemenu/StudVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];
-$config['lvv'] = [
-	"library" => "treemenu/LvVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];

application/config/treemenu/custom/lvvw.php

@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['root'] = [
-	'stg' => [
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		],
-		'orgform'
-	]
-];

application/config/treemenu/stg_base.php

@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['root'] = [
-	'stg' => [
-		'prestudent' => [
-			'stdsem' => [
-				'interessenten' => [
-					'bewerbungnichtabgeschickt',
-					'bewerbungabgeschickt',
-					'zgv',
-					'statusbestaetigt' => [
-						'statusbestaetigtrtnichtangemeldet',
-						'statusbestaetigtrtangemeldet'
-					],
-					'reihungstestnichtangemeldet',
-					'reihungstestangemeldet'
-				],
-				'bewerber' => [
-					'bewerberrtnichtangemeldet',
-					'bewerberrtangemeldet' => [
-						'bewerberrtangemeldetteilgenommen',
-						'bewerberrtangemeldetnichtteilgenommen'
-					]
-				],
-				'aufgenommen',
-				'warteliste',
-				'absage',
-				'incoming'
-			]
-		],
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		]
-	],
-	'inout' => [
-		'incoming',
-		'outgoing',
-		'shared_studies'
-	]
-];
-
-// copy stg tree into stg/orgforms
-$config['root']['stg']['orgform'] = $config['root']['stg'];

application/config/treemenu/stv_menu.php

@@ -0,0 +1,47 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['stv_menu'] = array(
+	'library' => 'treemenu/TreeMenuLib',
+	'children' => array(
+		'stg' => array(
+			'library' => 'treemenu/StgLib',
+			'children' => array(
+/*
+				'pre' => array(
+					'library' => 'treemenu/PrestudentLib'
+				),
+				'sem' => array(
+					'library' => 'treemenu/AusbSemesterLib',
+					'children' => array(
+						'vbd' => array(
+							'library' => 'treemenu/VerbandLib'
+						)
+					)
+				),
+*/
+				'orgform' => array(
+					'library' => 'treemenu/OrgFormLib',
+					'children' => array(
+/*
+						'pre' => array(
+							'library' => 'treemenu/PrestudentLib'
+						),
+						'sem' => array(
+							'library' => 'treemenu/AusbSemesterLib',
+							'children' => array(
+								'vbd' => array(
+									'library' => 'treemenu/VerbandLib'
+								)
+							)
+						)
+*/
+					)
+				)
+			)
+		),
+		'inout' => array(
+			'library' => 'treemenu/InOutLib'
+		),
+	)
+);

application/controllers/Cis/Abgabetool.php

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

application/controllers/Cis/Auth.php

@@ -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
 		{

application/controllers/Cis/Compat.php

@@ -1,44 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Compat extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct([
-			'ci' => ['basis/cis:r'],
-			'legacy' => ['basis/cis:r'],
-			
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * @access public
-	 * @return void 
-	 */
-	public function ci()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-	/**
-	 * @access public
-	 * @return void
-	 */
-	public function legacy()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-}

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

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

application/controllers/Cis/Profil.php

@@ -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;
 	}
+
+
 }

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis/Studium.php

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

application/controllers/Cis4.php

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

application/controllers/CisVue/Dashboard.php

@@ -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]);
+
+	}
+}

application/controllers/Redirect.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller redirects urls to another location. This is mainly used
- * with the $routes config
- */
-class Redirect extends CI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * Main function to handle all redirects.
-	 *
-	 * @param string				$method - the redirect code (30x)
-	 * @param array					$params - the url to redirect to
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params)
-	{
-		redirect($params, 'location', $method);
-	}
-}

application/controllers/api/frontend/v1/Bookmark.php

@@ -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);
-	}
+    }
 }
 

application/controllers/api/frontend/v1/Cis4FhcApi.php

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

application/controllers/api/frontend/v1/CisMenu.php

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
 class CisMenu extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -32,113 +31,28 @@ class CisMenu extends FHCAPI_Controller
 			'getMenu' => self::PERM_LOGGED,
 		]);
 
-
+		
 
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	/**
+    /**
 	 * fetches the menu for CIS from the database based on the userLanguage
 	 */
-	public function getMenu()
+    public function getMenu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
 		$this->load->config('cis');
-		$cis4_content_id = $this->config->item('cis_menu_root_content_id');
-		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(), getUserLanguage());
+		$cis4_content_id =$this->config->item('cis_menu_root_content_id');
+		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
 		$result = $this->getDataOrTerminateWithError($result);
 		$menu = $result->childs ?? [];
-
-		$menu = $this->generateUrlsForMenuItems($menu);
 		$this->terminateWithSuccess($menu);
-	}
+    }
 
-	private function generateUrlsForMenuItems($menuItems)
-	{
-		return array_map(
-			function ($menuItem) {
-				return $this->generateUrlForMenuItem($menuItem);
-			},
-			$menuItems
-		);
-	}
-
-	private function generateUrlForMenuItem($menuItem)
-	{
-		if(!isset($menuItem->url))
-		{
-			$menuItem->url = $this->menuItemUrlHelper($menuItem);
-			unset($menuItem->content);
-		}
-
-		if ($menuItem->childs && count($menuItem->childs)) {
-			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
-		}
-
-		return $menuItem;
-	}
-
-	private function menuItemUrlHelper($menuItem)
-	{
-		if ($menuItem->template_kurzbz !== 'redirect') {
-			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
-		}
-
-		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		$this->menuItemUrlTargetHelper($menuItem, $doc);
-
-		if (!$urlElem) {
-			return '';
-		}
-
-		$url = $urlElem->textContent;
-
-		if (strpos($url, '../cms/news.php') !== false) {
-			$newsRegex = '/^\.\.\/cms\/news\.php/';
-			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
-		}
-
-		if (strpos($url, '../cms/content.php?') !== false) {
-			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
-			$matches = [];
-			preg_match($contentRegex, $url, $matches);
-			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
-		}
-
-		if (strpos($url, '../index.ci.php') !== false) {
-			$indexRegex = '/^\.\.\/index\.ci\.php/';
-			$url = preg_replace($indexRegex, site_url(), $url);
-		}
-
-		if (strpos($url, '../') !== false) {
-			$relativeRegex = '/^\.\.\//';
-			$url = preg_replace($relativeRegex, base_url(), $url);
-		}
-
-		return $url;
-	}
-
-	private function menuItemUrlTargetHelper($menuItem, $xmldoc)
-	{
-		if($menuItem->template_kurzbz === 'redirect')
-		{
-			$targetElem = $xmldoc->getElementsByTagName('target')->item(0);
-			$target = ($targetElem) ? $targetElem->textContent : '';
-			if(!in_array($target, array('_self', '_top', '_blank')))
-			{
-				$target = '_self';
-			}
-			$menuItem->target = $target;
-		}
-	}
+	
+	
 }
 

application/controllers/api/frontend/v1/Lehre.php

@@ -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]);
-	}
 }
 

application/controllers/api/frontend/v1/Lehrveranstaltung.php

@@ -56,9 +56,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz);
+		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz);
 		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
 
 		$tree = [];
@@ -77,17 +75,15 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($tree);
 	}
-	public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
+	public function getByStg($studiensemester_kurzbz = null, $studiengang_kz = null, $semester = null)
 	{
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
+		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$verband = null;
 		if (!is_null($semester) && !is_numeric($semester))
 		{
-			$verband = $this->getOrgformKurzbz($semester);
+			$verband = $semester;
 			$semester = null;
 		}
 
@@ -264,53 +260,18 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		}
 	}
 
-	protected function getStudiengangKz($studiengang_typ_kurzbz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return null;
-
-		return current($data)->studiengang_kz;
-	}
-
 	private function getStudiensemesterKurzbz($studiensemester_kurzbz = null)
 	{
 		if (!is_null($studiensemester_kurzbz))
 		{
-			$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere([
-				'LOWER(studiensemester_kurzbz)' => strtolower($studiensemester_kurzbz)
-			]);
+			$studiensemester_result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
 
 			if (isError($studiensemester_result) || !hasData($studiensemester_result))
-				$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 			return getData($studiensemester_result)[0]->studiensemester_kurzbz;
 		}
 
 		$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 	}
-
-	protected function getOrgformKurzbz($orgform_kurzbz)
-	{
-		if ($orgform_kurzbz === null)
-			return null;
-
-		$this->load->model('codex/Orgform_model', 'OrgformModel');
-		$result = $this->OrgformModel->loadWhere([
-			'LOWER(orgform_kurzbz) =' => strtolower($orgform_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return $orgform_kurzbz;
-
-		return current($data)->orgform_kurzbz;
-	}
 }

application/controllers/api/frontend/v1/LvPlan.php

@@ -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,27 +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,
-			'getLeEvents' => self::PERM_LOGGED,
-			'getLvEvents' => 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,
@@ -63,22 +54,16 @@ class LvPlan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
-		$this->load->library('PhrasesLib');
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// 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');
@@ -98,31 +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,
@@ -131,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
 	 *
@@ -183,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());
 
@@ -198,6 +137,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -205,75 +145,41 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
-	public function getLeEvents($le_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-
-		if (is_null($le_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLE($le_id, $start_date, $end_date, $stundenplan);
-		$lvplanEvents = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($lvplanEvents);
-	}
-
-	public function getLvEvents($lv_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-		if (is_null($lv_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLV($lv_id, $start_date, $end_date, $stundenplan);
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
-		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
+	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);
 	}
@@ -304,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
@@ -320,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);
@@ -388,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
 	 *
@@ -457,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()
 			]
 		);
 
@@ -498,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
@@ -524,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }

application/controllers/api/frontend/v1/OtherLvPlan.php

@@ -1,77 +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');
-		$this->load->library('ProfilLib');
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * retrieves viewData for other lv plan view
-	 * @access public
-	 * @param  $uid the userID for which the other lv plan is being viewed
-	 */
-	public function otherLvPlanViewData($uid)
-	{
-		$isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-		$isMitarbeiter = getData($isMitarbeiterResult);
-		$isStudent = !$isMitarbeiter;
-
-		$resProfileData = $this->profillib->getView($uid);
-		$profileData = hasData($resProfileData) ? getData($resProfileData) : null;
-
-		$viewData = [
-			"user_data" => [
-				"username" => $uid,
-				"is_student" => $isStudent,
-				"is_mitarbeiter" => $isMitarbeiter,
-				"foto" => $profileData->data->foto,
-				"vorname" => $profileData->data->vorname,
-				"nachname" => $profileData->data->nachname,
-				"titel" => $profileData->data->titel,
-				"postnomen" => $profileData->data->postnomen,
-			],
-		];
-
-		$this->terminateWithSuccess($viewData);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-}
-

application/controllers/api/frontend/v1/Phrasen.php

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

application/controllers/api/frontend/v1/Profil.php

@@ -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),
-			],
-		];
-	}
+	
 }
 

application/controllers/api/frontend/v1/StgOrgLvPlan.php

@@ -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
-
-}
-

application/controllers/api/frontend/v1/Studium.php

@@ -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;
 		}))){
@@ -167,9 +153,7 @@ class Studium extends FHCAPI_Controller
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
 			foreach($lehrveranstaltungen as $lehrv){
-				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
-				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
-				foreach($lvs as $lv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
 					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
 					$lv->lektoren = $lvLektoren;
 				}
@@ -232,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;
@@ -288,7 +270,6 @@ SELECT tbl_lehrveranstaltung.*,
 		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
 		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){
 				return -1;
@@ -305,17 +286,12 @@ SELECT tbl_lehrveranstaltung.*,
 			}
 			else{
 				$parent =array_filter($carry, function($item)use($lehrv){
-					return isset($item->lehrveranstaltungen)
-						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
 				});
 				$parent = current($parent);
 				if($parent){
 					$parent->lehrveranstaltungen[] = $lehrv;
 				}
-				else{
-					// lehrveranstaltung without a modul: keep it on the top level
-					array_push($carry, $lehrv);
-				}
 			}
 			return $carry;
 		}, []);

application/controllers/api/frontend/v1/TabulatorPresets.php

@@ -1,162 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the PhrasesLib (back-end)
- * Provides data to the ajax get calls about the Phrasen plugin
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class TabulatorPresets extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getTabulatorPresets' => self::PERM_LOGGED,
-			'createTabulatorPreset' => self::PERM_LOGGED,
-			'updateTabulatorPreset' => self::PERM_LOGGED,
-			'deleteTabulatorPreset' => self::PERM_LOGGED,
-		]);
-
-		$this->load->model('tabulator/Tabulator_preset_model', 'TabulatorPresetModel');
-
-		$this->loadPhrases([
-			'global',
-			'tabulator_presets'
-		]);
-	}
-	
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getTabulatorPresets()
-	{
-		$tableName = $this->input->get("tableName");
-		if (!$tableName) {
-			$this->terminateWithError(error($this->p->t("tabulator_presets", "invalid_params_err_msg")));
-		}
-
-		$uid = getAuthUID();
-		$presets = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$presetsData = $this->getDataOrTerminateWithError($presets) ?? [];
-
-		$this->terminateWithSuccess($presetsData);
-	}
-
-	public function createTabulatorPreset()
-	{
-		$tableName = $this->input->post("tableName");
-		$presetName = $this->input->post("presetName");
-		$preset = $this->input->post("preset");
-
-		if (!$tableName || !$presetName || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$uid = getAuthUID();
-
-		$existingPresetsResult = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$existingPresets = $this->getDataOrTerminateWithError($existingPresetsResult) ?? [];
-
-		if (count($existingPresets) > 19) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "max_presets_count_err_msg"), "general", 409);
-		}
-
-		$existingPresetNames = array_map(function($presetInfo) {
-			return $presetInfo->preset_name;
-		}, $existingPresets);
-
-		if (in_array($presetName, $existingPresetNames)) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_name_duplicate_err_msg"), "general", 409);
-		}
-
-		$presetCreationResult = $this->TabulatorPresetModel->createTabulatorPreset($uid, $tableName, $presetName, $preset);
-
-		if (isError($presetCreationResult)) {
-			$this->terminateWithError($presetCreationResult->retval);
-		}
-
-		$newPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetCreationResult->retval);
-		$newPresetArray = $this->getDataOrTerminateWithError($newPresetData) ?? [null];
-		$newPreset = $newPresetArray[0];
-
-		$this->terminateWithSuccess($newPreset);
-	}
-
-	public function updateTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		$preset = $this->input->post("preset");
-
-		if (!$presetId || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		} 
-
-		$existingPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$existingPresetArray = $this->getDataOrTerminateWithError($existingPresetData) ?? [null];
-		$existingPreset = $existingPresetArray[0];
-		if (!$existingPreset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($existingPreset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_update_err_msg"), "general", 403);
-		}
-
-		$presetUpdateResult = $this->TabulatorPresetModel->updateTabulatorPreset($presetId, $preset);
-		if (isError($presetUpdateResult)) {
-			$this->terminateWithError($presetUpdateResult->retval);
-		}
-
-		$updatedPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$updatedPresetArray = $this->getDataOrTerminateWithError($updatedPresetData) ?? [null];
-		$updatedPreset = $updatedPresetArray[0];
-
-		$this->terminateWithSuccess($updatedPreset);
-	}
-
-	public function deleteTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		if (!$presetId) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$presetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$presetArray = $this->getDataOrTerminateWithError($presetData) ?? [null];
-		$preset = $presetArray[0];
-		if (!$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($preset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_delete_err_msg"), "general", 403);
-		}
-
-		$presetDeletionResult = $this->TabulatorPresetModel->deleteTabulatorPreset($presetId);
-		if (isError($presetDeletionResult)) {
-			$this->terminateWithError($presetDeletionResult->retval);
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-}

application/controllers/api/frontend/v1/TreeMenu.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about verbände
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class TreeMenu extends FHCAPI_Controller
+{
+	protected $treemenuconfig;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'fullMenu' => ['admin:r', 'assistenz:r'],
+			'partMenu' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function fullMenu($treemenu=null)
+	{
+		$includeSubMenu = true;
+		$this->getMenu($treemenu, $includeSubMenu);
+	}
+
+	public function partMenu($treemenu=null)
+	{
+		$includeSubMenu = false;
+		$this->getMenu($treemenu, $includeSubMenu);
+	}
+
+	protected function getMenu($treemenu=null, $includeSubMenu=false)
+	{
+		if(is_null($treemenu))
+		{
+			$this->terminateWithError('missing parameter treemenu.');
+		}
+
+		$this->loadMenuConfig($treemenu);
+
+		$uri = $this->uri->uri_to_assoc(7);
+		$startconfig = $this->findStartLib($this->treemenuconfig, array_keys($uri));
+
+		$libpath = $startconfig['library'];
+		$children = isset($startconfig['children']) ? $startconfig['children'] : array();
+		$libname = basename($startconfig['library']);
+
+		$this->load->library(
+			$libpath,
+			$children,
+			$libname
+		);
+
+		$bhdebug = (object) array(
+			'treemenu' => $treemenu,
+			'treemenuconfig' => $this->treemenuconfig,
+			'uri' => $uri,
+			'libpath' => $libpath,
+			'libname' => $libname,
+			'children' => $children,
+			'startconfig' => $startconfig
+		);
+		$this->addMeta('bhdebug', $bhdebug);
+		//$this->addMeta('bhci', $this);
+
+		$this->$libname->init($uri, $includeSubMenu);
+		$data = $this->$libname->getSubMenu();
+		$this->terminateWithSuccess($data);
+	}
+
+	protected function findStartLib($config, $uri)
+	{
+		$level = array_shift($uri);
+		if(is_null($level)) {
+			return $config;
+		}
+		return $this->findStartLib($config['children'][$level], $uri);
+	}
+
+	protected function loadMenuConfig($treemenu)
+	{
+		$this->config->load('treemenu/' . $treemenu . '.php');
+		$this->treemenuconfig = $this->config->item($treemenu);
+	}
+}

application/controllers/api/frontend/v1/Treemenu.php

@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \ReflectionMethod as ReflectionMethod;
-use \ReflectionFunction as ReflectionFunction;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about menues
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Treemenu extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		// Load Router
-		$router = load_class('Router');
-
-		// Load Config
-		$config = load_class('Config');
-		$config->load('treemenu');
-
-		// Get Treemenu name & config
-		$name = $router->method;
-		$conf = $config->item($name);
-		
-		// Get Permissions from config
-		$permissions = $conf['permissions'] ?? self::PERM_ANONYMOUS;
-
-		// Call constructor
-		parent::__construct([
-			$name => $permissions
-		]);
-
-		// Load Library
-		$libraryName = $conf['library'] ?? null;
-		$this->load->library($libraryName, null, 'treemenulib');
-	}
-	
-	/**
-	 * @param string		$method
-	 * @param array			$params				(optional)
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params = [])
-	{
-		if (!$this->treemenulib)
-			show_404();
-
-		$this->addMeta('ci_method', $method);
-		$this->addMeta('ci_params', $params);
-		
-		$params = $this->uri->uri_to_assoc(6); // 6 = start of $params
-		$config = $this->treemenulib->config;
-
-		foreach (array_keys($params) as $key) {
-			if (!isset($config[$key]) || !$config[$key])
-				show_404();
-
-			$config = $config[$key];
-		}
-
-		// Prepare aliases
-		$argumentaliases = [];
-		if (property_exists($this->treemenulib, 'path_to_argument'))
-			$argumentaliases = array_flip($this->treemenulib->path_to_argument);
-		$methodaliases = [];
-		if (property_exists($this->treemenulib, 'redirect_method'))
-			$methodaliases = $this->treemenulib->redirect_method;
-		
-		$items = [];
-		foreach ($config as $uripart => $children) {
-			if (!is_array($children)) {
-				$uripart = $children;
-				$children = [];
-			}
-
-			$methodName = $uripart;
-			if (isset($methodaliases[$methodName])) {
-				$methodName = $methodaliases[$methodName];
-			} elseif (strpbrk($methodName, ' _-') !== false) {
-				$methodName = lcfirst(str_replace([' ', '_', '-'], '', ucwords($methodName, " \t\r\n\f\v_-")));
-			}
-
-			// Prepare arguments
-			if (is_callable($methodName, false, $name)) {
-				if (is_string($methodName) && is_callable([$this->treemenulib, $methodName]))
-					$callable = [$this->treemenulib, $methodName];
-				else
-					$callable = $methodName;
-			} else {
-				$callable = [$this->treemenulib, $methodName];
-			}
-
-			if (is_array($callable))
-				$reflection = new ReflectionMethod($callable[0], $callable[1]);
-			elseif (is_string($callable) && strstr($callable, '::'))
-				$reflection = new ReflectionMethod($callable);
-			elseif ($name != 'Closure::__invoke' && strstr($name, '::__invoke'))
-				$reflection = new ReflectionMethod($callable, '__invoke');
-			else
-				$reflection = new ReflectionFunction($callable);
-
-			$arguments = [];
-			foreach ($reflection->getParameters() as $arg) {
-				if ($arg->name == 'path_template') {
-					$path = $params;
-					$path[$uripart] = '%s';
-					$arguments[] = $this->uri->assoc_to_uri($path);
-				} elseif ($arg->name == 'has_children') {
-					$arguments[] = $children;
-				} elseif ($arg->name == 'original_method') {
-					$arguments[] = $uripart;
-				} elseif (isset($argumentaliases[$arg->name]) && isset($params[$argumentaliases[$arg->name]])) {
-					$arguments[] = $params[$argumentaliases[$arg->name]];
-				} elseif (isset($params[$arg->name])) {
-					$arguments[] = $params[$arg->name];
-				} else {
-					$arguments[] = null;
-				}
-			}
-
-			// Call function from lib
-			$items = array_merge($items, call_user_func_array($callable, $arguments));
-		}
-
-		$this->terminateWithSuccess($items);
-	}
-}

application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

application/controllers/api/frontend/v1/dashboard/Board.php

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

application/controllers/api/frontend/v1/dashboard/Preset.php

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

application/controllers/api/frontend/v1/dashboard/User.php

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

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -9,10 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getSemesterStati' => ['admin:r', 'assistenz:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 
@@ -49,17 +48,6 @@ class Detailheader extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
-	public function getSemesterStati($prestudent_id)
-	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
 }
 
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,10 +294,6 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

application/controllers/api/frontend/v1/lv/Config.php

@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_setAuthUID();
-
-		$this->loadPhrases([
-			'lehre'
-		]);
-
-		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->library('PermissionLib');
-
-	}
-
-
-	public function get()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
-		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
-		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
-
-		$config['ignore_kollision'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_kollision',
-			"value" => $ignore_kollision,
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_zeitsperre',
-			"value" => $ignore_zeitsperre,
-		];
-
-		$config['ignore_reservierung'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_reservierung',
-			"value" => $ignore_reservierung,
-		];
-
-		$this->terminateWithSuccess($config);
-	}
-	public function set()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		foreach (['ignore_kollision','ignore_zeitsperre','ignore_reservierung'] as $variable)
-		{
-			if ($this->_ci->input->post($variable) !== null)
-			{
-				$this->VariableModel->update(array('uid' => $this->_uid, 'name' => $variable), array('wert' => $this->input->post($variable)));
-
-			}
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid)
-			show_error('User authentification failed');
-	}
-}

application/controllers/api/frontend/v1/lv/Favorites.php

@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['lv_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess(isset($data['lv_favorites']) ? $data['lv_favorites'] : null);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'lv_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}

application/controllers/api/frontend/v1/lv/Gruppe.php

@@ -15,7 +15,6 @@ class Gruppe extends FHCAPI_Controller
 			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
 			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
-			'getGruppe' => ['admin:r', 'assistenz:r'],
 		]);
 
 		$this->_ci = &get_instance();
@@ -68,7 +67,7 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->checkPermission($lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, $lehrverband === true || $lehrverband === 'true');
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
 
 		if (isError($result))
 			$this->terminateWithError(getError($result));
@@ -76,71 +75,6 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getGruppe()
-	{
-		$lehrverband = $this->input->post('lehrverband');
-
-		$gruppen_result = array();
-
-		if ($lehrverband === false)
-		{
-			$gruppen_result = $this->_ci->GruppeModel->loadWhere(array(
-				'studiengang_kz' => $this->input->post('stg_kz'),
-				'gruppe_kurzbz' => $this->input->post('gruppe_kurzbz'),
-				'aktiv' => true
-			));
-		}
-		else if ($lehrverband === true)
-		{
-
-			if (!isEmptyString($this->input->post('verband')))
-			{
-				$this->LehrverbandModel->db->where('verband', $this->input->post('verband'));
-			}
-			else
-			{
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("trim(verband) = ''");
-				$this->LehrverbandModel->db->or_where("verband IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			if (!isEmptyString($this->input->post('gruppe')))
-			{
-				$this->LehrverbandModel->db->where('gruppe', $this->input->post('gruppe'));
-			}
-			else
-			{
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("trim(gruppe) = ''");
-				$this->LehrverbandModel->db->or_where("gruppe IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			if (!isEmptyString((string)$this->input->post('semester')))
-			{
-				$this->LehrverbandModel->db->where('semester', $this->input->post('semester'));
-			}
-			else
-			{
-
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("semester = ''");
-				$this->LehrverbandModel->db->or_where("semester IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			$gruppen_result = $this->LehrverbandModel->loadWhere(array('studiengang_kz' => $this->input->post('stg_kz'), 'aktiv' => true));
-		}
-
-		if (!hasData($gruppen_result))
-			return $this->terminateWithError('No group found');
-
-		$gruppen_array = getData($gruppen_result)[0];
-
-		$this->terminateWithSuccess($gruppen_array->gid);
-	}
-
 	public function getByLehreinheit($lehreinheit_id = null)
 	{
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))

application/controllers/api/frontend/v1/lv/Lektor.php

@@ -134,14 +134,9 @@ class Lektor extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nullable_fields = array('semesterstunden', 'stundensatz', 'planstunden');
-
-		foreach ($nullable_fields as $nullable_field)
+		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
 		{
-			if (isset($formData[$nullable_field]) && (!is_numeric($formData[$nullable_field]) || $formData[$nullable_field] === ''))
-			{
-				$formData[$nullable_field] = null;
-			}
+			$formData['semesterstunden'] = null;
 		}
 
 		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
@@ -149,9 +144,6 @@ class Lektor extends FHCAPI_Controller
 		if (!$lehreinheit_permission)
 			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
 
-		if (!is_null($this->getLektorVertrag($lehreinheit_id, $mitarbeiter_uid)) && (array_key_exists('mitarbeiter_uid', $formData) && $mitarbeiter_uid !== $formData['mitarbeiter_uid']))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
-
 		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
 
 		if (isError($result)) $this->terminateWithError(getError($result));
@@ -162,7 +154,7 @@ class Lektor extends FHCAPI_Controller
 	{
 		$value = str_replace(',', '.', $value);
 
-		if (!is_numeric($value) && $value !== "")
+		if (!is_numeric($value))
 		{
 			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss eine Zahl sein.');
 			return false;

application/controllers/api/frontend/v1/lv/Noten.php

@@ -1,84 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Noten extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getCertificate' => 'student/noten:r',
-			'getTeacherProposal' => 'student/noten:r',
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'stv',
-			'person',
-			'lehre'
-		]);
-	}
-
-	public function getCertificate($lv_id, $studiensemester_kurzbz = null)
-	{
-		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$result = $this->LehrveranstaltungModel->loadWhere([
-			'lehrveranstaltung_id' => $lv_id
-		]);
-
-		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehrveranstaltung)
-			$this->terminateWithSuccess([]);
-
-		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-		{
-			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$result = $this->ZeugnisnoteModel->getZeugnisnoten(null, $studiensemester_kurzbz, $lehrveranstaltung[0]->lehrveranstaltung_id);
-
-		$grades = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($grades);
-	}
-
-	public function getTeacherProposal($lv_id, $studiensemester_kurzbz = null)
-	{
-		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$result = $this->LehrveranstaltungModel->loadWhere([
-			'lehrveranstaltung_id' => $lv_id
-		]);
-
-		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehrveranstaltung)
-			$this->terminateWithSuccess([]);
-
-		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-		{
-			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, null, $studiensemester_kurzbz);
-
-		$grades = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($grades);
-	}
-
-}

application/controllers/api/frontend/v1/lv/Setup.php

@@ -19,8 +19,6 @@
 if (!defined('BASEPATH'))
 	exit('No direct script access allowed');
 
-use CI3_Events as Events;
-
 class Setup extends FHCAPI_Controller
 {
 	private $_ci;
@@ -29,8 +27,7 @@ class Setup extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLETabs' => ['admin:r', 'assistenz:r'],
-			'getLVTabs' => ['admin:r', 'assistenz:r'],
+			'getTabs' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
@@ -44,10 +41,9 @@ class Setup extends FHCAPI_Controller
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->helper('hlp_document');
 	}
 
-	public function getLETabs()
+	public function getTabs()
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
@@ -64,43 +60,11 @@ class Setup extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
-		$tabs['termine'] = array (
-			'title' =>  'Termine',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Termine.js'),
-			'config' => []
-		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
 			'config' => []
 		);
-
-		Events::trigger('lvv_conf_tabs', function & () use (&$tabs) {
-			return $tabs;
-		});
-
-		$this->terminateWithSuccess($tabs);
-	}
-
-	public function getLVTabs()
-	{
-		$tabs['termine'] = array (
-			'title' =>  'Termine',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/LVTermine.js'),
-			'config' => []
-		);
-		$tabs['noten'] = array (
-			'title' =>  'Noten',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Noten.js'),
-			'config' => [
-				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
-				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'inline', // Possible values: both|header|inline
-				'documents' => 'inline', // Possible values: both|header|inline
-				'documentslist' => gradesDocumentsList(),
-				'semesterSelect' => false
-			]
-		);
 		$this->terminateWithSuccess($tabs);
 	}
 

application/controllers/api/frontend/v1/lv/StgTree.php

@@ -0,0 +1,117 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StgTree extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		return $this->getStudiengang($method);
+		show_404();
+	}
+
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getStudiengang($studiengang_kz)
+	{
+		$link = $studiengang_kz . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('semester');
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$result = $this->StudiengangModel->load($studiengang_kz);
+		$result = $this->getDataOrTerminateWithError($result);
+		if ($result)
+		{
+			if (current($result)->mischform)
+			{
+				$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+				$this->StudienordnungModel->addDistinct();
+				$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
+
+				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+				$result = $this->StudienordnungModel->loadWhere([
+					'aktiv' => true,
+					'studiengang_kz' => $studiengang_kz,
+					'p.orgform_kurzbz !=' => 'DDP'
+				]);
+				$result = $this->getDataOrTerminateWithError($result);
+
+				$list = array_merge($list, $result);
+			}
+		}
+
+		$this->terminateWithSuccess($list);
+	}
+}

application/controllers/api/frontend/v1/organisation/Studiensemester.php

@@ -26,9 +26,7 @@ class Studiensemester extends FHCAPI_Controller
 				'getAll' => self::PERM_LOGGED,
 				'getAktNext' => self::PERM_LOGGED,
 				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
-				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
-				'current' => self::PERM_LOGGED,
-				'set' => self::PERM_LOGGED
+				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -168,39 +166,4 @@ class Studiensemester extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess(array($studiensemester, $aktuell));
 	}
-
-	public function current()
-	{
-		$result = $this->StudiensemesterModel->getNearest();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			$this->terminateWithError('Kein Studiensemester aktiv');
-		if (count($data) > 1)
-			$this->terminateWithError('Mehrere Studiensemester aktiv');
-
-		$this->terminateWithSuccess(current($data)->studiensemester_kurzbz);
-	}
-
-	public function set()
-	{
-		$this->load->library('AuthLib');
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$stdsem = $this->input->post('studiensemester_kurzbz');
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
 }

application/controllers/api/frontend/v1/stv/Abschlusspruefung.php

@@ -246,12 +246,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$searchString = $this->input->get('searchString') ?? '';
 
-		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$result = $this->PersonModel->searchPerson($searchString, 'mitMaUid');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
 
 		if (isError($result)) {
-			  $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess($result ?: []);
@@ -371,9 +371,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$datum = $formData['datum'] == '' ? null : $formData['datum'];
-		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
-
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -385,8 +382,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $datum,
-				'sponsion' => $sponsion,
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

application/controllers/api/frontend/v1/stv/Config.php

@@ -301,7 +301,6 @@ class Config extends FHCAPI_Controller
 
 	public function student()
 	{
-		$this->load->helper('hlp_document');
 		$result = [];
 		$config = $this->config->item('tabs');
 
@@ -377,9 +376,9 @@ class Config extends FHCAPI_Controller
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
 				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'inline', // Possible values: both|header|inline
-				'documents' => 'inline', // Possible values: both|header|inline
-				'documentslist' => gradesDocumentsList()
+				'delete' => 'both', // Possible values: both|header|inline
+				'documents' => 'both', // Possible values: both|header|inline
+				'documentslist' => $this->gradesDocumentsList()
 			]
 		];
 
@@ -623,6 +622,188 @@ class Config extends FHCAPI_Controller
 		] + $this->kontoColumns();
 	}
 
+	/**
+	 * Helper function to generate the default documentslist config for the
+	 * grades tab.
+	 *
+	 * The resulting array consists of elements which are associative arrays
+	 * that can have the following entries:
+	 * title			(required) on the first level this can be HTML code.
+	 * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
+	 * 						true or false.
+	 * link				(optional) an URL that will be called if "action" and
+	 * 						"children" are not defined.
+	 * action			(optional) an associative array that describes an
+	 * 						POST action that will be called if "children" is
+	 * 						not defined.
+	 * 						It can have the following entries:
+	 * - url			(required) an URL to an FHCAPI endpoint.
+	 * - post			(optional) an associative array with the POST data to
+	 * 						be sent.
+	 * - response		(optional) a string that will be displayed on success.
+	 * children			(optional) an array of child elements
+	 *
+	 * All strings that start with { and end with } in the URLs and the
+	 * actions post parameter will be replaced with the corresponding
+	 * attribute of the current dataset (e.G: {uid} will be replaced with the
+	 * uid of the current dataset)
+	 *
+	 * @return array
+	 */
+	protected function gradesDocumentsList()
+	{
+		$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
+
+		$title_ger = $this->p->t("global", "deutsch");
+		$title_eng = $this->p->t("global", "englisch");
+		$title_ff = $this->p->t("stv", "document_certificate");
+		$title_lv = $this->p->t("stv", "document_coursecertificate");
+
+		$link_ff = "documents/export/" .
+			"zertifikat.rdf.php/" .
+			"Zertifikat" .
+			"?stg_kz={studiengang_kz_lv}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+		$link_lv_ger = "documents/export/" .
+			"lehrveranstaltungszeugnis.rdf.php/" .
+			"LVZeugnis" .
+			"?stg_kz={studiengang_kz}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+		$link_lv_eng = "documents/export/" .
+			"lehrveranstaltungszeugnis.rdf.php/" .
+			"LVZeugnisEng" .
+			"?stg_kz={studiengang_kz}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+
+		$archive_url = "api/frontend/v1/documents/archiveSigned";
+		$archive_response = $this->p->t("stv", "document_signed_and_archived");
+		$archive_post_ff = [
+			"xml" => "zertifikat.rdf.php",
+			"xsl" => "Zertifikat",
+			"stg_kz" => "{studiengang_kz_lv}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+		$archive_post_lv_ger = [
+			"xml" => "lehrveranstaltungszeugnis.rdf.php",
+			"xsl" => "LVZeugnis",
+			"stg_kz" => "{studiengang_kz}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+		$archive_post_lv_eng = [
+			"xml" => "lehrveranstaltungszeugnis.rdf.php",
+			"xsl" => "LVZeugnisEng",
+			"stg_kz" => "{studiengang_kz}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+
+		$list = [
+			[
+				'title' => '<i class="fa fa-download" title="' . $this->p->t("stv", "document_download") . '"></i>',
+				'children' => [
+					[
+						'title' => $title_ff,
+						'link' => site_url($link_ff)
+					],
+					[
+						'title' => $title_lv,
+						'children' => [
+							[
+								'title' => $title_ger,
+								'link' => site_url($link_lv_ger),
+								'children' => [
+									[
+										'title' => 'PDF',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger)
+									],
+									[
+										'title' => 'DOC',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger . "&output=doc")
+									],
+									[
+										'title' => 'ODT',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger . "&output=odt")
+									]
+								]
+							],
+							[
+								'title' => $title_eng,
+								'link' => site_url($link_lv_eng),
+								'children' => [
+									[
+										'title' => 'PDF',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng)
+									],
+									[
+										'title' => 'DOC',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng . "&output=doc")
+									],
+									[
+										'title' => 'ODT',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng . "&output=odt")
+									]
+								]
+							]
+						]
+					]
+				]
+			],
+			[
+				'title' => '<i class="fas fa-archive" title="' . $this->p->t("stv", "document_archive") . '"></i>',
+				'children' => [
+					[
+						'title' => $title_ff,
+						'action' => [
+							'url' => site_url($archive_url),
+							'post' => $archive_post_ff,
+							'response' => $archive_response
+						]
+					],
+					[
+						'title' => $title_lv,
+						'children' => [
+							[
+								'title' => $title_ger,
+								'action' => [
+									'url' => site_url($archive_url),
+									'post' => $archive_post_lv_ger,
+									'response' => $archive_response
+								]
+							],
+							[
+								'title' => $title_eng,
+								'action' => [
+									'url' => site_url($archive_url),
+									'post' => $archive_post_lv_eng,
+									'response' => $archive_response
+								]
+							]
+						]
+					]
+				]
+			]
+		];
+
+		return $list;
+	}
+
 	/**
 	 * Sort tab list
 	 *

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -170,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -182,7 +180,7 @@ class Dokumente extends FHCAPI_Controller
 				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
 				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
 				'titel_intern' => $this->input->post('titel_intern'),
-				'nachgereicht_am' => $nachgereicht_am,
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
 				'updatevon' => $uid,
 			]

application/controllers/api/frontend/v1/stv/Favorites.php

@@ -20,8 +20,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about favorite treemenu entries
- * Listens to ajax post calls to change the favorite treemenu entries
+ * Provides data to the ajax get calls about favorite verbände
+ * Listens to ajax post calls to change the favorite verbände data
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
  */
 class Favorites extends FHCAPI_Controller
@@ -29,7 +29,7 @@ class Favorites extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'get' => self::PERM_LOGGED,
+			'index' => self::PERM_LOGGED,
 			'set' => self::PERM_LOGGED
 		]);
 
@@ -37,19 +37,19 @@ class Favorites extends FHCAPI_Controller
 		$this->load->model('system/Variable_model', 'VariableModel');
 	}
 
-	public function get($app)
+	public function index()
 	{
-		$result = $this->VariableModel->getVariables(getAuthUID(), [$app . '_favorites']);
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data[$app . '_favorites'] ?? null);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
-	public function set($app)
+	public function set()
 	{
 		$this->load->library('form_validation');
 
@@ -60,7 +60,7 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
-		$result = $this->VariableModel->setVariable(getAuthUID(), $app . '_favorites', $favorites);
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
 		

application/controllers/api/frontend/v1/stv/Konto.php

@@ -429,12 +429,9 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
-
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
-			if($data['buchungsdatum'] == '')
-				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

application/controllers/api/frontend/v1/stv/LvTermine.php

@@ -34,7 +34,7 @@ class LvTermine extends FHCAPI_Controller
 
 	//TODO Build own lib or combine with Controller Stundenplan.php
 	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
-	public function getStundenplan($uid, $start_date = null, $end_date = null, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
 	{
 		$student_uid = $uid;
 		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
@@ -80,6 +80,13 @@ class LvTermine extends FHCAPI_Controller
 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 		$this->terminateWithSuccess($stundenplan_data);
+
+		$this->expand_object_information($stundenplan_data);
+
+		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
+		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
+		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+		$this->terminateWithSuccess($stundenplan_data);
 	}
 
 	public function getStudiensemester()
@@ -370,7 +377,6 @@ class LvTermine extends FHCAPI_Controller
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
-						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result));

application/controllers/api/frontend/v1/stv/Mobility.php

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = ($formData['von'] ?? '') ?: null;
-		$bis = ($formData['bis'] ?? '') ?: null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
 		$nation_code = $formData['nation_code'] ?? null;
 		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
 		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;

application/controllers/api/frontend/v1/stv/Prestudent.php

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
 				)
 				{
 					$val = null;

application/controllers/api/frontend/v1/stv/Projektarbeit.php

@@ -42,8 +42,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->model('education/Note_model', 'NoteModel');
 		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		// load libraries
 		$this->load->library('PermissionLib');
@@ -92,27 +90,21 @@ 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);
+		$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'
+		);
+		$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');
+		$result = $this->ProjektarbeitModel->loadWhere(
+			array('projektarbeit_id' => $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,
-			tbl_projektarbeit.studiensemester_kurzbz, firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
-		);
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		
-		
-		return $this->ProjektarbeitModel->loadWhere(
-			array('projektarbeit_id' => $projektarbeit_id)
-		);
-	}
 
 	/**
 	 * Inwert a Projektarbeit.
@@ -140,8 +132,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
-		
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -248,38 +239,14 @@ class Projektarbeit extends FHCAPI_Controller
 		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
 
 		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemester missing', self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
 
-		// get prestudent_id from student model
-		$studentRes = $this->StudentModel->load(['student_uid' => $student_uid]);
-		if(hasData($studentRes)) {
-			$student = getData($studentRes);
-		} else {
-			$this->terminateWithError($studentRes, self::ERROR_TYPE_GENERAL);
-		}
-		
-		// to get prestudent_status history
-		$historyRes = $this->PrestudentstatusModel->getHistoryPrestudent($student[0]->prestudent_id);
-		if(hasData($historyRes)) {
-			$history = getData($historyRes);
-		} else {
-			$this->terminateWithError($historyRes, self::ERROR_TYPE_GENERAL);
-		}
-		
-		// query for every lva of a studiengang that has projektarbeit flag true
+		// get Lvs
 		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
+
 		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
 		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
-		
-		$lvsIDs = array_column($lvs, 'lehrveranstaltung_id');
-		
-		// get current studienplan_id from status history to find out which lva options are actually assigned to the students studienplan 
-		// important so the projektarbeit has the correct lva assigned to be able to find and print the thesis title on the degree documents!
-		$currentStatus = $history[0];
-		$lvByStudienPlanRes = $this->LehrveranstaltungModel->getLvsByStudienplanByLvaIDs($currentStatus->studienplan_id, $lvsIDs);
-		if(hasData($lvByStudienPlanRes)) {
-			$lvs = getData($lvByStudienPlanRes);
-		}
 
 		foreach ($lvs as $lv)
 		{
@@ -313,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);
 
@@ -346,18 +316,11 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);
 
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'is_natural', [
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
 			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
 		]);
 
-		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
-		]);
-
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
-		]);
-
 		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
 		]);
@@ -387,8 +350,6 @@ class Projektarbeit extends FHCAPI_Controller
 			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
-			'lehrveranstaltung_id' => $formData['lehrveranstaltung_id'],
-			'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
 			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
 			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
 			'note' => $formData['note'] ?? null,

application/controllers/api/frontend/v1/stv/Pruefung.php

@@ -448,10 +448,8 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
-		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
-
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -461,7 +459,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $datum,
+					'datum' => $this->input->post('datum'),
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -474,7 +472,7 @@ class Pruefung extends FHCAPI_Controller
 				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
 				'student_uid' => $this->input->post('student_uid'),
 				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $datum,
+				'datum' => $this->input->post('datum'),
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -522,7 +520,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $datum,
+				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -557,7 +555,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $datum,
+			'benotungsdatum' => $this->input->post('datum'),
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

application/controllers/api/frontend/v1/stv/Student.php

@@ -144,7 +144,6 @@ class Student extends FHCAPI_Controller
 				. $this->PrestudentModel->escape($studiensemester_kurzbz)
 				. ")  AS statusofsemester"
 		);
-		$this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
@@ -297,10 +296,6 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
-			else if ($prop == 'gebdatum')
-			{
-				$update_person[$prop] = ($val == '') ? null : $val;
-			}
 			else
 			{
 				$update_person[$prop] = $val;

application/controllers/api/frontend/v1/stv/Tags.php

@@ -15,9 +15,7 @@ class Tags extends Tag_Controller
 			'addTag' => self::BERECHTIGUNG_KURZBZ,
 			'updateTag' => self::BERECHTIGUNG_KURZBZ,
 			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
-			'getAllTags' => self::BERECHTIGUNG_KURZBZ,
-			'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
+			'deleteTag' => self::BERECHTIGUNG_KURZBZ
 		]);
 
 	$this->config->load('stv');
@@ -47,5 +45,4 @@ class Tags extends Tag_Controller
 	{
 		parent::doneTag($this->config->item('stv_prestudent_tags'));
 	}
-
 }

application/controllers/api/frontend/v1/stv/Verband.php

@@ -0,0 +1,513 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about verbände
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Verband extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Models
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+	
+	/**
+	 * Remap calls:
+	 * /
+	 * /(studiengang_kz)									=> getStudiengang
+	 * /(studiengang_kz)/(semester)							=> getSemester
+	 * /(studiengang_kz)/(semester)/(verband)				=> getVerband
+	 * /(studiengang_kz)/(org_form)							=> getStudiengang
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getSemester
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getVerband
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		// NOTE(chris): Test if access is allowed ($method is the Studiengang)
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			elseif ($params[0] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method));
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			elseif ($params[1] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method));
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+		if ($count == 3 && !is_numeric($params[0]) && is_numeric($params[1]) && !is_numeric($params[2]))
+			return $this->getVerband($method, $params[1], $params[2], $params[0]);
+
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+		
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		if ($this->permissionlib->isBerechtigt('inout/uebersicht'))
+			$list[] = [
+				'name' => 'International',
+				'link' => 'inout',
+				'children' => [
+					[
+						'name' => 'Incoming',
+						'link' => 'inout/incoming',
+						'leaf' => true
+					],
+					[
+						'name' => 'Outgoing',
+						'link' => 'inout/outgoing',
+						'leaf' => true
+					],
+					[
+						'name' => 'Gemeinsame Studien',
+						'link' => 'inout/gemeinsamestudien',
+						'leaf' => true
+					]
+				]
+			];
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$orgform			(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudiengang($studiengang_kz, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(
+			UPPER(CONCAT(typ, kurzbz)), 
+			'-', 
+			semester, 
+			(
+				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
+				FROM public.tbl_lehrverband 
+				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
+				ORDER BY verband, gruppe LIMIT 1
+			)
+		) AS name", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('semester');
+
+		if ($org_form !== null) {
+			$this->StudiengangModel->addSelect("v.orgform_kurzbz");
+			$this->StudiengangModel->db->group_start();
+			$this->StudiengangModel->db->where('v.semester', 0);
+			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
+			$this->StudiengangModel->db->group_end();
+		}
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		array_unshift($list, [
+			'name' => 'PreStudent',
+			'link' => $link . 'prestudent',
+			'no_sem_reload' => true,
+			'stg_kz' => (int)$studiengang_kz,
+			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
+		]);
+
+		if ($org_form === null) {
+			// NOTE(chris): if mischform show orgforms
+			$result = $this->StudiengangModel->load($studiengang_kz);
+			$result = $this->getDataOrTerminateWithError($result);
+			if ($result) {
+				if (current($result)->mischform) {
+					$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+					$this->StudienordnungModel->addDistinct();
+					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+					$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
+
+					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+					$result = $this->StudienordnungModel->loadWhere([
+						'aktiv' => true,
+						'studiengang_kz' => $studiengang_kz,
+						'p.orgform_kurzbz !=' => 'DDP'
+					]);
+					$result = $this->getDataOrTerminateWithError($result);
+
+					$list = array_merge($list, $result);
+				}
+			}
+		}
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
+		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+		
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$list = array_merge($list, $result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param integer		$verband
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
+		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param string		$link
+	 * @param integer		$studiengang_kz
+	 *
+	 * @return array
+	 */
+	protected function getStdSem($link, $studiengang_kz)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->load->config('stv');
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? $number_displayed_past_studiensemester_default;
+
+		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
+		$this->StudiensemesterModel->addOrder('ende');
+		$result = $this->StudiensemesterModel->load();
+
+		$studiensemester = $this->getDataOrTerminateWithError($result);
+		$result = [];
+
+		$studiengang_kz = (int)$studiengang_kz;
+
+		foreach ($studiensemester as $sem) {
+			$semlink = $link . $sem->studiensemester_kurzbz;
+			$intlink = $semlink . '/interessenten';
+			$result[] = [
+				'name' => $sem->studiensemester_kurzbz,
+				'link' => $semlink,
+				'stg_kz' => $studiengang_kz,
+				'children' => [
+					[
+						'name' => 'Interessenten',
+						'link' => $intlink,
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Bewerbung nicht abgeschickt',
+								'link' => $intlink . '/bewerbungnichtabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Bewerbung abgeschickt, Status unbestätigt',
+								'link' => $intlink . '/bewerbungabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'ZGV erfüllt',
+								'link' => $intlink . '/zgv',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Status bestätigt',
+								'link' => $intlink . '/statusbestaetigt',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Nicht zum Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtnichtangemeldet',
+										'leaf' => true
+									],
+									[
+										'name' => 'Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtangemeldet',
+										'leaf' => true
+									]
+								]
+							],
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							]
+						]
+					],
+					[
+						'name' => 'Bewerber',
+						'link' => $semlink . '/bewerber',
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									],
+									[
+										'name' => 'Nicht teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetnichtteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									]
+								]
+							]
+						]
+					],
+					[
+						'name' => 'Aufgenommen',
+						'link' => $semlink . '/aufgenommen',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Warteliste',
+						'link' => $semlink . '/warteliste',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Absage',
+						'link' => $semlink . '/absage',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Incoming',
+						'link' => $semlink . '/incoming',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					]
+				]
+			];
+		}
+
+		return $result;
+	}
+}

application/controllers/api/v1/system/Tag.php

@@ -37,7 +37,6 @@ class Tag extends API_Controller
 
 		if (isset($tag))
 		{
-			$this->TagModel->addJoin('public.tbl_notiz_typ', 'typ_kurzbz', 'typ_kurzbz');
 			$result = $this->TagModel->load($tag);
 
 			$this->response($result, REST_Controller::HTTP_OK);

application/controllers/components/Cis/Mylv.php

@@ -14,11 +14,11 @@ class Mylv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'Student' => self::PERM_LOGGED,
-			'Studiensemester' => self::PERM_LOGGED,
-			'Lvs' => self::PERM_LOGGED,
-			'Info' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED
+			'Student' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 

application/controllers/components/stv/Studiensemester.php

@@ -0,0 +1,78 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studiensemester extends Auth_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'now' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+	}
+
+	public function index()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('start');
+
+		$result = $this->StudiensemesterModel->load();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function now()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->StudiensemesterModel->getNearest();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		}
+		$result = getData($result) ?: [];
+
+		if (count($result) != 1) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJsonError(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
+		} else {
+			$this->outputJsonSuccess(current($result)->studiensemester_kurzbz);
+		}
+	}
+
+	public function set()
+	{
+		$this->load->library('AuthLib');
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$stdsem = $this->input->post('studiensemester');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		$this->outputJsonSuccess(true);
+	}
+}

application/controllers/jobs/AbgabetoolJob.php

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

application/controllers/jobs/AntragJob.php

@@ -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))
@@ -125,7 +105,7 @@ class AntragJob extends JOB_Controller
 					$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 				}
 
-				$result = $this->StudierendenantragModel->getStgAndDetails($antrag->studierendenantrag_id);
+				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 				if (isError($result))
 				{
 					$this->logError(getError($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');

application/controllers/jobs/ReihungstestJob.php

@@ -803,7 +803,7 @@ class ReihungstestJob extends JOB_Controller
 	{
 		if (!isset($studiensemester) || isEmptyString($studiensemester))
 		{
-			$this->logError("Studiensemester not passed as parameter");
+			$this->logError("Studiensemster not passed as parameter");
 			return;
 		}
 

application/controllers/jobs/TagJob.php

@@ -1,110 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-use \DateTime as DateTime;
-
-class TagJob extends JOB_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Configs
-		$this->load->config('stv');
-
-		// Library
-		$this->load->library('TagLib');
-
-		// Load Models
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
-
-		$this->loadPhrases([
-			'lehre'
-		]);
-	}
-
-	public function rebuildAutomatedTags()
-	{
-		$automatedTagsRes = $this->NotiztypModel->loadWhere(array('automatisiert' => true, 'taglib IS NOT NULL' => null));
-		$automatedTags = hasData($automatedTagsRes) ? getData($automatedTagsRes) : [];
-
-
-		$result = $this->StudiensemesterModel->getAktOrNextSemester();
-		if (isError($result))
-		{
-			$this->logInfo('Start Job rebuild Automated Tags');
-			$this->logError('Error occurred during retrieving studiensemester');
-			return $this->logInfo('End Job rebuild Automated Tags');
-		}
-
-		if (empty($result->retval) || !isset($result->retval[0])) {
-			$this->logInfo('Start Job rebuild Automated Tags');
-			$this->logError('No Studiensemester found');
-			return $this->logInfo('End Job rebuild Automated Tags');
-		}
-		$studiensemester_kurzbz = $result->retval[0]->studiensemester_kurzbz ?? null;
-		$params = array(
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		);
-
-		$this->logInfo('Start Job rebuild Automated Tags ' . $studiensemester_kurzbz);
-		foreach($automatedTags as $autoTag)
-		{
-			// getPath: must not be lost
-			$filePath = APPPATH . 'libraries/' . $autoTag->taglib . '.php'; // APPPATH = application/
-
-			if(file_exists($filePath)) {
-				require_once($filePath);
-			} else {
-				$this->logInfo("File not found: " . $filePath);
-				continue;
-			}
-
-			$kurz_bz = $autoTag->typ_kurzbz;
-			// className without PATH (basename)
-			$className = basename($autoTag->taglib);
-
-			$obj = new $className();
-
-			$outputArray = $obj->getZuordnungIds($params);
-			$typeId = $outputArray->typeId;
-
-			$paramsTag = array(
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'kurzbz' => $kurz_bz,
-				'data' => $outputArray->data,
-				'typeId' => $typeId
-			);
-
-			$result = $this->taglib->updateAutomatedTags($paramsTag);
-
-			if (isError($result)) {
-				$this->logError('Error occurred during updateAutomatedTags ' . $kurz_bz);
-				continue;
-			}
-
-			$data = is_array($result) ? $result['retval'] : $result->retval;
-
-			//SUMMARY
-			$this->logInfo("Tag " . $result->retval['input']['tag'] . " | type_id " . $typeId . " --"
-			. " Count Recycled: " . $result->retval['summary']['recycled']
-			. " Count Added: ".  $result->retval['summary']['added']
-			. " Count Deleted: ".  $result->retval['summary']['deleted']);
-
-			//DETAILS
-			if($result->retval['results']['newTags'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "New tag(s): " .  implode(', ', $result->retval['results']['newTags']));
-			if($result->retval['results']['deletedTagsIds'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "Deleted tags(s: " . implode(', ', $result->retval['results']['deletedTagsIds']));
-			if ($result->retval['results']['retaggedIds'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "Recycled tag(s): " . implode(', ', $result->retval['results']['retaggedIds']));
-		}
-		$this->logInfo( "End Job rebuild Automated Tags");
-	}
-}

application/controllers/js/Tabulatorcolumns.php

@@ -1,60 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller generates javascript from snippets for tabulator columns
- */
-class Tabulatorcolumns extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'stv' => ['admin:r', 'assistenz:r'],
-			'lvverwaltung' => ['admin:r', 'assistenz:r']
-		]);
-	}
-
-	/**
-	 * Render tabulator columns for config
-	 *
-	 * @param string				$config
-	 *
-	 * @return void
-	 */
-	public function _remap($config)
-	{
-		$this->load->config($config);
-		$list_columns = $this->config->item('list_columns') ?: [];
-
-		$snippets = [
-			'jssnippets/tabulatorcolumns/' . $config . '.js'
-		];
-
-		foreach ($list_columns as $col) {
-			$snippets[] = $col['js'];
-		}
-
-		$this->output->set_content_type('application/javascript');
-
-		$this->load->view('jssnippets/tabulatorcolumns.js', [
-			'snippets' => $snippets
-		]);
-	}
-}

application/controllers/lehre/Studierendenantrag.php

@@ -25,13 +25,10 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag',
-			'ui'
+			'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']
         	]);
@@ -57,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;
@@ -100,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'
+		]);
 	}
 
 	/**

application/controllers/person/Gradelist.php

@@ -198,19 +198,7 @@ class Gradelist extends Auth_Controller
 			if (!isset($row_noten->found))
 			{
 				$result_lv = $this->LehrveranstaltungModel->load($row_noten->lehrveranstaltung_id);
-
-				$studiengang_kz = null;
-
-				if (!empty($result_lv->retval) && isset($result_lv->retval[0]) && isset($result_lv->retval[0]->studiengang_kz))
-				{
-					$result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz);
-
-					if (!empty($result_stg->retval) && isset($result_stg->retval[0]) && is_object($result_stg->retval[0]) && isset($result_stg->retval[0]->kurzbzlang))
-					{
-						$studiengang_kz = $result_stg->retval[0]->kurzbzlang;
-					}
-				}
-
+				$result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz);
 				$courses['semester'][$row_noten->studiensemester_kurzbz]['lvs_nonstpl'][] = array(
 					'lehrveranstaltung_id' => $row_noten->lehrveranstaltung_id,
 					'lehrtyp_kurzbz' => $result_lv->retval[0]->lehrtyp_kurzbz,
@@ -224,8 +212,8 @@ class Gradelist extends Auth_Controller
 					'semester' => $result_lv->retval[0]->semester,
 					'note' => $row_noten->note,
 					'datum' => $row_noten->benotungsdatum,
-					'studiengang_kurzbz' => $studiengang_kz,
-					'zugeordnet' => true
+					'zugeordnet' => true,
+					'studiengang_kurzbz' => $result_stg->retval[0]->kurzbzlang
 				);
 				if(!isset($courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl']))
 					$courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl'] = 0;

application/controllers/system/Phrases.php

@@ -0,0 +1,212 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Phrases extends Auth_Controller
+{
+	/**
+	 *
+	 */
+	public function __construct()
+    {
+        parent::__construct(
+			array(
+				'index' => 'system/phrase:r',
+				'table' => 'system/phrase:r',
+				'view' => 'system/phrase:r',
+				'deltext' => 'system/phrase:rw',
+				'edit' => 'system/phrase:rw',
+				'save' => 'system/phrase:rw',
+				'newText' => 'system/phrase:rw',
+				'editText' => 'system/phrase:rw',
+				'saveText' => 'system/phrase:rw'
+			)
+		);
+
+        // Loads the phrases library
+        $this->load->library('PhrasesLib');
+
+        // Loads the widget library
+		$this->load->library('WidgetLib');
+    }
+
+	/**
+	 *
+	 */
+	public function index()
+	{
+		$this->load->view('system/phrases/phrases.php');
+	}
+
+	/**
+	 *
+	 */
+	public function table()
+	{
+		$phrases = $this->phraseslib->getPhraseByApp('aufnahme');
+		if ($phrases->error)
+			show_error(getError($phrases));
+
+		$data = array(
+			'app' => 'aufnahme',
+			'phrases' => $phrases->retval
+		);
+
+		$this->load->view('system/phrases/phrasesList.php', $data);
+	}
+
+	/**
+	 *
+	 */
+	public function view($phrase_id)
+	{
+		if (!is_numeric($phrase_id))
+			show_error('Invalid phrase_id parameter');
+
+		$phrase = $this->phraseslib->getPhrase($phrase_id);
+
+		$phrase_inhalt = $this->phraseslib->getPhraseInhalt($phrase_id);
+		if ($phrase_inhalt->error)
+			show_error(getError($phrase_inhalt));
+
+		$data = array(
+			'phrase_id' => $phrase_id,
+			'phrase' => $phrase->retval[0]->phrase,
+			'phrase_inhalt' => $phrase_inhalt->retval
+		);
+
+		$this->load->view('system/phrases/phrasesinhaltList.php', $data);
+	}
+
+	/**
+	 *
+	 */
+	public function deltext($phrasentext_id, $phrase_id)
+	{
+		if (!is_numeric($phrasentext_id) || !is_numeric($phrase_id))
+			show_error('Invalid phrasentext_id or phrase_id parameter');
+
+		$phrase_inhalt = $this->phraseslib->delPhrasentext($phrasentext_id);
+		if ($phrase_inhalt->error)
+			show_error(getError($phrase_inhalt));
+
+		redirect('/system/Phrases/view/'.$phrase_id);
+	}
+
+	/**
+	 *
+	 */
+	public function edit($phrase_id = null)
+	{
+		if (!is_numeric($phrase_id)) return;
+
+		$phrase = $this->phraseslib->getPhrase($phrase_id);
+		if ($phrase->error)
+			show_error(getError($phrase));
+
+		if (count($phrase->retval) != 1)
+			show_error('Phrase nicht vorhanden! ID: '.$phrase_id);
+
+		$data = array(
+			'phrase' => $phrase->retval[0]
+		);
+
+		$this->load->view('system/phrases/phrasesEdit', $data);
+	}
+
+	/**
+	 *
+	 */
+	public function save()
+	{
+		$phrase_id = $this->input->post('phrase_id');
+		$data = array('phrase' => $this->input->post('phrase'));
+
+		$phrase = $this->phraseslib->savePhrase($phrase_id, $data);
+		if ($phrase->error)
+			show_error(getError($phrase));
+
+		$phrase_id = $phrase->retval;
+
+		redirect('/system/Phrases/edit/'.$phrase_id);
+	}
+
+	/**
+	 *
+	 */
+	public function newText()
+	{
+		$phrase_id = $this->input->post('phrase_id');
+
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		$this->OrganisationseinheitModel->addLimit(1);
+		$this->OrganisationseinheitModel->addOrder('oe_kurzbz');
+
+		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
+		if ($resultOE->error)
+			show_error(getError($resultOE));
+
+		if (hasData($resultOE))
+		{
+			$orgeinheit_kurzbz = $resultOE->retval[0]->oe_kurzbz;
+
+			$data = array(
+				'phrase_id' => $phrase_id,
+				'sprache' => 'German',
+				'text' => '',
+				'description' => '',
+				'orgeinheit_kurzbz' => $orgeinheit_kurzbz
+			);
+
+			$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
+			if ($phrase_inhalt->error)
+				show_error(getError($phrase_inhalt));
+
+			$phrase_inhalt_id = $phrase_inhalt->retval;
+
+			redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
+		}
+		else
+		{
+			show_error('No valid organisation unit found');
+		}
+	}
+
+	/**
+	 *
+	 */
+	public function editText($phrasentext_id)
+	{
+		$phrase_inhalt = $this->phraseslib->getPhrasentextById($phrasentext_id);
+		if ($phrase_inhalt->error)
+			show_error(getError($phrase_inhalt));
+
+		$data = $phrase_inhalt->retval[0];
+
+		$this->load->view('system/phrases/phraseinhaltEdit', $data);
+	}
+
+	/**
+	 *
+	 */
+	public function saveText()
+	{
+		$phrase_inhalt_id = $this->input->post('phrase_inhalt_id');
+
+		$data = array(
+			'orgeinheit_kurzbz' => $this->input->post('oe_kurzbz'),
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz'),
+			'text' => $this->input->post('text'),
+			'description' => $this->input->post('description'),
+			'sprache' => $this->input->post('sprache')
+		);
+
+		$phrase_inhalt = $this->phraseslib->updatePhraseInhalt($phrase_inhalt_id, $data);
+		if ($phrase_inhalt->error)
+			show_error(getError($phrase_inhalt));
+
+
+		redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
+	}
+}

application/controllers/system/extensions/CLI_Manager.php

@@ -11,8 +11,8 @@ class CLI_Manager extends CLI_Controller
 	 *
 	 */
 	public function __construct()
-	{
-		parent::__construct();
+    {
+        parent::__construct();
 
 		// Load helpers to upload files
 		$this->load->helper('form');
@@ -28,19 +28,9 @@ class CLI_Manager extends CLI_Controller
 	 * die Commandline ohne Upload durchzufuehren.
 	 * @param $extensioName string Name der Extension
 	 * @param $filename Url Encoded Pfad zum tgz File der Extension
-	 * @param $perform_sql boolean ob die SQL Befehle ausgeführt werden
 	 */
-	public function installExtension($extensionName, $filename)
+	public function uploadExtension($extensionName = null, $filename = null)
 	{
-		$this->extensionslib->installExtension($extensionName, urldecode($filename), true);
-	}
-
-	/**
-	 * Install an extension, same as installExtension but without running the SQL statements
-	 */
-	public function installExtensionNoSQL($extensionName, $filename)
-	{
-		$this->extensionslib->installExtension($extensionName, urldecode($filename), false);
+		$this->extensionslib->installExtension($extensionName, urldecode($filename));
 	}
 }
-

application/controllers/system/extensions/Manager.php

@@ -11,8 +11,8 @@ class Manager extends Auth_Controller
 	 *
 	 */
 	public function __construct()
-	{
-		parent::__construct(
+    {
+        parent::__construct(
 			array(
 				'index' => 'system/extensions:r',
 				'toggleExtension' => 'system/extensions:rw',
@@ -21,22 +21,11 @@ class Manager extends Auth_Controller
 			)
 		);
 
-		// Loads the form helper
+		// Load helpers to upload files
 		$this->load->helper('form');
 
-		// Loads WidgetLib
-		$this->load->library('WidgetLib');
-
 		// Loads the extensions library
 		$this->load->library('ExtensionsLib');
-
-		$this->loadPhrases(
-			array(
-				'extensions',
-				'table',
-				'ui'
-			)
-		);
 	}
 
 	/**
@@ -44,7 +33,11 @@ class Manager extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('system/extensions/manager.php');
+		$viewData = array(
+			'extensions' => $this->extensionslib->getInstalledExtensions()
+		);
+
+		$this->load->view('system/extensions/manager.php', $viewData);
 	}
 
 	/**
@@ -52,16 +45,23 @@ class Manager extends Auth_Controller
 	 */
 	public function toggleExtension()
 	{
+		$toggleExtension = false;
+
 		$extension_id = $this->input->post('extension_id');
 		$enabled = $this->input->post('enabled');
 
-		// Clean the parameter
-		$enabled = $enabled == 'true' ? true : false;
+		if ($enabled === 'true')
+		{
+			$toggleExtension = $this->extensionslib->enableExtension($extension_id);
+		}
+		else
+		{
+			$toggleExtension = $this->extensionslib->disableExtension($extension_id);
+		}
 
-		// Output the enable/disable of the extension
-		$this->outputJsonSuccess(
-			$this->extensionslib->toggleExtension($extension_id, $enabled)
-		);
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($toggleExtension));
 	}
 
 	/**
@@ -69,11 +69,15 @@ class Manager extends Auth_Controller
 	 */
 	public function delExtension()
 	{
+		$delExtension = false;
+
 		$extension_id = $this->input->post('extension_id');
 
 		$delExtension = $this->extensionslib->delExtension($extension_id);
 
-		$this->outputJsonSuccess($delExtension);
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($delExtension));
 	}
 
 	/**
@@ -83,16 +87,9 @@ class Manager extends Auth_Controller
 	 * die Commandline ohne Upload durchzufuehren.
 	 * @param $extensioName string Name der Extension
 	 * @param $filename Url Encoded Pfad zum tgz File der Extension
-	 * @param $perform_sql boolean ob die SQL Befehle ausgeführt werden
 	 */
-	public function uploadExtension()
+	public function uploadExtension($extensionName = null, $filename = null)
 	{
-		$notPerformSql = $this->input->post('notPerformSql');
-
-		// It converts the notPerformSql parameter from the checkbox value to a boolean one
-		if ($notPerformSql == 'on') $notPerformSql = true;
-		if ($notPerformSql !== true) $notPerformSql = false;
-
-		$this->extensionslib->installExtension(null, null, !$notPerformSql);
+		$this->extensionslib->installExtension($extensionName, urldecode($filename));
 	}
 }

application/controllers/system/infocenter/InfoCenter.php

@@ -34,9 +34,6 @@ class InfoCenter extends Auth_Controller
 	const PREV_FILTER_ID = 'prev_filter_id';
 	const KEEP_TABLESORTER_FILTER = 'keepTsFilter';
 
-	const ONBOARDING_INSERTVON = 'onboarding';
-	const ONBOARDING_KENNZEICHENTYP = 'eobRegistrierungsId';
-
 	private $_uid; // contains the UID of the logged user
 
 	// Used to log with PersonLogLib
@@ -178,7 +175,6 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
 		$this->load->model('person/adresse_model', 'AdresseModel');
-		$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
@@ -1456,100 +1452,6 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Done!");
 	}
-
-	public function getAbsageData()
-	{
-		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
-
-		if (!is_null($stg_typ))
-		{
-			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
-			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
-
-			$data = array (
-				'statusgruende' => $statusgruende,
-				'studiengaenge' => $studiengaenge->retval
-			);
-
-			$this->outputJsonSuccess($data);
-		}
-		else
-			$this->outputJsonSuccess(null);
-	}
-
-	public function getStudienArtBerechtigung($typ = null)
-	{
-		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
-		return getData($stg_typ);
-	}
-
-	public function getStudienartData()
-	{
-		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
-	}
-
-	public function saveAbsageForAll()
-	{
-		$statusgrund = $this->input->post('statusgrund');
-		$studiengang = $this->input->post('studiengang');
-		$abgeschickt = $this->input->post('abgeschickt');
-		$personen = $this->input->post('personen');
-		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-
-		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
-			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
-
-		if ($studiengang === 'all' && $abgeschickt === 'all')
-		{
-			foreach($personen as $person)
-			{
-				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
-
-				if (!hasData($prestudenten))
-					continue;
-
-				$prestudentenData = getData($prestudenten);
-
-				foreach ($prestudentenData as $prestudent)
-				{
-					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
-				}
-			}
-		}
-		else
-		{
-			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-			$this->StudienplanModel->addSelect('1');
-			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
-			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
-			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
-			$this->StudienplanModel->addLimit(1);
-			$studiengangResult = $this->StudienplanModel->load();
-
-			if (hasData($studiengangResult))
-			{
-				foreach($personen as $person)
-				{
-					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
-
-					if (!hasData($prestudent))
-						continue;
-
-					$prestudentData = getData($prestudent);
-					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
-				}
-			}
-			else
-				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
-
-		}
-
-		$this->outputJsonSuccess("Success");
-	}
-
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -2044,17 +1946,6 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($user_person));
 		}
 
-		// add info about first electronig onboarding login
-		$this->KennzeichenModel->addSelect('insertamum');
-		$onboarding_first_login = $this->KennzeichenModel->loadWhere(
-			array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => self::ONBOARDING_KENNZEICHENTYP)
-		);
-
-		if (isError($onboarding_first_login))
-		{
-			show_error(getError($onboarding_first_login));
-		}
-
 		$data = array (
 			'lockedby' => $lockedby,
 			'lockedbyother' => $lockedbyother,
@@ -2064,9 +1955,7 @@ class InfoCenter extends Auth_Controller
 			'messages' => $messages->retval,
 			'logs' => $logs,
 			'notizen' => $notizen->retval,
-			'notizenbewerbung' => $notizen_bewerbung->retval,
-			'created_by_onboarding' => $stammdaten->retval->insertvon == self::ONBOARDING_INSERTVON,
-			'onboarding_first_login' => hasData($onboarding_first_login) ? getData($onboarding_first_login)[0]->insertamum : null
+			'notizenbewerbung' => $notizen_bewerbung->retval
 		);
 
 		return $data;
@@ -2486,4 +2375,97 @@ class InfoCenter extends Auth_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
+
+	public function getAbsageData()
+	{
+		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
+
+		if (!is_null($stg_typ))
+		{
+			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
+
+			$data = array (
+				'statusgruende' => $statusgruende,
+				'studiengaenge' => $studiengaenge->retval
+			);
+
+			$this->outputJsonSuccess($data);
+		}
+		else
+			$this->outputJsonSuccess(null);
+	}
+
+	public function getStudienArtBerechtigung($typ = null)
+	{
+		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
+		return getData($stg_typ);
+	}
+
+	public function getStudienartData()
+	{
+		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
+	}
+
+	public function saveAbsageForAll()
+	{
+		$statusgrund = $this->input->post('statusgrund');
+		$studiengang = $this->input->post('studiengang');
+		$abgeschickt = $this->input->post('abgeschickt');
+		$personen = $this->input->post('personen');
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+
+		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
+
+		if ($studiengang === 'all' && $abgeschickt === 'all')
+		{
+			foreach($personen as $person)
+			{
+				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
+
+				if (!hasData($prestudenten))
+					continue;
+
+				$prestudentenData = getData($prestudenten);
+
+				foreach ($prestudentenData as $prestudent)
+				{
+					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
+				}
+			}
+		}
+		else
+		{
+			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+			$this->StudienplanModel->addSelect('1');
+			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
+			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
+			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
+			$this->StudienplanModel->addLimit(1);
+			$studiengangResult = $this->StudienplanModel->load();
+
+			if (hasData($studiengangResult))
+			{
+				foreach($personen as $person)
+				{
+					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
+
+					if (!hasData($prestudent))
+						continue;
+
+					$prestudentData = getData($prestudent);
+					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
+				}
+			}
+			else
+				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
+
+		}
+
+		$this->outputJsonSuccess("Success");
+	}
 }

application/controllers/system/infocenter/Rueckstellung.php

@@ -7,8 +7,6 @@ class Rueckstellung extends Auth_Controller
 	private $_ci; // Code igniter instance
 	private $_uid;
 
-	const ZGV_UEBERPRUEFUNG_MAIL_VORLAGE = 'ZGVUEP';
-
 	public function __construct()
 	{
 		parent::__construct(
@@ -25,7 +23,6 @@ class Rueckstellung extends Auth_Controller
 		$this->load->model('crm/RueckstellungStatus_model', 'RueckstellungStatusModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->library('PersonLogLib');
-		$this->load->library('MessageLib');
 
 		$this->_setAuthUID(); // sets property uid
 		
@@ -81,8 +78,6 @@ class Rueckstellung extends Auth_Controller
 		
 		$this->_log($person_id, $status_kurzbz);
 
-		if  ($status_kurzbz === 'onhold_zgv')
-			$this->sendRueckstellungMessage($person_id);
 		$this->outputJson($result);
 	}
 
@@ -109,10 +104,6 @@ class Rueckstellung extends Auth_Controller
 			if (isError($result))
 				$this->terminateWithJsonError(getError($result));
 			$this->_log($person, $status_kurzbz);
-
-			if  ($status_kurzbz === 'onhold_zgv')
-				$this->sendRueckstellungMessage($person);
-
 		}
 		$this->outputJsonSuccess("Erfolgreich gespeichert!");
 	}
@@ -169,26 +160,4 @@ class Rueckstellung extends Auth_Controller
 			$this->_uid
 		);
 	}
-
-	private function sendRueckstellungMessage($person_id)
-	{
-		$person = $this->_ci->PersonModel->load($person_id);
-
-		if (hasData($person))
-		{
-			$person = getData($person)[0];
-
-			return $this->messagelib->sendMessageUserTemplate(
-				$person_id,
-				self::ZGV_UEBERPRUEFUNG_MAIL_VORLAGE,
-				array(
-					'anrede' => $person->anrede,
-					'nachname' => $person->nachname
-				),
-				null,
-				getAuthPersonId(),
-				'infocenter'
-			);
-		}
-	}
 }

application/controllers/system/phrases/CLI_Manager.php

@@ -1,50 +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 CLI_Manager extends CLI_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Loads PhrasesLib
-		$this->load->library('PhrasesLib');
-	}
-
-	/**
-	 *
-	 */
-	public function installFrom($phrasesDirectoryPath)
-	{
-		$this->phraseslib->installFrom(urldecode($phrasesDirectoryPath));
-	}
-
-	/**
-	 * Calls the PhrasesLib->syncFiles to create/update the phrases files under the directory application/phrases/
-	 */
-	public function syncFiles()
-	{
-		$this->phraseslib->syncFiles();
-	}
-}
-

application/controllers/system/phrases/Manager.php

@@ -1,30 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class Manager extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'installFromCore' => 'admin:rw'
-			)
-		);
-
-		// Loads PhrasesLib
-		$this->load->library('PhrasesLib');
-	}
-
-	/**
-	 *
-	 */
-	public function installFromCore()
-	{
-		$this->phraseslib->installFromCore();
-	}
-}
-

application/controllers/system/phrases/PhrasesViewer.php

@@ -1,45 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Overview on cronjob logs
- */
-class PhrasesViewer extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r'
-			)
-		);
-
-		// Loads WidgetLib
-		$this->load->library('WidgetLib');
-
-		// Loads phrases system
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'filter'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/phrases/phrasesViewer.php');
-	}
-}
-

application/core/Tag_Controller.php

@@ -7,7 +7,7 @@ class Tag_Controller extends FHCAPI_Controller
 {
 	private $_uid;
 
-	const BERECHTIGUNG_KURZBZ = ['admin:rw'];
+	const BERECHTIGUNG_KURZBZ = 'admin:rw';
 
 	public function __construct($permissions)
 	{
@@ -15,11 +15,10 @@ class Tag_Controller extends FHCAPI_Controller
 			'getTag' => self::BERECHTIGUNG_KURZBZ,
 			'getTags' => self::BERECHTIGUNG_KURZBZ,
 			'addTag' => self::BERECHTIGUNG_KURZBZ,
+
 			'updateTag' => self::BERECHTIGUNG_KURZBZ,
 			'doneTag' => self::BERECHTIGUNG_KURZBZ,
 			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
-			'getAllTags' => self::BERECHTIGUNG_KURZBZ,
-			'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
 		];
 
 		$merged_permissions = array_merge($default_permissions, $permissions);
@@ -27,10 +26,6 @@ class Tag_Controller extends FHCAPI_Controller
 		parent::__construct($merged_permissions);
 
 		$this->_setAuthUID();
-
-		// Library
-		$this->load->library('TagLib');
-
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -43,8 +38,6 @@ class Tag_Controller extends FHCAPI_Controller
 	public function getTag($readonly_tags = null)
 	{
 		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
-
 		$id = $this->input->get('id');
 
 		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
@@ -69,18 +62,14 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->NotizModel->addSelect(
 			"tbl_notiz.titel, 
 			tbl_notiz.text, 
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung,
 			tbl_notiz.notiz_id,
 			tbl_notiz_typ.style,
-			tbl_notiz_typ.automatisiert,
-			tbl_notiz_typ.prioritaet,
 			tbl_notiz.erledigt as done,
 			tbl_notiz.insertamum,
 			tbl_notiz.updateamum,
 			(verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
-			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter,
-			tbl_notiz.start,
-			tbl_notiz.ende
+			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter
 			"
 		);
 		$this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
@@ -93,24 +82,18 @@ class Tag_Controller extends FHCAPI_Controller
 
 		$notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id));
 
-
 		$this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array());
 	}
 
 	public function getTags($tags = null)
 	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
-
 		$this->NotiztypModel->addSelect(
-			"typ_kurzbz as tag_typ_kurzbz,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
+			'typ_kurzbz as tag_typ_kurzbz,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung,
 			style,
 			beschreibung,
-			tag,
-			automatisiert,
-			prioritaet
-			"
+			tag
+			'
 		);
 		$this->NotiztypModel->addOrder('prioritaet');
 
@@ -288,90 +271,6 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->terminateWithSuccess($deleteNotiz);
 	}
 
-	public function getAllTags($readonly_tags = false)
-	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
-		$prestudent_id = $this->input->get('prestudent_id');
-
-		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
-		{
-			$readonly_tags = $this->_filterTag($readonly_tags, true);
-
-			foreach ($readonly_tags as $key => $tag)
-			{
-				$readonly_tags[$key] = $this->NotizModel->db->escape($tag);
-			}
-			$tags = '(' . implode(',', $readonly_tags) . ')';
-
-			$this->NotizModel->addSelect("
-						CASE
-							WHEN tbl_notiz_typ.typ_kurzbz IN $tags
-							THEN TRUE
-							ELSE FALSE
-						END as readonly
-					");
-		}
-		$this->NotizModel->addSelect(
-			"tbl_notiz.titel,
-			tbl_notiz.text,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
-			tbl_notiz.notiz_id,
-			tbl_notiz_typ.style,
-			tbl_notiz_typ.automatisiert,
-			tbl_notiz_typ.prioritaet,
-			tbl_notiz.erledigt as done,
-			tbl_notiz.insertamum,
-			tbl_notiz.updateamum,
-			(verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
-			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter,
-			tbl_notiz.start,
-			tbl_notiz.ende
-			"
-		);
-		$this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
-
-		$this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT');
-		$this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT');
-
-		$this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.bearbeiter_uid = bearbeiterbenutzer.uid', 'LEFT');
-		$this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT');
-
-		$this->NotizModel->addJoin('public.tbl_notizzuordnung notizzuordnung', 'tbl_notiz.notiz_id = notizzuordnung.notiz_id');
-
-		$this->NotizModel->addOrder('done');
-		$this->NotizModel->addOrder('tbl_notiz_typ.prioritaet');
-		$notiz = $this->NotizModel->loadWhere(array('prestudent_id' => $prestudent_id));
-
-
-		$this->terminateWithSuccess(hasData($notiz) ? getData($notiz) : array());
-	}
-
-	public function rebuildTagsForTypeId()
-	{
-		$ids = $this->input->post('ids');
-		$typeId = $this->input->post('typeId');
-		$semester = $this->input->post('sem');
-
-		$idsSuccess = [];
-		$idsError = [];
-		$outputResult = [];
-
-		foreach ($ids as $id)
-		{
-			$result = $this->taglib->rebuildTagsForTypeId($typeId, $id, $semester);
-
-			if (isError($result))
-				$idsError[] = $id;
-			else
-				$idsSuccess[] = $id;
-
-			$outputResult[] = $result;
-		}
-
-		$this->terminateWithSuccess([$outputResult, $idsSuccess, $idsError]);
-	}
-
 	private function _setAuthUID()
 	{
 		$this->_uid = getAuthUID();
@@ -412,4 +311,4 @@ class Tag_Controller extends FHCAPI_Controller
 		));
 	}
 
-}
+}

application/helpers/hlp_document_helper.php

@@ -1,188 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Helper function to generate the default documentslist config for the
- * grades tab.
- *
- * The resulting array consists of elements which are associative arrays
- * that can have the following entries:
- * title			(required) on the first level this can be HTML code.
- * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
- * 						true or false.
- * link				(optional) an URL that will be called if "action" and
- * 						"children" are not defined.
- * action			(optional) an associative array that describes an
- * 						POST action that will be called if "children" is
- * 						not defined.
- * 						It can have the following entries:
- * - url			(required) an URL to an FHCAPI endpoint.
- * - post			(optional) an associative array with the POST data to
- * 						be sent.
- * - response		(optional) a string that will be displayed on success.
- * children			(optional) an array of child elements
- *
- * All strings that start with { and end with } in the URLs and the
- * actions post parameter will be replaced with the corresponding
- * attribute of the current dataset (e.G: {uid} will be replaced with the
- * uid of the current dataset)
- *
- * @return array
- */
-function gradesDocumentsList()
-{
-	$ci =& get_instance();
-	$ci->load->library('PhrasesLib', array('stv'), 'p');
-
-	$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
-
-	$title_ger = $ci->p->t("global", "deutsch");
-	$title_eng = $ci->p->t("global", "englisch");
-	$title_ff = $ci->p->t("stv", "document_certificate");
-	$title_lv = $ci->p->t("stv", "document_coursecertificate");
-
-	$link_ff = "documents/export/" .
-		"zertifikat.rdf.php/" .
-		"Zertifikat" .
-		"?stg_kz={studiengang_kz_lv}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-	$link_lv_ger = "documents/export/" .
-		"lehrveranstaltungszeugnis.rdf.php/" .
-		"LVZeugnis" .
-		"?stg_kz={studiengang_kz}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-	$link_lv_eng = "documents/export/" .
-		"lehrveranstaltungszeugnis.rdf.php/" .
-		"LVZeugnisEng" .
-		"?stg_kz={studiengang_kz}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-
-	$archive_url = "api/frontend/v1/documents/archiveSigned";
-	$archive_response = $ci->p->t("stv", "document_signed_and_archived");
-	$archive_post_ff = [
-		"xml" => "zertifikat.rdf.php",
-		"xsl" => "Zertifikat",
-		"stg_kz" => "{studiengang_kz_lv}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-	$archive_post_lv_ger = [
-		"xml" => "lehrveranstaltungszeugnis.rdf.php",
-		"xsl" => "LVZeugnis",
-		"stg_kz" => "{studiengang_kz}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-	$archive_post_lv_eng = [
-		"xml" => "lehrveranstaltungszeugnis.rdf.php",
-		"xsl" => "LVZeugnisEng",
-		"stg_kz" => "{studiengang_kz}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-
-	$list = [
-		[
-			'title' => '<i class="fa fa-download" title="' . $ci->p->t("stv", "document_download") . '"></i>',
-			'children' => [
-				[
-					'title' => $title_ff,
-					'link' => site_url($link_ff)
-				],
-				[
-					'title' => $title_lv,
-					'children' => [
-						[
-							'title' => $title_ger,
-							'link' => site_url($link_lv_ger),
-							'children' => [
-								[
-									'title' => 'PDF',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger)
-								],
-								[
-									'title' => 'DOC',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger . "&output=doc")
-								],
-								[
-									'title' => 'ODT',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger . "&output=odt")
-								]
-							]
-						],
-						[
-							'title' => $title_eng,
-							'link' => site_url($link_lv_eng),
-							'children' => [
-								[
-									'title' => 'PDF',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng)
-								],
-								[
-									'title' => 'DOC',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng . "&output=doc")
-								],
-								[
-									'title' => 'ODT',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng . "&output=odt")
-								]
-							]
-						]
-					]
-				]
-			]
-		],
-		[
-			'title' => '<i class="fas fa-archive" title="' . $ci->p->t("stv", "document_archive") . '"></i>',
-			'children' => [
-				[
-					'title' => $title_ff,
-					'action' => [
-						'url' => site_url($archive_url),
-						'post' => $archive_post_ff,
-						'response' => $archive_response
-					]
-				],
-				[
-					'title' => $title_lv,
-					'children' => [
-						[
-							'title' => $title_ger,
-							'action' => [
-								'url' => site_url($archive_url),
-								'post' => $archive_post_lv_ger,
-								'response' => $archive_response
-							]
-						],
-						[
-							'title' => $title_eng,
-							'action' => [
-								'url' => site_url($archive_url),
-								'post' => $archive_post_lv_eng,
-								'response' => $archive_response
-							]
-						]
-					]
-				]
-			]
-		]
-	];
-
-	return $list;
-}

application/helpers/hlp_header_helper.php

@@ -1,20 +1,20 @@
 <?php
+
 /**
- * Copyright (C) 2025 FH Technikum-Wien
+ * FH-Complete
  *
- * 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.
+ * @package		FHC-Helper
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016 fhcomplete.org
+ * @license		GPLv3
+ * @since		Version 1.0.0
+ */
+
+/**
+ * FHC Helper
  *
- * 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.
+ * @subpackage	Helpers
+ * @category	Helpers
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -111,8 +111,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'theme' => [
 			'name'=>$ci->config->item('theme_name'),
 			'modes'=>$ci->config->item('theme_modes'),
-		],
-		'domain' => DOMAIN
+		]
 	);
 
 	$toPrint = "\n";
@@ -137,7 +136,7 @@ function generateJSPhrasesStorageObject($phrases)
 	$toPrint = "\n";
 	$toPrint .= '<script type="text/javascript">';
 	$toPrint .= "\n";
-	$toPrint .= '	var FHC_JS_PHRASES_STORAGE_OBJECT = '.$ci->pj->toJSON().';';
+	$toPrint .= '	var FHC_JS_PHRASES_STORAGE_OBJECT = '.$ci->pj->getJSON().';';
 	$toPrint .= "\n";
 	$toPrint .= '</script>';
 	$toPrint .= "\n\n";
@@ -256,9 +255,6 @@ function generateSkipLink($skipID)
 	echo $toPrint;
 }
 
-/**
- *
- */
 function absoluteJsImportUrl($relurl)
 {
 	$ci =& get_instance();
@@ -274,28 +270,6 @@ function absoluteJsImportUrl($relurl)
 	return $url;
 }
 
-/*
- * Generate Css File Include if Extension contains file
- *
- * @param $relativeFilePath path relative to Extension public/css dir
- */
-function generateCSSsIncludeIfExtensionCssExists($relativeFilePath)
-{
-	$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-	foreach ($fsiterator as $fsitem)
-	{
-		if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
-		{
-			$extensionfile = 'public/extensions/' . $fsitem->getBasename() 
-				. '/css/' . $relativeFilePath;
-			if(is_readable(FHCPATH . $extensionfile))
-			{
-				generateCSSsInclude($extensionfile);
-			}
-		}
-	}
-}
-
 /*
  * Manipulate CI views includes Array to load
  *   - public/js/FhcApps.js via customJSs and
@@ -491,4 +465,3 @@ class ExtendableAppsHelper
 		array_push($this->extCustomJSs, 'public/js/FhcApps.js');
 	}
 }
-

application/libraries/AnrechnungLib.php

@@ -741,7 +741,7 @@ class AnrechnungLib
 		$fullname = hasData($result) ? $result->retval[0]->vorname. $result->retval[0]->nachname : '';
 		
 		// Return filename
-		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname . '.pdf';
+		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname;
 	}
 	
 	public function LVhasLector($anrechnung_id)

application/libraries/AntragLib.php

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

application/libraries/ExtensionsLib.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2025 fhcomplete.org
+ * Copyright (C) 2022 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
@@ -19,7 +19,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \stdClass as stdClass;
-use \PharData as PharData;
 
 /**
  * Library to manage core extensions
@@ -34,20 +33,11 @@ class ExtensionsLib
 	const EXTENSION_JSON_NAME = 'extension.json'; // file that contains extension data
 	const EXTENSIONS_DIR_NAME = 'extensions'; // name of the directories where will be created the symlinks
 
-        const PHRASES_DIRECTORY = 'phrases/'; // directory name where phrases files are
+	private $_ci;
 
-	const UPLOAD_PATH = 'tmp/';
-
-	private $_ci; // Code igniter instance
-
-	private $_errorOccurred; // boolean, true if an error occurred while installing an extension
-	private $_currentInstalledExtensionVersion; // contains the version of the current installation of an extension
-
-	// NOTE: the following have been declared as properties to maintain compatibility with previous PHP versions
-	// where arrays cannot be declared as constants
-
-	// Accepted file extensions for an uploaded extension
-	private $ARCHIVE_EXTENSIONS = array('.tgz', '.tbz2');
+	private $ARCHIVE_EXTENSIONS = array('.tgz', '.tbz2'); // accepted file extensions for an uploaded extension
+	private $UPLOAD_PATH; // temporary directory to store the upload file and checks the archive
+	private $EXTENSIONS_PATH; // directory where all the extensions are
 
 	// Directories that are part of the extension archive
 	private $SOFTLINK_TARGET_DIRECTORIES = array(
@@ -55,11 +45,16 @@ class ExtensionsLib
 		DOC_ROOT => array('public')
 	);
 
+	private $_errorOccurred; // boolean, true if an error occurred while installing an extension
+	private $_currentInstalledExtensionVersion; // contains the version of the current installation of an extension
+
 	/**
 	 * Class constructor
 	 */
 	public function __construct()
 	{
+		$this->UPLOAD_PATH = APPPATH.'tmp/';
+		$this->EXTENSIONS_PATH = APPPATH.'extensions/';
 		// Get code igniter instance
 		$this->_ci =& get_instance();
 
@@ -68,8 +63,6 @@ class ExtensionsLib
 
 		// Loads EPrintfLib
 		$this->_ci->load->library('EPrintfLib');
-		// Loads PhrasesLib
-		$this->_ci->load->library('PhrasesLib');
 
 		// Loading models
 		$this->_ci->load->model('system/Extensions_model', 'ExtensionsModel');
@@ -77,13 +70,6 @@ class ExtensionsLib
 		// Set default values fot class properties
 		$this->_errorOccurred = false;
 		$this->_currentInstalledExtensionVersion = 0;
-
-		// If SERVER_NAME is _not_ declared or it is an empty string
-		if (!defined('SERVER_NAME') || (defined('SERVER_NAME') && isEmptyString(SERVER_NAME)))
-		{
-			$this->_printError('Global constant SERVER_NAME is not declared or it is not valid');
-			exit();
-		}
 	}
 
 	// -------------------------------------------------------------------------------------------------
@@ -96,44 +82,32 @@ class ExtensionsLib
 	 * @param $extensionName string Name of Extension (optional)
 	 * @param $filename Path to tgz Extension File (optional)
 	 */
-	public function installExtension($extensionName, $filename, $perform_sql)
+	public function installExtension($extensionName = null, $filename = null)
 	{
 		$extensionDB = null; // contains data from DB about an extension
 		$extensionJson = null; // contains the extension.json data
 
 		$this->_printInfo('WARNING!!! Please do not change page or stop this procedure before it is finished');
 
-		// Create an object with the given paramenters
-		$uploadData = new stdClass();
-		$uploadData->fullPath = $filename;
-		$uploadData->extensionName = $extensionName;
-
-		// If no extension name or file name are provided
-		if (is_null($extensionName) || is_null($filename))
+		if (!is_null($extensionName) && !is_null($filename))
+		{
+			$uploadData = new stdClass();
+			$uploadData->fullPath = $filename;
+			$uploadData->extensionName = $extensionName;
+		}
+		else
 		{
 			$this->_loadUploadLibrary(); // loads CI upload library
 			$uploadData = $this->_uploadExtension(); // perform the upload of the file and returns info about it
 		}
 
-		// If a file has been uploaded
-		if (isset($uploadData))
-		{
-			// If the given filename is the upper directory or the current one
-			if (trim($uploadData->fullPath) == '..' || trim($uploadData->fullPath) == '.')
-			{
-				$this->_printFailure('wrong file name: / has to be escaped with %2F');
-				$uploadData = null; // then it is a wrong one!
-			}
-		}
-
-		// If the no error occurred
-		if ($uploadData != null)
+		if ($uploadData != null) // if no error occurred
 		{
 			$this->_extractExtension($uploadData->fullPath); // extract the archive of the uploaded extension
 
 			if (!$this->_errorOccurred) // if no error occurred
 			{
-				// Retrieves data about any previous installation of this extension on this server
+				// Retives data about any previous installation of this extension
 				$extensionDB = $this->_loadPreviousInstallation($uploadData->extensionName);
 			}
 
@@ -154,17 +128,15 @@ class ExtensionsLib
 				$this->_printStart('Proceding with the installation of the extension: '.$extensionJson->name);
 				$this->_printEnd();
 
-				// Remove any previous installation from file system and database
-				$this->_cleanPreviousInstallation($extensionJson);
+				$this->_cleanPreviousInstallation($extensionJson); // cleans any previous installation
 
-				// Records extension data in DB
-				$this->_installExtension($extensionJson);
+				$this->_installExtension($extensionJson); // records extension data in DB
 
-				if (!$this->_errorOccurred && $perform_sql === true) // if no error occurred
+				if (!$this->_errorOccurred) // if no error occurred
 				{
-					// Loads and executes the needed SQL scripts
+					// Loads and executes neede SQL scripts
 					$this->_loadSQLs(
-						$this->_getUploadPath().$extensionJson->name.DIRECTORY_SEPARATOR.ExtensionsLib::SQL_DIRECTORY,
+						$this->UPLOAD_PATH.$extensionJson->name.'/'.ExtensionsLib::SQL_DIRECTORY,
 						$extensionJson
 					);
 				}
@@ -180,19 +152,20 @@ class ExtensionsLib
 					// Create the symlinks to the installed extension
 					$this->_createSymLinks($extensionJson->name);
 				}
-
-				if (!$this->_errorOccurred) // if no error occurred
-				{
-					// Create the symlinks to the installed extension
-					$this->_installPhrases($extensionJson->name);
-				}
 			}
+			else
+			{
+				$this->_errorOccurred = true;
+			}
+		}
+		else
+		{
+			$this->_errorOccurred = true;
 		}
 
 		if ($this->_errorOccurred === false) // if no errors occurred
 		{
-			// If a file has been uploaded then remove them
-			if (isset($uploadData) && !$this->_rrm($uploadData->fullPath))
+			if (!$this->_rrm($uploadData->fullPath)) // removes uploaded file
 			{
 				$this->_printInfo('Error while cleaning upload directory. Not a blocking error');
 			}
@@ -218,26 +191,19 @@ class ExtensionsLib
 		$result = $this->_ci->ExtensionsModel->load($extensionId);
 		if (hasData($result)) // if something was found
 		{
-			// If this server is _not_ the same where the extension was installed then exit with a failure
-			if (getData($result)[0]->server_kurzbz != SERVER_NAME) return false;
-
-			$extensionName = getData($result)[0]->name; // extension name
-
-			// Not to be checked, could fail if the extension is disabled
-			$this->_delSoftLinks($extensionName);
-
-			// Remove the extension from the extensions installation directory
-			$delExtension = $this->_rrm($this->_getExtensionsPath().$extensionName);
+			$extensionName = $result->retval[0]->name; // extension name
+			$this->_delSoftLinks($extensionName); // not to be checked, could fail if the extension is disabled
+			// remove the extension from the extensions installation directory
+			$delExtension = $this->_rrm($this->EXTENSIONS_PATH.$extensionName);
 
 			// Select all the version of this extension
 			$this->_ci->ExtensionsModel->addSelect('extension_id');
-
-			$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName, 'server_kurzbz' => SERVER_NAME));
-
+			$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
 			// If something was found
 			if (hasData($result))
 			{
-				foreach (getData($result) as $extension) // loops on them
+				// Loops on them
+				foreach ($result->retval as $extension)
 				{
 					// Remove them all
 					$result = $this->_ci->ExtensionsModel->delete($extension->extension_id);
@@ -254,57 +220,23 @@ class ExtensionsLib
 	 */
 	public function getInstalledExtensions()
 	{
-		$this->_ci->ExtensionsModel->addOrder('name', 'ASC');
-		$this->_ci->ExtensionsModel->addOrder('server_kurzbz', 'ASC');
-		$this->_ci->ExtensionsModel->addOrder('version', 'ASC');
-
-		return $this->_ci->ExtensionsModel->loadWhere(array('server_kurzbz' => SERVER_NAME));
+		return $this->_ci->ExtensionsModel->getInstalledExtensions();
 	}
 
 	/**
-	 * To enable/disable an extension
+	 * To enable an extension
 	 */
-	public function toggleExtension($extensionId, $enabled)
+	public function enableExtension($extensionId)
 	{
-		$_toggleExtension = false;
+		return $this->_toggleExtension($extensionId, true);
+	}
 
-		// Loads data from DB about the given extension
-		$result = $this->_ci->ExtensionsModel->load($extensionId);
-		if (hasData($result))
-		{
-			// If this server is _not_ the same where the extension was installed then exit with a failure
-			if (getData($result)[0]->server_kurzbz != SERVER_NAME) return false;
-
-			$extensionName = getData($result)[0]->name; // extension name
-
-			// If to be enabled
-			if ($enabled === true)
-			{
-				// Add the symlinks
-				$_toggleExtension = $this->_addSoftLinks($extensionName);
-			}
-			else // If to be disabled
-			{
-				// Remove all the symlinks
-				$_toggleExtension = $this->_delSoftLinks($extensionName);
-			}
-
-			if ($_toggleExtension) // if is a success
-			{
-				// Updates DB
-				$result = $this->_ci->ExtensionsModel->update($extensionId, array('enabled' => $enabled));
-				if (isSuccess($result))
-				{
-					$_toggleExtension = true;
-				}
-				else // if DB update fails remove symlinks from file system
-				{
-					$this->_delSoftLinks($extensionName);
-				}
-			}
-		}
-
-		return $_toggleExtension;
+	/**
+	 * To disable an extension
+	 */
+	public function disableExtension($extensionId)
+	{
+		return $this->_toggleExtension($extensionId, false);
 	}
 
 	// -------------------------------------------------------------------------------------------------
@@ -318,7 +250,7 @@ class ExtensionsLib
 		$this->_ci->load->library(
 			'upload',
 			array(
-				'upload_path' => $this->_getUploadPath(),
+				'upload_path' => $this->UPLOAD_PATH,
 				'allowed_types' => '*',
 				'overwrite' => true
 			)
@@ -382,7 +314,7 @@ class ExtensionsLib
 			// Extracts the uploaded file
 			$pd = new PharData($uploadPath);
 
-			$pd->extractTo($this->_getUploadPath(), null, true);
+			$pd->extractTo($this->UPLOAD_PATH, null, true);
 		}
 		catch (UnexpectedValueException $uva)
 		{
@@ -390,16 +322,6 @@ class ExtensionsLib
 			$this->_printFailure('provided an invalid archive');
 		}
 		catch (PharException $pe)
-		{
-			$this->_errorOccurred = true;
-			$this->_printFailure('phar error occurred');
-		}
-		catch (InvalidArgumentException $iae)
-		{
-			$this->_errorOccurred = true;
-			$this->_printFailure('wrong file name');
-		}
-		catch (Exception $e)
 		{
 			$this->_errorOccurred = true;
 			$this->_printFailure('generic error occurred, check logs');
@@ -422,29 +344,24 @@ class ExtensionsLib
 		// Loads the last version of the previous installation of this extension
 		$this->_ci->ExtensionsModel->addOrder('version', 'DESC');
 		$this->_ci->ExtensionsModel->addLimit(1);
-
-		// Loads extensions installed on this server
-		$result = $this->_ci->ExtensionsModel->loadWhere(
-			array(
-				'name' => $extensionName,
-				'server_kurzbz' => SERVER_NAME
-			)
-		);
-
-		// In an error occurred
+		$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
 		if (isError($result))
 		{
 			$this->_errorOccurred = true;
-			$this->_printFailure('data base error: '.getData($result));
+			$this->_printFailure('data base error: '.$result->retval);
 		}
-		elseif (hasData($result))
+		else
 		{
-			$extensionDB = getData($result)[0];
+			if (hasData($result)) // if found
+			{
+				$extensionDB = $result->retval[0]; // return it!
+			}
+			else
+			{
+				$this->_printMessage('not found');
+			}
 		}
 
-		// If no data have been found
-		if ($extensionDB == null) $this->_printMessage('not found');
-
 		$this->_printSuccess(!$this->_errorOccurred);
 
 		$this->_printEnd();
@@ -460,10 +377,10 @@ class ExtensionsLib
 		$this->_printStart('Checking extension file system structure');
 
 		// Checks if the root directory of this archive has the same name of the extension
-		if (is_dir($this->_getUploadPath().$extensionName))
+		if (is_dir($this->UPLOAD_PATH.$extensionName))
 		{
 			// Checks if file extension.json exists inside the uploaded archive
-			if (!file_exists($this->_getUploadPath().$extensionName.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSION_JSON_NAME))
+			if (!file_exists($this->UPLOAD_PATH.$extensionName.'/'.ExtensionsLib::EXTENSION_JSON_NAME))
 			{
 				$this->_errorOccurred = true;
 				$this->_printFailure('missing extension.json');
@@ -485,14 +402,11 @@ class ExtensionsLib
 	 */
 	private function _chkExtensionJson($extensionName, $extensionDB)
 	{
-		// Set a default FHComplete version
-		$fhcomplete_version = 0;
-
 		$this->_printStart('Parsing and checking extension.json');
 
 		// Decodes extension.json
 		$extensionJson = json_decode(
-			file_get_contents($this->_getUploadPath().$extensionName.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSION_JSON_NAME)
+			file_get_contents($this->UPLOAD_PATH.$extensionName.'/'.ExtensionsLib::EXTENSION_JSON_NAME)
 		);
 
 		// Checks if the parameter name of the extension.json has the same value of the extension name
@@ -502,41 +416,36 @@ class ExtensionsLib
 			if (isset($extensionJson->version))
 			{
 				$extensionJson->currentInstalledVersion = 0; // default current installed version of this extension
-				
-				// If a previous installation was found in DB
-				if ($extensionDB != null)
+
+				if ($extensionDB != null) // if no previous installation was found in DB
 				{
-					// Then get the data from database
 					$extensionJson->extension_id = $extensionDB->extension_id; // get the extension_id from DB
 					$extensionJson->currentInstalledVersion = $extensionDB->version; // get the current installed version from DB
 
-					// Prompt a summary
 					$this->_printMessage('Extension already installed!');
 					$this->_printMessage('Current version: '.$extensionDB->version);
 					$this->_printMessage('Version of the uploaded extension: '.$extensionJson->version);
 
-					// Check if the version of the uploaded extension is the same
-					// as the one from the dataabase
 					if ($extensionJson->version == $extensionDB->version)
 					{
 						$this->_printMessage('Updating the same version!');
 					}
-					elseif ($extensionJson->version > $extensionDB->version) // or it is higher
+					elseif ($extensionJson->version > $extensionDB->version)
 					{
 						$this->_printMessage('Updating to a new version!');
 					}
-					else // otherwise is lower, then the downgrade is not possible
+					else // downgrade is not possible
 					{
 						$extensionJson = null;
 						$this->_printFailure('downgrade must be performed manually');
 					}
 				}
-				else // otherwise if it is not installed on this server
+				else
 				{
 					$this->_printMessage('Version of the uploaded extension: '.$extensionJson->version);
 				}
 
-				// If no errors occurred then check the JSON file content within the uploaded extension
+				// If no errors occurred
 				if ($extensionJson != null)
 				{
 					// Default value
@@ -545,7 +454,7 @@ class ExtensionsLib
 					require_once('version.php'); // get the core version
 
 					// Checks if the required core version of the extension is the same of this system
-					if (isset($extensionJson->core_version) && version_compare($extensionJson->core_version, $fhcomplete_version, '<='))
+					if (isset($extensionJson->core_version) && version_compare($extensionJson->core_version, $fhcomplete_version,'<='))
 					{
 						$this->_printMessage('Required core version: '.$extensionJson->core_version);
 						$this->_printMessage('Current core version: '.$fhcomplete_version);
@@ -558,7 +467,7 @@ class ExtensionsLib
 							// Gets the required dependencies
 							$result = $this->_ci->ExtensionsModel->getDependencies($extensionJson->dependencies);
 							// If they are matcheds
-							if (hasData($result) && count(getData($result)) == count($extensionJson->dependencies))
+							if (hasData($result) && count($result->retval) == count($extensionJson->dependencies))
 							{
 								if (isset($extensionJson->dependencies))
 								{
@@ -653,7 +562,6 @@ class ExtensionsLib
 	{
 		$this->_printStart('Adding new entry in the DB');
 
-		// Insert into database the extension information
 		$result = $this->_ci->ExtensionsModel->insert(
 			array(
 				'name' => $extensionJson->name,
@@ -662,8 +570,7 @@ class ExtensionsLib
 				'license' => isset($extensionJson->license) ? $extensionJson->license : null,
 				'url' => isset($extensionJson->url) ? $extensionJson->url : null,
 				'core_version' => $extensionJson->core_version,
-				'dependencies' => isset($extensionJson->dependencies) ? $extensionJson->dependencies : null,
-				'server_kurzbz' => SERVER_NAME
+				'dependencies' => isset($extensionJson->dependencies) ? $extensionJson->dependencies : null
 			)
 		);
 		if (isSuccess($result))
@@ -699,16 +606,14 @@ class ExtensionsLib
 		// Loops through the versions
 		for ($sqlDir = $startVersion; $sqlDir <= $extensionJson->version; $sqlDir++)
 		{
-			// Gets all the SQL files in the directory having the same name of the version
-			$files = glob($pkgSQLsPath.DIRECTORY_SEPARATOR.$sqlDir.'/*'.ExtensionsLib::SQL_FILE_EXTENSION);
-
 			// If a directory with the same value of the version is present in the sql scripts directory
+			$files = glob($pkgSQLsPath.'/'.$sqlDir.'/*'.ExtensionsLib::SQL_FILE_EXTENSION);
 			if ($files != false)
-	        	{
+			{
 				// Loads every sql files
 				foreach ($files as $file)
 				{
-	        		        $sql = file_get_contents($file); // gets the entire content of the file
+					$sql = file_get_contents($file); // gets the entire content of the file
 
 					$this->_printMessage('Executing query:');
 					$this->_printMessage($sql);
@@ -746,20 +651,17 @@ class ExtensionsLib
 	{
 		$this->_printStart('Moving the upload extension from upload folder to extension folder');
 
-		$this->_printMessage('Current extension directory: '.$this->_getUploadPath().$extensionName);
-		$this->_printMessage('Directory where it will be moved: '.$this->_getExtensionsPath().$extensionName);
+		$this->_printMessage('Current extension directory: '.$this->UPLOAD_PATH.$extensionName);
+		$this->_printMessage('Directory where it will be moved: '.$this->EXTENSIONS_PATH.$extensionName);
 
-		if (!file_exists($this->_getExtensionsPath().$extensionName))
+		if (rename($this->UPLOAD_PATH.$extensionName.'/', $this->EXTENSIONS_PATH.$extensionName))
 		{
-			if (rename($this->_getUploadPath().$extensionName.DIRECTORY_SEPARATOR, $this->_getExtensionsPath().$extensionName))
-			{
-				$this->_printSuccess(true);
-			}
-			else
-			{
-				$this->_errorOccurred = true;
-				$this->_printFailure('error while moving');
-			}
+			$this->_printSuccess(true);
+		}
+		else
+		{
+			$this->_errorOccurred = true;
+			$this->_printFailure('error while moving');
 		}
 
 		$this->_printEnd();
@@ -793,21 +695,13 @@ class ExtensionsLib
 	{
 		$_delSoftLinks = false;
 
-		// For every set of target directories where:
-		// rootPath: is the prefix of the absolute path for the target directory
-		// targetDirectories: is an array of target directories
 		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
 		{
-			// For every target directory in the current set
 			foreach ($targetDirectories as $targetDirectory)
 			{
-				// If the symlink exists
-				if (file_exists($rootPath.$targetDirectory.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSIONS_DIR_NAME.DIRECTORY_SEPARATOR.$extensionName))
+				if (file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
 				{
-					// Try to delete it
-					$_delSoftLinks = unlink(
-						$rootPath.$targetDirectory.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSIONS_DIR_NAME.DIRECTORY_SEPARATOR.$extensionName
-					);
+					$_delSoftLinks = unlink($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName);
 				}
 			}
 		}
@@ -820,23 +714,29 @@ class ExtensionsLib
 	 */
 	private function _rrm($dir)
 	{
-		// If the directory does not exist return success
-		if (!file_exists($dir)) return true;
-
-		// If it is not a directory then delete it and return the result
-		if (!is_dir($dir)) return unlink($dir);
-
-		// For each subdirectory
-		foreach (scandir($dir) as $subdir)
+		if (!file_exists($dir))
 		{
-			// If it is the same directory or the parent directory skip to the next one
-			if ($subdir == '.' || $subdir == '..') continue;
+			return true;
+		}
 
-			// Try to remove a subdirectory, if it fails then return a failure
-			if (!$this->_rrm($dir.DIRECTORY_SEPARATOR.$subdir)) return false;
+		if (!is_dir($dir))
+		{
+			return unlink($dir);
+		}
+
+		foreach (scandir($dir) as $item)
+		{
+			if ($item == '.' || $item == '..')
+			{
+				continue;
+			}
+
+			if (!$this->_rrm($dir.DIRECTORY_SEPARATOR.$item))
+			{
+				return false;
+			}
 		}
 
-		// Delete the directory and return the result
 		return rmdir($dir);
 	}
 
@@ -846,36 +746,27 @@ class ExtensionsLib
 	private function _addSoftLinks($extensionName)
 	{
 		$_addSoftLinks = false;
-		$extensionPath = $this->_getExtensionsPath().$extensionName.DIRECTORY_SEPARATOR;
+		$extensionPath = $this->EXTENSIONS_PATH.$extensionName.'/';
 
-		// For every set of target directories where:
-		// rootPath: is the prefix of the absolute path for the target directory
-		// targetDirectories: is an array of target directories
+		// For every target directory
 		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
 		{
-			// For every target directory in the current set
 			foreach ($targetDirectories as $targetDirectory)
 			{
-				// Checks if the link already exists
-				$_addSoftLinks = file_exists(
-					$rootPath.$targetDirectory.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSIONS_DIR_NAME.DIRECTORY_SEPARATOR.$extensionName
-				);
-
-				// If the symlink does not exist
-				if (!$_addSoftLinks)
+				// If destination of the symlink does not exist
+				if (!file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
 				{
-					// If the target directory does not exist than creates it
-					if (!is_dir($extensionPath.$targetDirectory)) mkdir($extensionPath.$targetDirectory);
+					// If the target directory does not exist than creates that
+					if (!is_dir($extensionPath.$targetDirectory))
+					{
+						mkdir($extensionPath.$targetDirectory);
+					}
 
 					// Create the symlink
-					$_addSoftLinks = @symlink(
-						// Target
+					$_addSoftLinks = symlink(
 						$extensionPath.$targetDirectory,
-						// Link
-						$rootPath.$targetDirectory.DIRECTORY_SEPARATOR.ExtensionsLib::EXTENSIONS_DIR_NAME.DIRECTORY_SEPARATOR.$extensionName
+						$rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName
 					);
-
-					// On failure
 					if (!$_addSoftLinks)
 					{
 						log_message('error', 'Failed to create Symlink to '.$extensionPath.$targetDirectory);
@@ -905,9 +796,9 @@ class ExtensionsLib
 		$this->_printMessage('Removing the extracted data from the upload directory');
 		if ($uploadData != null
 			&& isset($uploadData->extensionName)
-			&& file_exists($this->_getUploadPath().$uploadData->extensionName))
+			&& file_exists($this->UPLOAD_PATH.$uploadData->extensionName))
 		{
-			$this->_rrm($this->_getUploadPath().$uploadData->extensionName);
+			$this->_rrm($this->UPLOAD_PATH.$uploadData->extensionName);
 		}
 
 		// If the upload of the file is a success and the extension name is present and no previous installation were found
@@ -921,13 +812,16 @@ class ExtensionsLib
 			{
 				// Remove them all from file system and DB
 				$this->_printMessage('Removing entries in the DB related to this extension and from extensions directory');
-				$this->delExtension(getData($result)[0]->extension_id);
+				$this->delExtension($result->retval[0]->extension_id);
 			}
 		}
-		// Otherwise remove them all only from DB
-		elseif ($extensionJson != null && isset($extensionJson->extension_id))
+		else // otherwise
 		{
-			$this->_ci->ExtensionsModel->delete($extensionJson->extension_id);
+			// Remove them all only from DB
+			if ($extensionJson != null && isset($extensionJson->extension_id))
+			{
+				$this->_ci->ExtensionsModel->delete($extensionJson->extension_id);
+			}
 		}
 
 		$this->_printMessage('Rollback finished');
@@ -936,19 +830,46 @@ class ExtensionsLib
 	}
 
 	/**
-	 * Returns the absolute upload path
+	 * To enable/disable an extension
 	 */
-	private function _getUploadPath()
+	private function _toggleExtension($extensionId, $enabled)
 	{
-		return APPPATH.self::UPLOAD_PATH;
-	}
+		$_toggleExtension = false;
 
-	/**
-	 * Returns the absolute extensions path
-	 */
-	private function _getExtensionsPath()
-	{
-		return APPPATH.self::EXTENSIONS_DIR_NAME.DIRECTORY_SEPARATOR;
+		// Loads data from DB about the given extension
+		$result = $this->_ci->ExtensionsModel->load($extensionId);
+		if (hasData($result))
+		{
+			$extensionName = $result->retval[0]->name; // extension name
+
+			// If to be enabled
+			if ($enabled === true)
+			{
+				// Add the symlinks
+				$_toggleExtension = $this->_addSoftLinks($extensionName);
+			}
+			else // If to be disabled
+			{
+				// Remove all the symlinks
+				$_toggleExtension = $this->_delSoftLinks($extensionName);
+			}
+
+			if ($_toggleExtension) // if is a success
+			{
+				// Updates DB
+				$result = $this->_ci->ExtensionsModel->update($extensionId, array('enabled' => $enabled));
+				if (isSuccess($result))
+				{
+					$_toggleExtension = true;
+				}
+				else // if DB update fails remove symlinks from file system
+				{
+					$this->_delSoftLinks($extensionName);
+				}
+			}
+		}
+
+		return $_toggleExtension;
 	}
 
 	/**
@@ -1010,13 +931,4 @@ class ExtensionsLib
 	{
 		$this->_printInfo('------------------------------------------------------------------------------------------');
 	}
-
-	/**
-	 * Install the phrases from the given extension
-	 */
-	private function _installPhrases($extensionName)
-	{
-		$this->_ci->phraseslib->installFrom($this->_getExtensionsPath().$extensionName.'/'.self::PHRASES_DIRECTORY);
-	}
 }
-

application/libraries/LektorLib.php

@@ -17,12 +17,7 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->_ci->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
-
 		$this->_ci->load->library('PhrasesLib', array('lehre'));
-		$this->_ci->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -83,13 +78,10 @@ class LektorLib
 
 	public function updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $new_data)
 	{
-		$old_uid = $mitarbeiter_uid;
-		$new_uid = isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid;
-
 		$this->_ci->LehreinheitmitarbeiterModel->addSelect('lehre.tbl_lehreinheitmitarbeiter.*, lehre.tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.studiengang_kz');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
+		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 
 		if (isError($lehreinheit_result)) return $lehreinheit_result;
 
@@ -97,47 +89,27 @@ class LektorLib
 
 		$lehreinheit = getData($lehreinheit_result)[0];
 
-		$semesterstunden_alt = $lehreinheit->semesterstunden;
-		$semesterstunden_neu = isset($new_data['semesterstunden']) ? $new_data['semesterstunden'] : $semesterstunden_alt;
-		$bismelden_neu = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
-		$neue_stunden_eingerechnet = (bool)$bismelden_neu;
-		$alte_stunden_eingerechnet = (bool)$lehreinheit->bismelden;
-		$stundenplan_update = false;
 
-		if ($old_uid !== $new_uid)
+		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
+		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
 		{
-			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_uid, 'lehreinheit_id' => $lehreinheit_id));
+			$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+			if (hasData($verplant))
+				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
+
+			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
 
 			if (hasData($lehreinheit_data))
 				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
 
-			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
-			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
-			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
-
-			if (hasData($verplant))
-			{
-				$kollision = $this->hasKollision(getData($verplant), $new_uid);
-
-				$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
-
-				if ($kollision === false || $ignore_kollision == 'true')
-				{
-					$stundenplan_update = true;
-				}
-				else if (is_array($kollision))
-				{
-					return error( "Änderung fehlgeschlagen! Die Änderung des Lektors führt zu ".count($kollision)." Kollision(en) im LV-Plan. Deaktivieren Sie die Kollisionspruefung oder wenden Sie sich an die LV-Planung!\n zB. $kollision[0]");
-				}
-				else
-				{
-					return error($kollision);
-				}
-			}
 		}
-
 		$warning = '';
-		if (($semesterstunden_neu !== '' && $semesterstunden_alt !== '') && (($semesterstunden_neu > $semesterstunden_alt) || $neue_stunden_eingerechnet))
+		if (isset($new_data['semesterstunden']))
 		{
 			$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $lehreinheit->studiengang_kz));
 			if (isError($studiengang_result)) return $studiengang_result;
@@ -148,7 +120,7 @@ class LektorLib
 			if (isError($studiensemester_result)) return $studiensemester_result;
 			$studiensemester = getData($studiensemester_result)[0];
 
-			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($new_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
 
 			$echter_dv = false;
 
@@ -157,81 +129,83 @@ class LektorLib
 				$echter_dv = true;
 			}
 
-			$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
-			if (isError($stundengrenze_result)) return $stundengrenze_result;
+			$neue_stunden_eingerechnet = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
+			$alte_stunden_eingerechnet = $lehreinheit->bismelden;
 
-			$stundengrenze = getData($stundengrenze_result)[0];
-
-			$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
-			$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
-
-			$semesterstunden_alt_sql = is_null($semesterstunden_alt) ? 0 : $semesterstunden_alt;
-			$semesterstunden_neu_sql = is_null($semesterstunden_neu) ? 0 : $semesterstunden_neu;
-
-			if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt_sql) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu_sql)}) as summe");
-			else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt_sql)) as summe");
-			else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu_sql)})) as summe");
-			else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
-
-			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
-			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-			$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-
-			$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', $new_uid);
-			$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
-			$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
-			$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
-
-			if (count($oe_array) > 0)
+			if (($new_data['semesterstunden'] > $lehreinheit->semesterstunden) || $neue_stunden_eingerechnet)
 			{
+				$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
+				if (isError($stundengrenze_result)) return $stundengrenze_result;
+
+				$stundengrenze = getData($stundengrenze_result)[0];
+
+				$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
+				$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array('');
+
+				if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])}) as summe");
+				else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden)) as summe");
+				else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])})) as summe");
+				else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
+
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', (isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid));
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
+
 				$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
-			}
 
-			if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
-				&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
-				&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
-			{
-				$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
-			}
 
-			$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
-
-			if (isError($summe_result)) return $summe_result;
-
-			if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
-
-			$summe = getData($summe_result)[0]->summe;
-
-			if ($summe > $stundengrenze->stunden)
-			{
-				if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
+				if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+					&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+					&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
 				{
-					if (!$this->LehrauftragAufFirma($new_uid))
-						return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
-				}
-				else
-				{
-					$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
+					$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
 				}
 
-				$stunden_limit_result = $this->getStundenInstitut($new_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
+				$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
 
-				if (hasData($stunden_limit_result))
+				if (isError($summe_result)) return $summe_result;
+
+				if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
+
+				$summe = getData($summe_result)[0]->summe;
+
+				if ($summe > $stundengrenze->stunden)
 				{
-					$stunden_limit_array = getData($stunden_limit_result);
-					foreach ($stunden_limit_array as $stunden_limit)
+
+					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
 					{
-						$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
+						if (!$this->LehrauftragAufFirma(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid))
+							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
+					}
+					else
+					{
+						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
+					}
+
+					$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
+
+					if (hasData($stunden_limit_result))
+					{
+						$stunden_limit_array = getData($stunden_limit_result);
+						foreach ($stunden_limit_array as $stunden_limit)
+						{
+							$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
+						}
 					}
 				}
 			}
 		}
 
-		$benutzer_result = $this->_ci->BenutzerModel->load(array($new_uid));
+		$benutzer_result = $this->_ci->BenutzerModel->load(array(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid));
 
 		if (isError($benutzer_result)) return $benutzer_result;
 
@@ -253,23 +227,12 @@ class LektorLib
 			'bismelden'
 		);
 
-		$nullable_fields = array('stundensatz', 'semesterstunden', 'planstunden');
-
 		$updateData = array();
 		foreach ($updatableFields as $field)
 		{
-			if (!array_key_exists($field, $new_data))
-			{
-				continue;
-			}
+			$value = isset($new_data[$field]) ? $new_data[$field] : null;
 
-			$value = $new_data[$field];
-
-			if (in_array($field, $nullable_fields))
-			{
-				$updateData[$field] = $value;
-			}
-			elseif ($value !== null)
+			if ($value !== null)
 			{
 				$updateData[$field] = $value;
 			}
@@ -277,24 +240,10 @@ class LektorLib
 		$updateData['updatevon'] = getAuthUID();
 		$updateData['updateamum'] = date('Y-m-d H:i:s');
 
-		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid), $updateData);
+		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid), $updateData);
 
 		if (isError($result)) return $result;
 
-		if ($stundenplan_update)
-		{
-			$update_result = $this->_ci->StundenplandevModel->update([
-				'lehreinheit_id' => $lehreinheit_id,
-				'mitarbeiter_uid' => $old_uid,
-			], [
-				'mitarbeiter_uid' => $new_uid,
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => getAuthUID()
-			]);
-
-			if (isError($update_result)) return $update_result;
-		}
-
 		if ($warning !== '') return success(['warning' => $warning]);
 
 		return success('Erfolgreich geupdated');
@@ -398,52 +347,4 @@ class LektorLib
 		$this->_ci->LehreinheitmitarbeiterModel->addGroupBy('tbl_studiengang.bezeichnung');
 		return $this->_ci->LehreinheitmitarbeiterModel->load();
 	}
-
-	private function hasKollision($stunden, $mitarbeiter)
-	{
-		$kollision = array();
-
-		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
-		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
-
-		foreach ($stunden as $stunde)
-		{
-			$stundenplan_result = $this->_ci->StundenplandevModel->lektorHasStundenplandevEintrag($mitarbeiter, $stunde->datum, $stunde->stunde);
-
-			if (isError($stundenplan_result))
-				return $stundenplan_result;
-
-			if (hasData($stundenplan_result))
-			{
-				$stundenplan_result = getData($stundenplan_result)[0];
-				$kollision[] = "Kollision stundenplandev: $stundenplan_result->stundenplandev_id|$stundenplan_result->lektor|$stundenplan_result->ort_kurzbz|$stundenplan_result->stg_kurzbz-$stundenplan_result->semester$stundenplan_result->verband$stundenplan_result->gruppe$stundenplan_result->gruppe_kurzbz - $stundenplan_result->datum/$stundenplan_result->stunde";
-			}
-			else
-			{
-				if ($ignore_zeitsperre == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
-				{
-					$zeitsperre_result = $this->_ci->ZeitsperreModel->checkIfZeitsperreExists($mitarbeiter, $stunde->datum, $stunde->stunde);
-
-					if (hasData($zeitsperre_result))
-					{
-						$zeitsperre_result = getData($zeitsperre_result)[0];
-						$kollision[] = "Kollision (Zeitsperre): $zeitsperre_result->zeitsperre_id|$zeitsperre_result->mitarbeiter_uid|$zeitsperre_result->zeitsperretyp_kurzbz - $zeitsperre_result->vondatum/$zeitsperre_result->vonstunde|$zeitsperre_result->bisdatum/$zeitsperre_result->bisstunde";
-					}
-				}
-
-				if ($ignore_reservierung == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
-				{
-					$reservierung_result = $this->_ci->ReservierungModel->lektorHasReservierung($mitarbeiter, $stunde->datum, $stunde->stunde);
-
-					if (hasData($reservierung_result))
-					{
-						$reservierung_result = getData($reservierung_result)[0];
-						$kollision[] = "Kollision (Reservierung): $reservierung_result->reservierung_id|$reservierung_result->uid|$reservierung_result->ort_kurzbz|$reservierung_result->stg_kurzbz-$reservierung_result->semester$reservierung_result->verband$reservierung_result->gruppe$reservierung_result->gruppe_kurzbz - $reservierung_result->datum/$reservierung_result->stunde";
-					}
-				}
-			}
-		}
-
-		return isEmptyArray($kollision) ? false : $kollision;
-	}
 }

application/libraries/PhrasesLib.php

@@ -1,96 +1,98 @@
 <?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');
 
-use \Netcarver\Textile\Parser as NTParser;
-
 class PhrasesLib
 {
-	// Directory name where all the category files are
-	const CORE_PHRASES_DIRECTORY = 'phrases/';
-	// Old config file used for the phrases
-	const CORE_PHRASES_LEGACY_CFG_FILE = 'system/phrasesupdate.php';
-
-	// Who adds phrases into the database
-	const INSERT_BY = 'PhrasesManager';
-
-	// Array elements names
-	const APP = 'app';
-	const CATEGORY = 'category';
-	const PHRASE = 'phrase';
-	const SPRACHE = 'sprache';
-	const TEXT = 'text';
-	const DESCRIPTION = 'description';
-
 	private $_ci; // Code igniter instance
 	private $_phrases; // Contains the retrieved phrases
 
 	/**
 	 * Loads parser library
 	 */
-	public function __construct()
-	{
+    public function __construct()
+    {
 		$this->_ci =& get_instance();
 
 		$this->_phrases = null; // set the property _phrases as null by default
 
 		// CI parser
 		$this->_ci->load->library('parser');
-		// Loads EPrintfLib
-		$this->_ci->load->library('EPrintfLib');
 
-		// Loads the PhraseModel
 		$this->_ci->load->model('system/Phrase_model', 'PhraseModel');
-		// Loads the PhrasentextModel
 		$this->_ci->load->model('system/Phrasentext_model', 'PhrasentextModel');
 
 		// Workaround to use more parameters in the construct since PHP doesn't support many constructors
-		$this->_extendConstruct(func_get_args());
-	}
+		$this->_extend_construct(func_get_args());
+    }
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+   	/**
+     * getPhrase() - loads a specific Phrase
+     */
+    public function getPhrase($phrase_id)
+    {
+        if (isEmptyString($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID);
+
+        return $this->_ci->PhraseModel->load($phrase_id);
+    }
+
+    /**
+     * getSubMessages() - will return all Messages subordinated from a specified message.
+     */
+    public function getPhraseByApp($app = null)
+    {
+	    return $this->_ci->PhraseModel->loadWhere(array('app' => $app));
+    }
+
+    /**
+     * getPhraseInhalt
+     */
+	public function getPhraseInhalt($phrase_id)
+    {
+        if (isEmptyString($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID);
+
+        return $this->_ci->PhrasentextModel->loadWhere(array('phrase_id' => $phrase_id));
+    }
+
+    /**
+     * delPhrasentext
+     */
+    public function delPhrasentext($phrasentext_id)
+    {
+        if (isEmptyString($phrasentext_id)) return error(MSG_ERR_INVALID_MSG_ID);
+
+        return $this->_ci->PhrasentextModel->delete(array('phrasentext_id' => $phrasentext_id));
+    }
+
 	/**
-	 * Return the phrases in JSON format
-	 */
-	public function toJSON()
+     * savePhrase() - will save a spezific Phrase.
+     */
+    public function savePhrase($phrase_id, $data)
+    {
+        if (isEmptyString($data)) return error(MSG_ERR_INVALID_MSG_ID);
+
+        return $this->_ci->PhraseModel->update($phrase_id, $data);
+    }
+
+	/**
+     * getVorlagetextByVorlage() - will load tbl_vorlagestudiengang for a spezific Template.
+     */
+    public function getPhrasentextById($phrasentext_id)
 	{
-		return json_encode($this->_phrases);
-	}
+        if (isEmptyString($phrasentext_id)) return error('Not a valid phrasentext_id');
+
+        return $this->_ci->PhrasentextModel->load($phrasentext_id);
+    }
 
 	/**
-	 * getPhrase() - loads a specific Phrase
-	 */
-	public function getPhrase($phrase_id)
-	{
-		if (isEmptyString($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID);
-
-		return $this->_ci->PhraseModel->load($phrase_id);
-	}
-
-	/**
-	 * getPhrases() - Retrieves phrases from the DB
+     * getPhrases() - Retrieves phrases from the DB
 	 * The given parameter are the same needed to read from the table system.tb_phrase
-	 */
-	public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null)
-	{
+     */
+    public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null)
+    {
 		if (isset($app) && isset($sprache))
 		{
 			$result = $this->_ci->PhraseModel->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz);
@@ -98,7 +100,7 @@ class PhrasesLib
 			if (hasData($result))
 			{
 				// Textile parser
-				$textileParser = new NTParser();
+				$textileParser = new \Netcarver\Textile\Parser();
 
 				for ($i = 0; $i < count($result->retval); $i++)
 				{
@@ -137,7 +139,31 @@ class PhrasesLib
 		}
 
 		return $result;
-	}
+    }
+
+	/**
+     * insertPhraseinhalt() - will load tbl_vorlagestudiengang for a spezific Template.
+     */
+    public function insertPhraseinhalt($data)
+	{
+        return $this->_ci->PhrasentextModel->insert($data);
+    }
+
+	/**
+     * getVorlagetextById() - will load tbl_vorlagestudiengang for a spezific Template.
+     */
+    public function getVorlagetextById($vorlagestudiengang_id)
+	{
+        return $this->_ci->VorlageStudiengangModel->load($vorlagestudiengang_id);
+    }
+
+	/**
+     * saveVorlagetext() - will load tbl_vorlagestudiengang for a spezific Template.
+     */
+    public function updatePhraseInhalt($phrasentext_id, $data)
+	{
+        return $this->_ci->PhrasentextModel->update($phrasentext_id, $data);
+    }
 
 	/**
 	 * Retrieves a phrases from the the property _phrases with the given parameters
@@ -150,7 +176,7 @@ class PhrasesLib
 	public function t($category, $phrase, $parameters = array(), $orgeinheit_kurzbz = null, $orgform_kurzbz = null)
 	{
 		// If the property _phrases is populated
-		if (!isEmptyArray($this->_phrases))
+		if (is_array($this->_phrases))
 		{
 			// Loops through the _phrases property
 			for ($i = 0; $i < count($this->_phrases); $i++)
@@ -176,107 +202,6 @@ class PhrasesLib
 	}
 
 	/**
-	 * Install phrases from the core
-	 */
-	public function installFromCore()
-	{
-		$this->_installPhrases(APPPATH.self::CORE_PHRASES_DIRECTORY);
-	}
-
-	/**
-	 * Install phrases from the given path
-	 */
-	public function installFrom($phrasesDirectory)
-	{
-		$this->_installPhrases($phrasesDirectory);
-	}
-
-	/**
-	 * Creates/updates the phrases files under the directory application/phrases/
-	 */
-	public function syncFiles()
-	{
-		// Legacy phrases file absolute path
-		$legacyPhrasesFile = FHCPATH.self::CORE_PHRASES_LEGACY_CFG_FILE;
-
-		// Try to include the legacy file used to store the phrases
-		// It is using the @ to suppress errors in case the file is not readable or does not exist
-		// In case is not readable or does not exists it stops the execution and prompts a message
-		if ((@include_once $legacyPhrasesFile) === false)
-		{
-			$this->_ci->eprintflib->printError($legacyPhrasesFile.' not found or not readable!'."\n");
-			exit;
-		}
-
-		// If the phrases array exists and it is not empty, otherwise it stops the executions and prompts a message
-		if (!isset($phrases) || isEmptyArray($phrases))
-		{
-			$this->_ci->eprintflib->printError($legacyPhrasesFile.' does not contain a populated array called "$phrases"');
-			exit;
-		}
-
-		// For each phrases contained in the array
-		foreach ($phrases as $phrase)
-		{
-			// If it contains the element category
-			if (isset($phrase[self::CATEGORY]) && isset($phrase[self::PHRASE]))
-			{
-				// 
-				$toAppend = false;
-				
-				// Path and name of the phrases category file
-				$phrasesCategoryFile = APPPATH.self::CORE_PHRASES_DIRECTORY.$phrase[self::CATEGORY].'.php';
-
-				// Checks if a phrases file already exists for this category
-				if (file_exists($phrasesCategoryFile))
-				{
-					// Get the phrases file category content
-					$phrasesCategoryFileContent = file_get_contents($phrasesCategoryFile);
-
-					// If an error occurred
-					if ($phrasesCategoryFileContent === false)
-					{
-						$this->_ci->eprintflib->printError('Was not possible to get the content of: '.$phrasesCategoryFile);
-						exit;
-					}
-
-					// Check if the phrase already exists inside this file
-					if (stristr($phrasesCategoryFileContent, $phrase[self::PHRASE]) === false) $toAppend = true;
-				}
-				else // if not then
-				{
-					// Create the new phrases category file
-					if (!$this->_createPhraseToCategoryFile($phrasesCategoryFile))
-					{
-						$this->_ci->eprintflib->printError('Was not possible to create the phrases category file: '.$phrasesCategoryFile);
-						exit;
-					}
-
-					$this->_ci->eprintflib->printMessage('Created new phrases category file: '.$phrasesCategoryFile);
-					$toAppend = true;
-				}
-
-				// If the phrase is to be appended to the phrases category file
-				if ($toAppend)
-				{
-					// And then append the phrase to it
-					if (!$this->_appendPhraseToCategoryFile($phrase, $phrasesCategoryFile))
-					{
-						$this->_ci->eprintflib->printError('Was not possible to append to the phrases category file: '.$phrasesCategoryFile);
-						exit;
-					}
-				}
-			}
-			else // otherwise prompt an error message and continue
-			{
-				$this->_ci->eprintflib->printInfo('Missing "'.self::CATEGORY.'" or "'.self::PHRASE.'" for the following element:');
-				var_dump($phrase);
-				$this->_ci->eprintflib->printInfo('-------------------------------------------');
-			}
-		}
-	}
-
-	/*
 	 * Workaround to reload the phrases array on an already constructed library.
 	 * @parameters -> look for _setPhrases docs
 	 */
@@ -290,68 +215,6 @@ class PhrasesLib
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	/**
-	 * Append a new phrases to the related phrases category file
-	 */
-	private function _appendPhraseToCategoryFile($phrase, $phrasesCategoryFile)
-	{
-		// Open the category phrases file and a temporary one
-		$srcFileHandle = @fopen($phrasesCategoryFile, 'r');
-		// In case exists then it is truncated
-		$dstFileHandle = @fopen($phrasesCategoryFile.'.tmp', 'w');
-
-		// If an error occurred then return false
-		if (!$srcFileHandle || !$dstFileHandle) return false;
-
-		$line = '';
-		// Read the file line by line
-		while (!feof($srcFileHandle))
-		{
-			// Read a single line from the source file
-			$line = fgets($srcFileHandle, 4096);
-			// If an error occurred then exit
-			if ($line === false && !feof($srcFileHandle)) return false;
-
-			// If the first phrase or the end of the array
-			if ($line == '$phrases = array();' || stristr($line, ');'))
-			{
-				$first_coma = ',';
-				if ($line == '$phrases = array();') $first_coma = '';
-
-				// If found then append the new phrase to the current line
-				// and replace the end of the array
-				$line = str_replace(');', $first_coma."\n".var_export($phrase, true)."\n".');', $line);
-			}
-
-			// In any case copy the line to the temp file
-			if (@fwrite($dstFileHandle, $line) === false) return false;
-		}
-
-		// Close the file handles
-		fclose($srcFileHandle);
-		fclose($dstFileHandle);
-
-		// Delete the old file
-		if (@unlink($phrasesCategoryFile) === false) return false;
-
-		// Rename the temp file as the old one
-		if (@rename($phrasesCategoryFile.'.tmp', $phrasesCategoryFile) === false) return false;
-
-		return true; // if everything was fine
-	}
-
-	/**
-	 * Creates a new phrases category file with the given name
-	 * and having an empy array called $phrases as content
-	 */
-	private function _createPhraseToCategoryFile($phrasesCategoryFile)
-	{
-		return !(file_put_contents(
-			$phrasesCategoryFile,
-			'<?php'."\n\n".'$phrases = array();'
-		) === false);
-	}
-
 	/**
 	 * Extends the functionalities of the constructor of this class
 	 * This is a workaround to use more parameters in the construct since PHP doesn't support many constructors
@@ -361,19 +224,22 @@ class PhrasesLib
 	 *		- could be an array of categories, and for each category there is an array of phrases
 	 * language: optional parameter must be a string. It's used to load phrases
 	 */
-	private function _extendConstruct($params)
+	private function _extend_construct($params)
 	{
 		// Checks if the $params is an array with at least one element
-		if (!isEmptyArray($params))
+		if (is_array($params) && count($params) > 0)
 		{
 			$parameters = $params[0];	// temporary variable
+			$isIndexArray = false;		//flag for indexed array
 
 			// If there are parameters
-			if (!isEmptyArray($parameters))
+			if (is_array($parameters) && count($parameters) > 0)
 			{
 				$categories = $parameters[0]; // categories is always the first parameter
-				// If it is not an array, then convert into one
-				if (!is_array($categories)) $categories = array($categories);
+				if (!is_array($categories)) // if it is not an array, then convert into one
+				{
+					$categories = array($categories);
+				}
 
 				// Retrieves the language of the logged user
 				$language = getUserLanguage(count($parameters) == 2 ? $parameters[1] : null);
@@ -413,7 +279,7 @@ class PhrasesLib
 		// If language is not default language and phrasentext is null -> fallback to default language
 		if ($language != DEFAULT_LANGUAGE)
 		{
-			// Get array with phrasentexte in the default language
+			// get array with phrasentexte in the default language
 			$defaultPhrases = null;
 			if ($isIndexArray)
 			{
@@ -424,19 +290,19 @@ class PhrasesLib
 				$defaultPhrases = $this->_ci->PhraseModel->getPhrasesByCategoryAndPhrasesAndLanguage($categories, DEFAULT_LANGUAGE);
 			}
 
-			// Combine array with phrasentexte in users language and in default language
+			// combine array with phrasentexte in users language and in default language
 			// (default used if phrasentext in users language is null or not set)
 			if (hasData($phrases) && hasData($defaultPhrases))
 			{
-				// Loop through phrases in default language
+				// loop through phrases in default language
 				foreach ($defaultPhrases->retval as $defaultPhrase)
 				{
 					$found = false;	// flag for found phrase
 
-					// Loop through phrases in users language
+					// loop through phrases in users language
 					foreach ($phrases->retval as $phrase)
 					{
-						// If same phrase and category found and text is not null
+						// if same phrase and category found and text is not null
 						// use phrase in users language
 						if ($phrase->phrase == $defaultPhrase->phrase
 							&& $phrase->category == $defaultPhrase->category
@@ -447,11 +313,13 @@ class PhrasesLib
 						}
 					}
 
-					// Otherwise use phrase in default language
-					if (!$found) array_push($phrases->retval, $defaultPhrase);
+					// otherwise use phrase in default language
+					if (!$found)
+					{
+						array_push($phrases->retval, $defaultPhrase);
+					}
 				}
 			}
-			// Otherwise if only defaultPhrases have data
 			elseif (hasData($defaultPhrases))
 			{
 				$phrases = $defaultPhrases;
@@ -459,227 +327,19 @@ class PhrasesLib
 		}
 
 		// If there are phrases loaded then store them in the property _phrases
-		if (hasData($phrases)) $this->_phrases = $phrases->retval;
+		if (hasData($phrases))
+		{
+			$this->_phrases = $phrases->retval;
+		}
+
 	}
 
 	/**
-	 * Install phrases from the given directory
+	 * Returns the property _phrases JSON encoded
+	 * @return json encoded property _phrases
 	 */
-	private function _installPhrases($phrasesDirectory)
+	public function getJSON()
 	{
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
-		$this->_ci->eprintflib->printInfo('Phrases installation started from: '.$phrasesDirectory);
-
-		// If the given directory name does not exist
-		if (!is_dir($phrasesDirectory))
-		{
-			$this->_ci->eprintflib->printError('The directory '.$phrasesDirectory.' does not exist');
-		}
-		else // otherwise install the phrases from the given directory
-		{
-			// Get the list of category files from the given directory
-			$phrasesCategoryFiles = scandir($phrasesDirectory);
-
-			if ($phrasesCategoryFiles == false)
-			{
-				$this->_ci->eprintflib->printError('An error occurred while trying to access to the given directory: '.$phrasesDirectory);
-			}
-			else
-			{
-				// If no files are inside the given directory
-				if (count($phrasesCategoryFiles) == 2)
-				{
-					$this->_ci->eprintflib->printInfo('No phrases files are inside the given directory: '.$phrasesDirectory);
-				}
-
-				// For each file in this directory that represents a phrases category
-				foreach ($phrasesCategoryFiles as $phrasesCategoryFile)
-				{
-					// Gets the infos about the file
-					$pathInfo = pathinfo($phrasesDirectory.$phrasesCategoryFile);
-
-					// Skip the upper directory, the same directory and files that are not a php file
-					if ($phrasesCategoryFile != '.'
-						&& $phrasesCategoryFile != '..'
-						&& $pathInfo['extension'] == 'php')
-					{
-						$phrases = null; // define the variable
-
-						// Include the php file that contains phrases for that category
-						require_once($phrasesDirectory.$phrasesCategoryFile);
-
-						// If this file contains an array called phrases
-						if (isset($phrases) && is_array($phrases))
-						{
-							$addPhrases = $this->_addPhrases($phrases); // add them to the database
-
-							// If a blocking error occurred then print an error and stop the execution
-							if (isError($addPhrases))
-							{
-								$this->_ci->eprintflib->printError(getError($addPhrases));
-								break;
-							}
-						}
-						else // otherwise print an error and continue with the next file
-						{
-							$this->_ci->eprintflib->printInfo(
-								'The file '.$phrasesDirectory.$phrasesCategoryFile.' does not contain an array called "phrases"'
-							);
-						}
-
-						// Clean for the next file
-						unset($phrases);
-					}
-				}
-			}
-		}
-
-		$this->_ci->eprintflib->printInfo('Phrases installation ended');
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
+		return json_encode($this->_phrases);
 	}
-
-	/**
-	 * Add new phrases to the database
-	 */
-	private function _addPhrases($phrases)
-	{
-		// For eache given phrase
-		foreach ($phrases as $phrase)
-		{
-			$phrase_id = null; // The id of the new/existing phrase
-
-			// Checks the mandatory fields, if one of them is not valid continue with the next phrase
-			if (!$this->_isValidElement($phrase, self::APP)) continue;
-			if (!$this->_isValidElement($phrase, self::CATEGORY)) continue;
-			if (!$this->_isValidElement($phrase, self::PHRASE)) continue;
-
-			// Checks if the phrase already exists in the database
-			$phraseResult = $this->_ci->PhraseModel->loadWhere(
-				array(
-					'app' => $phrase[self::APP],
-					'category' => $phrase[self::CATEGORY],
-					'phrase' => $phrase[self::PHRASE]
-				)
-			);
-
-			// If an error occurred then return the error itself
-			if (isError($phraseResult)) return $phraseResult;
-
-			// If no phrase has been found
-			if (!hasData($phraseResult))
-			{
-				// Then add the phrase to the database
-				$phraseInsertResult = $this->_ci->PhraseModel->insert(
-					array(
-						'app' => $phrase[self::APP],
-						'category' => $phrase[self::CATEGORY],
-						'phrase' => $phrase[self::PHRASE],
-						'insertamum' => 'NOW()',
-						'insertvon' => self::INSERT_BY
-					)
-				);
-
-				// If an error occurred then return the error itself
-				if (isError($phraseInsertResult)) return $phraseInsertResult;
-
-				$phrase_id = getData($phraseInsertResult); // the phrase_id of the new added phrase
-
-				// Prints info about the new added phrase
-				$this->_ci->eprintflib->printMessage(
-					sprintf(
-						'A new phrase has been added into the database: '.
-						'phrase_id => %s | app => %s | category => %s | phrase => %s',
-						$phrase_id,
-						$phrase[self::APP],
-						$phrase[self::CATEGORY],
-						$phrase[self::PHRASE]
-					)
-				);
-			}
-			else // otherwise if the phrase already exists in the database
-			{
-				$phrase_id = getData($phraseResult)[0]->phrase_id; // gets the phrase_id
-			}
-
-			// If not a valid phrase_id
-			if ($phrase_id == null) return error('Not a valid phrase id');
-
-			// For each phrase text, one text for each language
-			foreach ($phrase['phrases'] as $phraseText)
-			{
-				// Checks the mandatory fields, if one of them is not valid continue with the next phrase text
-				if (!$this->_isValidElement($phraseText, self::SPRACHE)) continue;
-				if (!$this->_isValidElement($phraseText, self::TEXT)) continue;
-
-				// Set the not optional fields if they have not been set
-				if (!isset($phraseText[self::DESCRIPTION])) $phraseText[self::DESCRIPTION] = null;
-
-				// Checks if the phrase already exists in the database
-				$phraseTextResult = $this->_ci->PhrasentextModel->loadWhere(
-					array(
-						'phrase_id' => $phrase_id,
-						'sprache' => $phraseText[self::SPRACHE]
-					)
-				);
-
-				// If an error occurred then return the error itself
-				if (isError($phraseTextResult)) return $phraseTextResult;
-
-				// If no text for the phrase was found
-				if (!hasData($phraseTextResult))
-				{
-					// Then add the text phrase to the database
-					$phraseTextInsertResult = $this->_ci->PhrasentextModel->insert(
-						array(
-							'phrase_id' => $phrase_id,
-							'sprache' => $phraseText[self::SPRACHE],
-							'text' => $phraseText[self::TEXT],
-							'description' => $phraseText[self::DESCRIPTION],
-							'insertvon' => self::INSERT_BY,
-							'insertamum' => 'NOW()',
-							'orgeinheit_kurzbz' => null,
-							'orgform_kurzbz' => null
-						)
-					);
-
-					// If an error occurred then return the error itself
-					if (isError($phraseTextInsertResult)) return $phraseTextInsertResult;
-
-					// Prints info about the new added text phrase
-					$this->_ci->eprintflib->printMessage(
-						sprintf(
-							'A new text has been added into the database: '.
-							'phrase_id => %s | sprache => %s | text => %s | description => %s',
-							$phrase_id,
-							$phraseText[self::SPRACHE],
-							substr($phraseText[self::TEXT], 0, 42).'...',
-							substr($phraseText[self::DESCRIPTION], 0, 42).'...'
-						)
-					);
-				}
-			}
-		}
-
-		// If here then no blocking errors occurred
-		return success();
-	}
-
-	/**
-	 * Checks if the given array element exists in the given array and if it is a valid string and then returns true
-	 * Otherwise prints an info and then returns false
-	 */
-	private function _isValidElement($array, $elementName)
-	{
-		// If a not valid text is set
-		if ((isset($array[$elementName]) && isEmptyString($array[$elementName])) || !isset($array[$elementName]))
-		{
-			$this->_ci->eprintflib->printInfo('Not a valid element "'.$elementName.'":');
-			var_dump($array); // KEEP IT!!!
-			$this->_ci->eprintflib->printEOL();
-			return false;
-		}
-
-		return true;
-	}
-}
-
+}

application/libraries/ProfilLib.php

@@ -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;
 	}
 

application/libraries/StundenplanLib.php

@@ -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");
 		
@@ -80,12 +77,10 @@ class StundenplanLib
 		if (isError($semester_range))
 			return $semester_range;
 		$semester_range = getData($semester_range);
-		$this->_ci->addMeta('semester_range', $semester_range);
 
 		$this->sortStudienSemester($semester_range);
 
 		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
-		$this->_ci->addMeta('nach_apply_semester_range', $semester_range);
 		if ($function_error)
 			return $function_error;
 		
@@ -94,13 +89,13 @@ class StundenplanLib
 		if (isError($benutzer_gruppen))
 			return $benutzer_gruppen;
 		$benutzer_gruppen = getData($benutzer_gruppen);
-		$this->_ci->addMeta('spezialgruppen', $benutzer_gruppen);
+
 		// getting the student_lehrverbaende of the student in the different studiensemester
 		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
 		if (isError($student_lehrverband))
 			return $student_lehrverband;
 		$student_lehrverband = getData($student_lehrverband);
-		$this->_ci->addMeta('studentlehrvebaende', $student_lehrverband);
+		
 		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
 			$start,
 			$end,
@@ -186,21 +181,6 @@ class StundenplanLib
 		return success($stundenplan_data);
 	}
 
-	public function getEventsByLE($lehreinheit_id, $start, $end, $stundenplan)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		return $this->_ci->StundenplanModel->getStundenplanLE($lehreinheit_id, $start, $end, $stundenplan);
-	}
-
-	public function getEventsByLV($lehrveranstaltung_id, $start, $end, $stundenplan)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		return $this->_ci->StundenplanModel->getStundenplanLV($lehrveranstaltung_id, $start, $end, $stundenplan);
-	}
 	/**
 	 * Get stundenplan for a room
 	 *
@@ -237,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();
 
@@ -248,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))
@@ -377,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;
 				}
@@ -468,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
@@ -632,7 +591,6 @@ class StundenplanLib
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
-						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result);
@@ -802,8 +760,7 @@ class StundenplanLib
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		// gets all studiensemester from the student from start_date to end_date
-		//$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date);
-		$semester_range = $this->_ci->StudiensemesterModel->getContainingOrNearestByDateRange($start_date, $end_date);
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date);
 		if (isError($semester_range))
 			return $semester_range;
 		

application/libraries/TagLib.php

@@ -1,392 +0,0 @@
-<?php
-
-/**
- * FH-Complete
- *
- * @package             FHC-Helper
- * @author              FHC-Team
- * @copyright           Copyright (c) 2026 fhcomplete.net
- * @license             GPLv3
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-use \stdClass as stdClass;
-
-class TagLib
-{
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		// Configs
-		$this->_ci->load->config('stv');
-
-		// Models
-		$this->_ci->load->model('person/Notiz_model', 'NotizModel');
-		$this->_ci->load->model('system/Notiztyp_model', 'NotiztypModel');
-		$this->_ci->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		// Libraries
-		$this->_ci->load->library('PermissionLib');
-		$this->_ci->load->library('PrestudentLib');
-
-		$this->batchUser = $this->_ci->config->item('userAutomatedTags');
-	}
-
-	public function updateAutomatedTags($paramsTag)
-	{
-		// ---------------------------------
-		// check params
-		// ---------------------------------
-		$required = ['kurzbz', 'data', 'typeId'];
-
-		foreach ($required as $key) {
-			if (!isset($paramsTag[$key])) {
-				return error('Missing Parameter: ' . $key);
-			}
-		}
-
-		$studiensemester_kurzbz = (isset ($paramsTag['studiensemester_kurzbz']) ? $paramsTag['studiensemester_kurzbz'] : null);
-		$tag = $paramsTag['kurzbz'];
-		$inputData = $paramsTag['data'];
-		$typeId = $paramsTag['typeId'];
-
-		// ---------------------------------
-		// prepare input
-		// ---------------------------------
-		$zeitraum = [];
-		$arrayIds = [];
-
-		foreach ($inputData as $item) {
-			$id = $item['id'];
-			$arrayIds[] = $id;
-
-			$zeitraum[$id] = [
-				'von' => $item['von'] ?? null,
-				'bis' => $item['bis'] ?? null
-			];
-		}
-		$arrayIds = array_unique($arrayIds);
-
-		$result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
-		if (isError($result)) {
-			return $result;
-		}
-		$data = $result->retval[0] ?? null;
-
-		$von = $data->start ?? null;
-		$bis = $data->ende ?? null;
-
-		// ---------------------------------
-		// load existing tags
-		// ---------------------------------
-		$allTags = [];
-		$resultAllTags = $this->_ci->NotizModel->getAllTags($tag, $von, $bis);
-		if (isError($resultAllTags)) {
-			return $resultAllTags;
-		}
-		$allTagsData = getData($resultAllTags);
-
-		if (!empty($allTagsData)) {
-			foreach ($allTagsData as $item) {
-				$allTags[$item->$typeId] = $item->notiz_id;
-			}
-		}
-
-		// ---------------------------------
-		// map the data
-		// ---------------------------------
-		$toRecycle = [];
-		$toAdd = [];
-		$toDelete = [];
-
-		foreach ($arrayIds as $id) {
-			if (isset($allTags[$id])) {
-				$toRecycle[$id] = $allTags[$id];
-			} else {
-				$toAdd[] = $id;
-			}
-		}
-
-		foreach ($allTags as $id => $notizId) {
-			if (!in_array($id, $arrayIds)) {
-				$toDelete[$id] = $notizId;
-
-			}
-		}
-
-		// ---------------------------------
-		// recycle (update existing)
-		// ---------------------------------
-		$countRecycled = 0;
-		$retagged = [];
-
-		foreach ($toRecycle as $id => $notizId)
-		{
-			$this->_updateTag($notizId, $zeitraum[$id]['von'], $zeitraum[$id]['bis']);
-
-			$countRecycled++;
-			$retagged[] = $id;
-		}
-
-		// ---------------------------------
-		// ADD
-		// ---------------------------------
-		$countAdded = 0;
-		$tagged = [];
-
-		foreach ($toAdd as $id)
-		{
-			$this->_insertTag($typeId, $id, $tag, $zeitraum[$id]['von'], $zeitraum[$id]['bis']);
-			$countAdded++;
-
-			$tagged[] = $id;
-		}
-
-		// ---------------------------------
-		// delete
-		// ---------------------------------
-		$countDeleted = 0;
-		$deleted = [];
-
-		foreach ($toDelete as $id => $notizId)
-		{
-			$result = $this->_deleteTag($notizId);
-
-			if (isError($result)) {
-				return $result;
-			}
-
-			$countDeleted++;
-			$deleted[] = $id;
-		}
-
-		// ---------------------------------
-		// return
-		// ---------------------------------
-		return success([
-			'input' => [
-				'tag' => $tag,
-				'arrayIds' => $arrayIds
-			],
-			'summary' => [
-				'recycled' => $countRecycled,
-				'added' => $countAdded,
-				'deleted' => $countDeleted
-			],
-			'details' => [
-				'existingTags' => $allTags,
-				'toAdd' => $toAdd,
-				'toRecycle' => $toRecycle,
-				'toDelete' => $toDelete
-			],
-			'results' => [
-				'retaggedIds' => $retagged,
-				'newTags' => $tagged,
-				'deletedTagsIds' => $deleted
-			]
-		]);
-	}
-
-	public function updateAutomatedTagsForTypeId(array $params)
-	{
-		$return = null;
-		$notiz_id = null;
-
-		$von = $params['von'];
-		$bis = $params['bis'];
-		$tag = $params['kurzbz'];
-		$id = $params['id'];
-		$typeId = $params['typeId'];
-
-		$this->_ci->NotizModel->addSelect('nz.notiz_id');
-		$this->_ci->NotizModel->addSelect($typeId);
-		$this->_ci->NotizModel->addJoin('public.tbl_notizzuordnung nz', 'notiz_id');
-		$resultAllTags = $this->_ci->NotizModel->loadWhere([
-			'typ' => $tag,
-			$typeId => $id
-		]);
-		if(hasData($resultAllTags))
-		{
-			$notiz_id = $resultAllTags->retval[0]->notiz_id;
-		}
-
-		//RECYCLE
-		if ($notiz_id !== null)
-		{
-			$resultUpdateNotiz = $this->_updateTag($notiz_id, $von, $bis);
-			$return = ['recycled' => $resultUpdateNotiz];
-		}
-		else
-		//ADD
-		{
-			$resultInsertNotiz = $this->_insertTag($typeId, $id, $tag, $von, $bis);
-			$return = ['added' => $resultInsertNotiz];
-		}
-		return success($return);
-	}
-
-	/*
-	 * main function for rebuild Tags for typeId
-	 * */
-	public function rebuildTagsForTypeId($typeId, $id, $studiensemester_kurzbz)
-	{
-		$automatedTagsRes = $this->_ci->NotiztypModel->loadWhere(array('automatisiert' => true, 'taglib IS NOT NULL' => null));
-		$automatedTags = hasData($automatedTagsRes) ? getData($automatedTagsRes) : [];
-
-		$result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
-		if (isError($result))
-			return error('Error occurred during retrieving studiensemester');
-		if (empty($result->retval) || !isset($result->retval[0])) {
-			return error('No studiensemester found');
-		}
-
-		$startSem = $result->retval[0]->start ?? null;
-		$endeSem = $result->retval[0]->ende ?? null;
-		$return = [];
-
-		foreach ($automatedTags as $autoTag)
-		{
-			// getPath: must not be lost
-			$filePath = APPPATH . 'libraries/' . $autoTag->taglib . '.php'; // APPPATH = application/
-
-			if (file_exists($filePath)) {
-				require_once($filePath);
-			} else {
-				echo "File not found: " . $filePath;
-				continue;
-			}
-
-			$className = basename($autoTag->taglib);
-			$kurz_bz = $autoTag->typ_kurzbz;
-
-			$obj = new $className();
-
-			$criteriaIsSet = $obj->isCriteriaSetFor([
-				'typeId' => $typeId,
-				'id' => $id,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]);
-
-			if (hasData($criteriaIsSet))
-			{
-				$von = isset($criteriaIsSet->retval[0]->von) ? $criteriaIsSet->retval[0]->von : '';
-				$bis = isset($criteriaIsSet->retval[0]->bis) ? $criteriaIsSet->retval[0]->bis : '';
-
-				$params = [
-					'von' => $von,
-					'bis' => $bis,
-					'kurzbz' => $autoTag->typ_kurzbz,
-					'typeId' => $typeId,
-					'id' => $id,
-				];
-
-				$result = $this->updateAutomatedTagsForTypeId($params);
-				if (isError($result))
-					return error('Error occurred during updateAutomatedTags' . $kurz_bz);
-
-				$return[$kurz_bz] = $result;
-			}
-			else
-			{
-				//CHECK FOR DELETE
-				$params = [
-						'von' => $startSem,
-						'bis' => $endeSem,
-						'kurzbz' => $autoTag->typ_kurzbz,
-						'typeId' => $typeId,
-						'id' => $id,
-					];
-				$result = $this->_ci->NotizModel->checkIfExistingTag($kurz_bz, $typeId, $id, $startSem, $endeSem);
-				if (hasData($result))
-				{
-					$notizId = $result->retval[0]->notiz_id;
-					$this->_deleteTag($notizId);
-					$return[$kurz_bz] = ['deleted' => $notizId];
-				}
-			}
-		}
-		return success($return);
-	}
-
-	private function _insertTag($typeId, $id, $tag, $von, $bis)
-	{
-		$resultInsert = $this->_ci->NotizModel->insert([
-			'titel' => 'TAG',
-			'text' => 'AUTOMATED TAG',
-			'verfasser_uid' => $this->batchUser,
-			'erledigt' => false,
-			'insertamum' => date('Y-m-d H:i:s'),
-			'insertvon' => 'BatchJobTagAdd',
-			'typ' => $tag,
-			'start' => $von,
-			'ende' => $bis
-		]);
-
-		if (isError($resultInsert)) {
-			return error('Error inserting tag for ' .  $typeId . ': ' . $id);
-		}
-
-		$notizId = $resultInsert->retval;
-
-		$resultZuordnung = $this->_ci->NotizzuordnungModel->insert([
-			'notiz_id' => $notizId,
-			$typeId => $id
-		]);
-
-		if (isError($resultZuordnung)) {
-			return error('Error inserting relation for ' .  $typeId . ': ' . $id);
-		}
-
-		return $notizId;
-	}
-
-	private function _updateTag($notiz_id, $von, $bis)
-	{
-		$resultUpdateNotiz = $this->_ci->NotizModel->update(
-			[
-				'notiz_id' => $notiz_id
-			],
-			array(
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => 'BatchJobTagUpdate',
-				'start' => $von,
-				'ende' => $bis
-			));
-
-
-		if (isError($resultUpdateNotiz))
-			return error ('Error occurred during Update ' . $notiz_id);
-
-		return $notiz_id;
-	}
-
-	private function _deleteTag($notiz_id)
-	{
-		$result = $this->_ci->NotizzuordnungModel->delete([
-			'notiz_id' => $notiz_id
-		]);
-		if (isError($result)) {
-			return error('Error occurred during delete Notizzuordnung ' . $notiz_id);
-		}
-
-		$result = $this->_ci->NotizModel->delete([
-			'notiz_id' => $notiz_id
-		]);
-		if (isError($result)) {
-			return error('Error occurred during delete Notiz ' . $notiz_id);
-		}
-
-		return success([
-			'deleted' => $notiz_id
-		]);
-	}
-
-}

application/libraries/dashboard/DashboardLib.php

@@ -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;
+		}
+	}
 }