Merge branch 'feature-68598/Rollup_lets_try_it_again' into demo-pv21

application/config/Events.php

@@ -33,27 +33,5 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
-//Tempus Renderers:
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-
 
 

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/navigation.php

@@ -208,14 +208,7 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)

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';
@@ -122,21 +119,9 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'a
 // // (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';
 
-
-$route['lvplan/caldav'] = 'LvPlanCalDAV';
-$route['lvplan/caldav/.*'] = 'LvPlanCalDAV';
-$route['lvplan/ical/subscription/google'] = 'LvPlanICALSubscription';
-$route['lvplan/ical/download'] = 'LvPlanICALDownload';
-$route['lvplan/csv/download'] = 'LvPlanCSVDownload';
-$route['lvplan/excel/download'] = 'LvPlanExcelDownload';
-$route['lvplan/html/preview'] = 'LvPlanHTMLPreview';
-$route['lvplan/html/detail'] = 'LvPlanHTMLDetail';
-
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 
-$route['api/frontend/v1/tempus/Tags/getTagsByCalendar/(:num)'] = 'api/frontend/v1/tempus/Tags/getTagsByCalendar/$1';
-
 foreach($subdirs as $subdir)
 {
 	if(is_dir($subdir))

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,32 +168,3 @@ $config['stgkz_blacklist_wiederholung'] = [];
  * @var array           An array of noten ids
  */
 $config['note_blacklist_wiederholung'] = [];
-
-/**
- *  Enable/disable the Abmeldung StG process
- *
- * @var bool
- */
-$config['abmeldung_stg_enabled'] = true;
-
-/**
- *  Enable/disable the Abmeldung process
- *
- * @var bool
- */
-$config['abmeldung_enabled'] = true;
-
-/**
- *  Enable/disable the Unterbrecher process
- *
- * @var bool
- */
-$config['unterbrechung_enabled'] = true;
-
-/**
- *  Enable/disable the Wiederholer process
- *
- * @var bool
- */
-$config['wiederholung_enabled'] = true;
-

application/config/tempus.php

@@ -1,12 +0,0 @@
-<?php
-
-$config['send_update_mails'] = false;
-$config['calendar_start'] = 7;
-$config['calendar_end'] = 23;
-
-
-$config['tempus_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => true],
-	'hinweis' => ['readonly' => false],
-];

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/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/LvPlanCSVDownload.php

@@ -1,311 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanCSVDownload extends Auth_Controller
-{
-	const MAX_DATE_RANGE = 34560000; // 400 days
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->loadPhrases(array('global', 'lehre', 'ui'));
-	}
-
-	/**
-	 * Serves an authenticated CSV file download.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$type = $this->getType();
-		$uid = getAuthUID();
-		$ortKurzbz = null;
-		$verbandFilters = null;
-		if ($type === 'ort')
-			$ortKurzbz = $this->getRoom();
-		elseif ($type === 'verband')
-			$verbandFilters = $this->getVerbandFilters();
-		else
-		{
-			$uid = $this->getUid();
-			$this->authorizeUid($uid);
-			$this->validateUid($uid);
-		}
-		$target = $this->getTarget();
-		list($begin, $ende) = $this->getDateRange();
-
-		$this->load->library('LvPlanCSVLib');
-		$content = $this->lvplancsvlib->getContent(
-			$uid,
-			$begin,
-			$ende,
-			$type,
-			$target,
-			$ortKurzbz,
-			$verbandFilters
-		);
-
-		$filename = $this->getFilename($begin, $ende, $target);
-
-		$this->output
-			->set_content_type('text/csv', 'UTF-8')
-			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
-			->set_header('Pragma: public')
-			->set_header('Expires: 0')
-			->set_output($content);
-	}
-
-	/**
-	 * @return string Requested timetable type.
-	 */
-	private function getType()
-	{
-		$type = $this->input->get('type', true);
-
-		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			show_error('Ungueltiger Parameter: type', 400);
-
-		return $type;
-	}
-
-	/**
-	 * @return string Requested user UID.
-	 */
-	private function getUid()
-	{
-		$uid = $this->input->get('pers_uid', true);
-
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		return $uid;
-	}
-
-	/**
-	 * @return string Requested room identifier.
-	 */
-	private function getRoom()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz');
-		$room = $this->OrtModel->load($ortKurzbz);
-		if (isError($room))
-			show_error(getError($room), 500);
-		if (!hasData($room))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		return $ortKurzbz;
-	}
-
-	/**
-	 * @return array Requested Lehrverband filters.
-	 */
-	private function getVerbandFilters()
-	{
-		$stgKz = $this->getInteger('stg_kz', true);
-		$semester = $this->getInteger('sem', false, true);
-		$verband = $this->getOptionalFilter('ver');
-		$gruppe = $this->getOptionalFilter('grp');
-
-		$this->StudiengangModel->addSelect('studiengang_kz');
-		$studiengang = $this->StudiengangModel->load($stgKz);
-		if (isError($studiengang))
-			show_error(getError($studiengang), 500);
-		if (!hasData($studiengang))
-			show_error('Ungueltiger Parameter: stg_kz', 400);
-
-		return array(
-			'stg_kz' => $stgKz,
-			'sem' => $semester,
-			'ver' => $verband,
-			'grp' => $gruppe
-		);
-	}
-
-	private function getInteger($name, $signed, $optional = false)
-	{
-		$value = $this->input->get($name, true);
-		if ($optional && ($value === null || $value === ''))
-			return null;
-
-		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
-		if (!is_string($value) || !preg_match($pattern, $value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$integer = filter_var($value, FILTER_VALIDATE_INT);
-		if ($integer === false || (!$signed && $integer < 0))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $integer;
-	}
-
-	private function getOptionalFilter($name)
-	{
-		$value = $this->input->get($name, true);
-		if ($value === null || $value === '' || $value === '0')
-			return null;
-		if (!is_string($value)
-			|| !check_utf8($value)
-			|| mb_strlen($value) > 20
-			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
-		{
-			show_error('Ungueltiger Parameter: '.$name, 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @return string|null Requested CSV target.
-	 */
-	private function getTarget()
-	{
-		$target = $this->input->get('target', true);
-
-		if ($target !== null && $target !== 'outlook')
-			show_error('Ungueltiger Parameter: target', 400);
-
-		return $target;
-	}
-
-	/**
-	 * Validates and expands the requested range to complete weeks.
-	 *
-	 * @return array{0: int, 1: int} Begin and end timestamps.
-	 */
-	private function getDateRange()
-	{
-		$begin = $this->getTimestamp('begin');
-		$ende = $this->getTimestamp('ende');
-
-		if ($ende < $begin)
-			show_error('Ungueltiger Datumsbereich', 400);
-
-		if ($ende - $begin > self::MAX_DATE_RANGE)
-			show_error('Datumsbereich zu gross', 400);
-
-		$begin = strtotime('monday this week', $begin);
-		$ende = strtotime('sunday this week', $ende);
-
-		return array($begin, $ende);
-	}
-
-	/**
-	 * Builds the CSV download filename.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @param string|null $target Requested CSV target.
-	 * @return string Filename.
-	 */
-	private function getFilename($begin, $ende, $target)
-	{
-		$studiensemester = $this->getStudiensemester($begin, $ende);
-
-		$filename = $this->p->t('global', 'termine');
-		if ($studiensemester !== null)
-			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
-		$filename .= '-'.date('Ymd');
-		if ($target === 'outlook')
-			$filename .= '_outlook';
-		$filename .= '.csv';
-
-		return $filename;
-	}
-
-	/**
-	 * Gets the study semester covered by the requested date range.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @return object|null Study semester, if one overlaps the range.
-	 */
-	private function getStudiensemester($begin, $ende)
-	{
-		$semesterRange = $this->StudiensemesterModel->getByDateRange(
-			date('Y-m-d', $begin),
-			date('Y-m-d', $ende)
-		);
-
-		if (isError($semesterRange) || !hasData($semesterRange))
-			return null;
-
-		$studiensemester = current(getData($semesterRange));
-
-		return $studiensemester;
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @return int Unix timestamp.
-	 */
-	private function getTimestamp($name)
-	{
-		$value = $this->input->get($name, true);
-
-		if (!is_string($value) || !ctype_digit($value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$timestamp = filter_var(
-			$value,
-			FILTER_VALIDATE_INT,
-			array('options' => array('min_range' => 0))
-		);
-
-		if ($timestamp === false)
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $timestamp;
-	}
-
-	/**
-	 * Ensures access to another user's timetable is explicitly permitted.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function authorizeUid($uid)
-	{
-		if ($uid !== getAuthUID()
-			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
-		{
-			show_error('Forbidden', 403);
-		}
-	}
-
-	/**
-	 * Ensures the requested user exists.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function validateUid($uid)
-	{
-		$this->BenutzerModel->addSelect('uid');
-		$user = $this->BenutzerModel->load(array($uid));
-
-		if (isError($user))
-			show_error(getError($user), 500);
-
-		if (!hasData($user))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-	}
-}

application/controllers/LvPlanCalDAV.php

@@ -1,58 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- */
-class LvPlanCalDAV extends FHC_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-        parent::__construct();
-		$this->load->library('sabredav/SabreDAVAuthLib');
-        $this->load->library('sabredav/SabreDAVCalDAVLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-       
-        $authBackend = new SabreDAVAuthLib();
-        $principalBackend = new SabreDAVACLPrincipalBackend($authBackend);
-        $calendarBackend = new SabreDAVCalDAVBackend($authBackend);
-
-        $tree = array(
-            new \Sabre\CalDAV\Principal\Collection($principalBackend),
-            new \Sabre\CalDAV\CalendarRoot($principalBackend, $calendarBackend)
-        );
-
-        $server = new \Sabre\DAV\Server($tree);
-
-        $baseUri = '/' . implode('/', array_filter([
-            trim(BASE_LOCATION, '/'),
-            trim($this->config->item('index_page'), '/'),
-            'lvplan',
-            'caldav'
-        ]));
-        $server->setBaseUri($baseUri);
-
-        $authBackend->setRealm('SabreDAV');
-        $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
-        $server->addPlugin($authPlugin);
-
-        $caldavPlugin = new \Sabre\CalDAV\Plugin();
-        $server->addPlugin($caldavPlugin);
-
-        $aclPlugin = new \Sabre\DAVACL\Plugin();
-        $server->addPlugin($aclPlugin);
-
-        $browser = new \Sabre\DAV\Browser\Plugin();
-        $server->addPlugin($browser);
-
-        $server->exec();
-	}
-}

application/controllers/LvPlanExcelDownload.php

@@ -1,292 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanExcelDownload extends Auth_Controller
-{
-	const MAX_DATE_RANGE = 34560000; // 400 days
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->loadPhrases(array('global'));
-	}
-
-	/**
-	 * Serves an authenticated Excel file download.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$type = $this->getType();
-		$uid = getAuthUID();
-		$ortKurzbz = null;
-		$verbandFilters = null;
-		if ($type === 'ort')
-			$ortKurzbz = $this->getRoom();
-		elseif ($type === 'verband')
-			$verbandFilters = $this->getVerbandFilters();
-		else
-		{
-			$uid = $this->getUid();
-			$this->authorizeUid($uid);
-			$this->validateUid($uid);
-		}
-		list($begin, $ende) = $this->getDateRange();
-
-		$this->load->library('LvPlanExcelLib');
-		$content = $this->lvplanexcellib->getContent(
-			$uid,
-			$begin,
-			$ende,
-			$type,
-			$ortKurzbz,
-			$verbandFilters
-		);
-
-		$filename = $this->getFilename($begin, $ende);
-
-		$this->output
-			->set_content_type('application/vnd.ms-excel')
-			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
-			->set_header('Pragma: public')
-			->set_header('Expires: 0')
-			->set_output($content);
-	}
-
-	/**
-	 * @return string Requested timetable type.
-	 */
-	private function getType()
-	{
-		$type = $this->input->get('type', true);
-
-		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			show_error('Ungueltiger Parameter: type', 400);
-
-		return $type;
-	}
-
-	/**
-	 * @return string Requested user UID.
-	 */
-	private function getUid()
-	{
-		$uid = $this->input->get('pers_uid', true);
-
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		return $uid;
-	}
-
-	/**
-	 * @return string Requested room identifier.
-	 */
-	private function getRoom()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz');
-		$room = $this->OrtModel->load($ortKurzbz);
-		if (isError($room))
-			show_error(getError($room), 500);
-		if (!hasData($room))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		return $ortKurzbz;
-	}
-
-	/**
-	 * @return array Requested Lehrverband filters.
-	 */
-	private function getVerbandFilters()
-	{
-		$stgKz = $this->getInteger('stg_kz', true);
-		$semester = $this->getInteger('sem', false, true);
-		$verband = $this->getOptionalFilter('ver');
-		$gruppe = $this->getOptionalFilter('grp');
-
-		$this->StudiengangModel->addSelect('studiengang_kz');
-		$studiengang = $this->StudiengangModel->load($stgKz);
-		if (isError($studiengang))
-			show_error(getError($studiengang), 500);
-		if (!hasData($studiengang))
-			show_error('Ungueltiger Parameter: stg_kz', 400);
-
-		return array(
-			'stg_kz' => $stgKz,
-			'sem' => $semester,
-			'ver' => $verband,
-			'grp' => $gruppe
-		);
-	}
-
-	private function getInteger($name, $signed, $optional = false)
-	{
-		$value = $this->input->get($name, true);
-		if ($optional && ($value === null || $value === ''))
-			return null;
-
-		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
-		if (!is_string($value) || !preg_match($pattern, $value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$integer = filter_var($value, FILTER_VALIDATE_INT);
-		if ($integer === false || (!$signed && $integer < 0))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $integer;
-	}
-
-	private function getOptionalFilter($name)
-	{
-		$value = $this->input->get($name, true);
-		if ($value === null || $value === '' || $value === '0')
-			return null;
-		if (!is_string($value)
-			|| !check_utf8($value)
-			|| mb_strlen($value) > 20
-			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
-		{
-			show_error('Ungueltiger Parameter: '.$name, 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Validates and expands the requested range to complete weeks.
-	 *
-	 * @return array{0: int, 1: int} Begin and end timestamps.
-	 */
-	private function getDateRange()
-	{
-		$begin = $this->getTimestamp('begin');
-		$ende = $this->getTimestamp('ende');
-
-		if ($ende < $begin)
-			show_error('Ungueltiger Datumsbereich', 400);
-
-		if ($ende - $begin > self::MAX_DATE_RANGE)
-			show_error('Datumsbereich zu gross', 400);
-
-		$begin = strtotime('monday this week', $begin);
-		$ende = strtotime('sunday this week', $ende);
-
-		return array($begin, $ende);
-	}
-
-	/**
-	 * Builds the Excel download filename.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @return string Filename.
-	 */
-	private function getFilename($begin, $ende)
-	{
-		$studiensemester = $this->getStudiensemester($begin, $ende);
-
-		$filename = $this->p->t('global', 'termine');
-		if ($studiensemester !== null)
-			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
-		$filename .= '-'.date('Ymd').'.xls';
-
-		return $filename;
-	}
-
-	/**
-	 * Gets the study semester covered by the requested date range.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @return object|null Study semester, if one overlaps the range.
-	 */
-	private function getStudiensemester($begin, $ende)
-	{
-		$semesterRange = $this->StudiensemesterModel->getByDateRange(
-			date('Y-m-d', $begin),
-			date('Y-m-d', $ende)
-		);
-
-		if (isError($semesterRange) || !hasData($semesterRange))
-			return null;
-
-		$studiensemester = current(getData($semesterRange));
-
-		return $studiensemester;
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @return int Unix timestamp.
-	 */
-	private function getTimestamp($name)
-	{
-		$value = $this->input->get($name, true);
-
-		if (!is_string($value) || !ctype_digit($value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$timestamp = filter_var(
-			$value,
-			FILTER_VALIDATE_INT,
-			array('options' => array('min_range' => 0))
-		);
-
-		if ($timestamp === false)
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $timestamp;
-	}
-
-	/**
-	 * Ensures access to another user's timetable is explicitly permitted.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function authorizeUid($uid)
-	{
-		if ($uid !== getAuthUID()
-			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
-		{
-			show_error('Forbidden', 403);
-		}
-	}
-
-	/**
-	 * Ensures the requested user exists.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function validateUid($uid)
-	{
-		$this->BenutzerModel->addSelect('uid');
-		$user = $this->BenutzerModel->load(array($uid));
-
-		if (isError($user))
-			show_error(getError($user), 500);
-
-		if (!hasData($user))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-	}
-}

application/controllers/LvPlanHTMLDetail.php

@@ -1,333 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanHTMLDetail extends Auth_Controller
-{
-	const TIMEZONE = 'Europe/Vienna';
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct(array(
-			'index' => array('basis/cis:r')
-		));
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->loadPhrases(array(
-			'global' => array('termine'),
-			'ui' => array('organisierende', 'teilnehmende')
-		));
-	}
-
-	/**
-	 * Serves details for one hour in the HTML timetable preview.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$type = $this->getType();
-		$datum = $this->getDate();
-		$hour = $this->getHour();
-
-		if ($type === 'verband')
-			$filters = $this->getVerbandFilters();
-		elseif ($type === 'ort')
-			$filters = $this->getRoomFilters();
-		else
-			$filters = $this->getPersonalFilters();
-
-		$this->load->library('LvPlanHTMLDetailLib');
-		$content = $this->lvplanhtmldetaillib->getContent(
-			$datum,
-			$hour,
-			$type,
-			$filters
-		);
-
-		$this->output
-			->set_content_type('text/html', 'UTF-8')
-			->set_header('X-Content-Type-Options: nosniff')
-			->set_output($content);
-	}
-
-	/**
-	 * @return string Requested timetable type.
-	 */
-	private function getType()
-	{
-		$type = $this->input->get('type', true);
-
-		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
-			show_error('Ungueltiger Parameter: type', 400);
-
-		return $type;
-	}
-
-	/**
-	 * @return string Date in YYYY-MM-DD format.
-	 */
-	private function getDate()
-	{
-		$value = $this->input->get('datum', true);
-		if (!is_string($value) || !preg_match('/^\d{4}-\d{2}-\d{2}$/', $value))
-			show_error('Ungueltiger Parameter: datum', 400);
-
-		$date = DateTime::createFromFormat(
-			'!Y-m-d',
-			$value,
-			new DateTimeZone(self::TIMEZONE)
-		);
-		$errors = DateTime::getLastErrors();
-		if ($date === false
-			|| ($errors !== false
-				&& ($errors['warning_count'] > 0 || $errors['error_count'] > 0))
-			|| $date->format('Y-m-d') !== $value)
-		{
-			show_error('Ungueltiger Parameter: datum', 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @return array Selected timetable hour.
-	 */
-	private function getHour()
-	{
-		$number = $this->getInteger('stunde', false);
-		$this->StundeModel->addSelect('stunde, beginn, ende');
-		$result = $this->StundeModel->load($number);
-
-		if (isError($result))
-			show_error(getError($result), 500);
-		if (!hasData($result))
-			show_error('Ungueltiger Parameter: stunde', 400);
-
-		$hours = getData($result);
-		$hour = reset($hours);
-		$begin = isset($hour->beginn) ? (string)$hour->beginn : '';
-		$end = isset($hour->ende) ? (string)$hour->ende : '';
-		$beginSeconds = $this->timeToSeconds($begin);
-		$endSeconds = $this->timeToSeconds($end);
-
-		if ($beginSeconds === null || $endSeconds === null || $endSeconds <= $beginSeconds)
-			show_error('Ungueltiges Stundenraster', 500);
-
-		return array(
-			'number' => (string)$hour->stunde,
-			'begin' => $begin,
-			'end' => $end
-		);
-	}
-
-	/**
-	 * @return array Personal timetable filters.
-	 */
-	private function getPersonalFilters()
-	{
-		$uid = $this->input->get('pers_uid', true);
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		if ($uid !== getAuthUID()
-			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
-		{
-			show_error('Forbidden', 403);
-		}
-
-		$this->BenutzerModel->addSelect(
-			'tbl_benutzer.uid, tbl_person.titelpre, tbl_person.vorname, '
-			.'tbl_person.nachname, tbl_person.titelpost'
-		);
-		$this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
-		$result = $this->BenutzerModel->load(array($uid));
-
-		if (isError($result))
-			show_error(getError($result), 500);
-		if (!hasData($result))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		$users = getData($result);
-		$user = reset($users);
-		$nameParts = array();
-		foreach (array('titelpre', 'vorname', 'nachname', 'titelpost') as $property)
-		{
-			if (isset($user->{$property}) && trim($user->{$property}) !== '')
-				$nameParts[] = trim($user->{$property});
-		}
-
-		return array(
-			'uid' => $uid,
-			'full_name' => implode(' ', $nameParts)
-		);
-	}
-
-	/**
-	 * @return array Room timetable filters.
-	 */
-	private function getRoomFilters()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz, bezeichnung, content_id');
-		$result = $this->OrtModel->load($ortKurzbz);
-
-		if (isError($result))
-			show_error(getError($result), 500);
-		if (!hasData($result))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$rooms = getData($result);
-		$room = reset($rooms);
-
-		return array(
-			'ort_kurzbz' => $ortKurzbz,
-			'bezeichnung' => isset($room->bezeichnung) ? $room->bezeichnung : '',
-			'content_id' => isset($room->content_id) ? $room->content_id : null
-		);
-	}
-
-	/**
-	 * @return array Lehrverband timetable filters.
-	 */
-	private function getVerbandFilters()
-	{
-		$stgKz = $this->getInteger('stg_kz', true);
-		$semester = $this->getInteger('sem', false, true);
-		$verband = $this->getOptionalFilter('ver');
-		$gruppe = $this->getOptionalFilter('grp');
-		$ortKurzbz = $this->getOptionalRoomFilter();
-
-		$this->StudiengangModel->addSelect(
-			'studiengang_kz, UPPER(typ || kurzbz) AS stg_kurzbz'
-		);
-		$result = $this->StudiengangModel->load($stgKz);
-
-		if (isError($result))
-			show_error(getError($result), 500);
-		if (!hasData($result))
-			show_error('Ungueltiger Parameter: stg_kz', 400);
-
-		$programs = getData($result);
-		$program = reset($programs);
-
-		return array(
-			'stg_kz' => $stgKz,
-			'stg_kurzbz' => isset($program->stg_kurzbz)
-				? $program->stg_kurzbz
-				: '',
-			'sem' => $semester,
-			'ver' => $verband,
-			'grp' => $gruppe,
-			'ort_kurzbz' => $ortKurzbz
-		);
-	}
-
-	/**
-	 * Returns the room selected in a Verband preview cell, if present.
-	 *
-	 * @return string|null
-	 */
-	private function getOptionalRoomFilter()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if ($ortKurzbz === null || $ortKurzbz === '')
-			return null;
-		if (!is_string($ortKurzbz) || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz');
-		$result = $this->OrtModel->load($ortKurzbz);
-
-		if (isError($result))
-			show_error(getError($result), 500);
-		if (!hasData($result))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		return $ortKurzbz;
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @param bool $signed Whether negative values are allowed.
-	 * @param bool $optional Whether the parameter may be omitted or empty.
-	 * @return int|null
-	 */
-	private function getInteger($name, $signed, $optional = false)
-	{
-		$value = $this->input->get($name, true);
-		if ($optional && ($value === null || $value === ''))
-			return null;
-
-		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
-		if (!is_string($value) || !preg_match($pattern, $value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$isNegative = $signed && substr($value, 0, 1) === '-';
-		$digits = $isNegative ? substr($value, 1) : $value;
-		$digits = ltrim($digits, '0');
-		if ($digits === '')
-			$digits = '0';
-		$normalizedValue = $isNegative && $digits !== '0' ? '-'.$digits : $digits;
-
-		$integer = filter_var($normalizedValue, FILTER_VALIDATE_INT);
-		if ($integer === false || (!$signed && $integer < 0))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $integer;
-	}
-
-	/**
-	 * Returns null for the legacy wildcard values "" and "0".
-	 *
-	 * @param string $name GET parameter name.
-	 * @return string|null
-	 */
-	private function getOptionalFilter($name)
-	{
-		$value = $this->input->get($name, true);
-		if ($value === null || $value === '' || $value === '0')
-			return null;
-
-		if (!is_string($value)
-			|| !check_utf8($value)
-			|| mb_strlen($value) > 20
-			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
-		{
-			show_error('Ungueltiger Parameter: '.$name, 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @param string $time PostgreSQL time value.
-	 * @return int|null
-	 */
-	private function timeToSeconds($time)
-	{
-		if (!preg_match('/^(\d{1,2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?$/', $time, $matches))
-			return null;
-
-		$hours = (int)$matches[1];
-		$minutes = (int)$matches[2];
-		$seconds = isset($matches[3]) ? (int)$matches[3] : 0;
-
-		if ($hours > 23 || $minutes > 59 || $seconds > 59)
-			return null;
-
-		return $hours * 3600 + $minutes * 60 + $seconds;
-	}
-}

application/controllers/LvPlanHTMLPreview.php

@@ -1,356 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanHTMLPreview extends Auth_Controller
-{
-	const MAX_DATE_RANGE = 34560000; // 400 days
-	const DEFAULT_RESERVATION_MIN_DAYS = 1;
-	const DEFAULT_RESERVATION_END_DATE = '2099-01-01';
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->loadPhrases(
-			array(
-				'lvplan' => array(
-					'room_not_reservable',
-					'room_reservation_restricted_to_period'
-				)
-			)
-		);
-	}
-
-	/**
-	 * Serves an authenticated, printable timetable preview.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$type = $this->getType();
-		list($begin, $ende) = $this->getDateRange();
-		if ($type === 'verband')
-			$filters = $this->getVerbandFilters();
-		elseif ($type === 'ort')
-			$filters = $this->getRoomFilters();
-		else
-			$filters = $this->getPersonalFilters($type);
-
-		$this->load->library('LvPlanHTMLLib');
-		$content = $this->lvplanhtmllib->getContent(
-			$begin,
-			$ende,
-			$type,
-			$filters
-		);
-
-		$this->output
-			->set_content_type('text/html', 'UTF-8')
-			->set_header('X-Content-Type-Options: nosniff')
-			->set_output($content);
-	}
-
-	/**
-	 * @return string Requested timetable type.
-	 */
-	private function getType()
-	{
-		$type = $this->input->get('type', true);
-
-		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
-			show_error('Ungueltiger Parameter: type', 400);
-
-		return $type;
-	}
-
-	/**
-	 * @return array Personal preview filters.
-	 */
-	private function getPersonalFilters($type)
-	{
-		// Legacy wochenplan calendar links include empty Lehrverband parameters
-		// for personal plans. They are irrelevant when type is student or lektor.
-		if ($this->hasVerbandParameters())
-			show_error('Ungueltige Parameterkombination', 400);
-
-		$uid = $this->input->get('pers_uid', true);
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		if ($uid !== getAuthUID()
-			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
-		{
-			show_error('Forbidden', 403);
-		}
-
-		$this->BenutzerModel->addSelect(
-			'tbl_benutzer.uid, tbl_person.titelpre, tbl_person.vorname, '
-			.'tbl_person.nachname, tbl_person.titelpost'
-		);
-		$this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
-		$user = $this->BenutzerModel->load(array($uid));
-
-		if (isError($user))
-			show_error(getError($user), 500);
-		if (!hasData($user))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-		$users = getData($user);
-		$userData = reset($users);
-		$nameParts = array();
-		foreach (array('titelpre', 'vorname', 'nachname', 'titelpost') as $property)
-		{
-			if (isset($userData->{$property}) && trim($userData->{$property}) !== '')
-				$nameParts[] = trim($userData->{$property});
-		}
-
-		$filters = array(
-			'uid' => $uid,
-			'full_name' => implode(' ', $nameParts)
-		);
-
-		if ($type === 'student')
-		{
-			$this->StudentModel->addSelect(
-				'studiengang_kz, semester, verband, gruppe'
-			);
-			$student = $this->StudentModel->load(array($uid));
-
-			if (isError($student))
-				show_error(getError($student), 500);
-			if (!hasData($student))
-				show_error('Ungueltiger Parameter: pers_uid', 400);
-
-			$students = getData($student);
-			$studentData = reset($students);
-			$filters['stg_kz'] = $studentData->studiengang_kz;
-			$filters['sem'] = $studentData->semester;
-			$filters['ver'] = $studentData->verband;
-			$filters['grp'] = $studentData->gruppe;
-		}
-
-		return $filters;
-	}
-
-	/**
-	 * Legacy room links also carry pers_uid, but the UID does not filter or
-	 * authorize a room plan. Only ort_kurzbz identifies the requested plan.
-	 *
-	 * @return array Room preview filters.
-	 */
-	private function getRoomFilters()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz, bezeichnung, reservieren');
-		$room = $this->OrtModel->load($ortKurzbz);
-
-		if (isError($room))
-			show_error(getError($room), 500);
-		if (!hasData($room))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$rooms = getData($room);
-		$roomData = reset($rooms);
-		$reservationMinDays = defined('RES_TAGE_LEKTOR_MIN')
-			? (int)constant('RES_TAGE_LEKTOR_MIN')
-			: self::DEFAULT_RESERVATION_MIN_DAYS;
-		$reservationEndDate = defined('RES_TAGE_LEKTOR_BIS')
-			? constant('RES_TAGE_LEKTOR_BIS')
-			: self::DEFAULT_RESERVATION_END_DATE;
-		$reservationStart = jump_day(
-			time(),
-			$reservationMinDays - 1
-		);
-		$reservationEnd = strtotime($reservationEndDate);
-
-		return array(
-			'ort_kurzbz' => $ortKurzbz,
-			'bezeichnung' => isset($roomData->bezeichnung) ? $roomData->bezeichnung : '',
-			'room_reservable' => isset($roomData->reservieren)
-				&& $roomData->reservieren === true,
-			'room_reservation_permitted' => $this->permissionlib->isBerechtigt(
-				'lehre/reservierung:begrenzt',
-				'sui'
-			),
-			'room_reservation_start' => $reservationStart,
-			'room_reservation_end' => $reservationEnd,
-			'room_not_reservable_message' => $this->p->t(
-				'lvplan',
-				'room_not_reservable'
-			),
-			'room_reservation_restricted_message' => $this->p->t(
-				'lvplan',
-				'room_reservation_restricted_to_period',
-				array(
-					'start_date' => date('d.m.Y', $reservationStart),
-					'end_date' => date('d.m.Y', $reservationEnd)
-				)
-			)
-		);
-	}
-
-	/**
-	 * @return array Lehrverband preview filters.
-	 */
-	private function getVerbandFilters()
-	{
-		// Legacy wochenplan links always carry pers_uid. It does not filter or
-		// authorize a Lehrverband plan and is intentionally ignored here.
-		$stgKz = $this->getInteger('stg_kz', true);
-		$semester = $this->getInteger('sem', false, true);
-		$verband = $this->getOptionalFilter('ver');
-		$gruppe = $this->getOptionalFilter('grp');
-
-		$this->StudiengangModel->addSelect(
-			'studiengang_kz, UPPER(typ || kurzbz) AS stg_kurzbz'
-		);
-		$studiengang = $this->StudiengangModel->load($stgKz);
-
-		if (isError($studiengang))
-			show_error(getError($studiengang), 500);
-		if (!hasData($studiengang))
-			show_error('Ungueltiger Parameter: stg_kz', 400);
-		$studiengaenge = getData($studiengang);
-		$studiengangData = reset($studiengaenge);
-
-		return array(
-			'stg_kz' => $stgKz,
-			'stg_kurzbz' => isset($studiengangData->stg_kurzbz)
-				? $studiengangData->stg_kurzbz
-				: '',
-			'sem' => $semester,
-			'ver' => $verband,
-			'grp' => $gruppe
-		);
-	}
-
-	/**
-	 * @return bool Whether any non-empty Lehrverband-only parameters were supplied.
-	 */
-	private function hasVerbandParameters()
-	{
-		foreach (array('stg_kz', 'sem', 'ver', 'grp') as $name)
-		{
-			$value = $this->input->get($name, true);
-			if ($value !== null && $value !== '')
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @param bool $signed Whether negative values are allowed.
-	 * @param bool $optional Whether the parameter may be omitted or empty.
-	 * @return int|null
-	 */
-	private function getInteger($name, $signed, $optional = false)
-	{
-		$value = $this->input->get($name, true);
-		if ($optional && ($value === null || $value === ''))
-			return null;
-
-		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
-
-		if (!is_string($value) || !preg_match($pattern, $value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$isNegative = $signed && substr($value, 0, 1) === '-';
-		$digits = $isNegative ? substr($value, 1) : $value;
-		$digits = ltrim($digits, '0');
-		if ($digits === '')
-			$digits = '0';
-		$normalizedValue = $isNegative && $digits !== '0' ? '-'.$digits : $digits;
-
-		$integer = filter_var($normalizedValue, FILTER_VALIDATE_INT);
-		if ($integer === false || (!$signed && $integer < 0))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $integer;
-	}
-
-	/**
-	 * Returns null for the legacy wildcard values "" and "0".
-	 *
-	 * @param string $name GET parameter name.
-	 * @return string|null
-	 */
-	private function getOptionalFilter($name)
-	{
-		$value = $this->input->get($name, true);
-
-		if ($value === null || $value === '' || $value === '0')
-			return null;
-
-		if (!is_string($value)
-			|| !check_utf8($value)
-			|| mb_strlen($value) > 20
-			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
-		{
-			show_error('Ungueltiger Parameter: '.$name, 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Validates and expands the requested range to complete weeks.
-	 *
-	 * @return array{0: int, 1: int} Begin and end timestamps.
-	 */
-	private function getDateRange()
-	{
-		$begin = $this->getTimestamp('begin');
-		$ende = $this->getTimestamp('ende');
-
-		if ($ende < $begin)
-			show_error('Ungueltiger Datumsbereich', 400);
-		if ($ende - $begin > self::MAX_DATE_RANGE)
-			show_error('Datumsbereich zu gross', 400);
-
-		$begin = strtotime('monday this week', $begin);
-		$ende = strtotime('sunday this week', $ende);
-
-		return array($begin, $ende);
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @return int Unix timestamp.
-	 */
-	private function getTimestamp($name)
-	{
-		$value = $this->input->get($name, true);
-
-		if (!is_string($value) || !ctype_digit($value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$timestamp = filter_var(
-			$value,
-			FILTER_VALIDATE_INT,
-			array('options' => array('min_range' => 0))
-		);
-
-		if ($timestamp === false)
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $timestamp;
-	}
-}

application/controllers/LvPlanICALDownload.php

@@ -1,308 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanICALDownload extends Auth_Controller
-{
-	const MAX_DATE_RANGE = 34560000; // 400 days
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('ressource/Ort_model', 'OrtModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->loadPhrases(array('global', 'lehre', 'ui'));
-	}
-
-	/**
-	 * Serves an authenticated iCalendar file download.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$type = $this->getType();
-		$uid = getAuthUID();
-		$ortKurzbz = null;
-		$verbandFilters = null;
-		if ($type === 'ort')
-			$ortKurzbz = $this->getRoom();
-		elseif ($type === 'verband')
-			$verbandFilters = $this->getVerbandFilters();
-		else
-		{
-			$uid = $this->getUid();
-			$this->authorizeUid($uid);
-			$this->validateUid($uid);
-		}
-		$version = $this->getVersion();
-		list($begin, $ende) = $this->getDateRange();
-
-		$this->load->library('LvPlanICALLib');
-		$content = $this->lvplanicallib->getContent(
-			$uid,
-			$begin,
-			$ende,
-			$type,
-			$version,
-			$ortKurzbz,
-			$verbandFilters
-		);
-
-		$filename = $this->getFilename($begin, $ende, $version);
-
-		$this->output
-			->set_content_type('text/calendar', 'UTF-8')
-			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
-			->set_header('Pragma: public')
-			->set_header('Expires: 0')
-			->set_output($content);
-	}
-
-	/**
-	 * @return string Requested timetable type.
-	 */
-	private function getType()
-	{
-		$type = $this->input->get('type', true);
-
-		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			show_error('Ungueltiger Parameter: type', 400);
-
-		return $type;
-	}
-
-	/**
-	 * @return string Requested user UID.
-	 */
-	private function getUid()
-	{
-		$uid = $this->input->get('pers_uid', true);
-
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-
-		return $uid;
-	}
-
-	/**
-	 * @return string Requested room identifier.
-	 */
-	private function getRoom()
-	{
-		$ortKurzbz = $this->input->get('ort_kurzbz', true);
-		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		$this->OrtModel->addSelect('ort_kurzbz');
-		$room = $this->OrtModel->load($ortKurzbz);
-		if (isError($room))
-			show_error(getError($room), 500);
-		if (!hasData($room))
-			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
-
-		return $ortKurzbz;
-	}
-
-	/**
-	 * @return array Requested Lehrverband filters.
-	 */
-	private function getVerbandFilters()
-	{
-		$stgKz = $this->getInteger('stg_kz', true);
-		$semester = $this->getInteger('sem', false, true);
-		$verband = $this->getOptionalFilter('ver');
-		$gruppe = $this->getOptionalFilter('grp');
-
-		$this->StudiengangModel->addSelect('studiengang_kz');
-		$studiengang = $this->StudiengangModel->load($stgKz);
-		if (isError($studiengang))
-			show_error(getError($studiengang), 500);
-		if (!hasData($studiengang))
-			show_error('Ungueltiger Parameter: stg_kz', 400);
-
-		return array(
-			'stg_kz' => $stgKz,
-			'sem' => $semester,
-			'ver' => $verband,
-			'grp' => $gruppe
-		);
-	}
-
-	private function getInteger($name, $signed, $optional = false)
-	{
-		$value = $this->input->get($name, true);
-		if ($optional && ($value === null || $value === ''))
-			return null;
-
-		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
-		if (!is_string($value) || !preg_match($pattern, $value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$integer = filter_var($value, FILTER_VALIDATE_INT);
-		if ($integer === false || (!$signed && $integer < 0))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $integer;
-	}
-
-	private function getOptionalFilter($name)
-	{
-		$value = $this->input->get($name, true);
-		if ($value === null || $value === '' || $value === '0')
-			return null;
-		if (!is_string($value)
-			|| !check_utf8($value)
-			|| mb_strlen($value) > 20
-			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
-		{
-			show_error('Ungueltiger Parameter: '.$name, 400);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @return int Requested iCalendar major version.
-	 */
-	private function getVersion()
-	{
-		$version = $this->input->get('version', true);
-
-		if (!in_array($version, array('1', '2'), true))
-			show_error('Ungueltiger Parameter: version', 400);
-
-		return (int)$version;
-	}
-
-	/**
-	 * Validates and expands the requested range to complete weeks.
-	 *
-	 * @return array{0: int, 1: int} Begin and end timestamps.
-	 */
-	private function getDateRange()
-	{
-		$begin = $this->getTimestamp('begin');
-		$ende = $this->getTimestamp('ende');
-
-		if ($ende < $begin)
-			show_error('Ungueltiger Datumsbereich', 400);
-
-		if ($ende - $begin > self::MAX_DATE_RANGE)
-			show_error('Datumsbereich zu gross', 400);
-
-		$begin = strtotime('monday this week', $begin);
-		$ende = strtotime('sunday this week', $ende);
-
-		return array($begin, $ende);
-	}
-
-	/**
-	 * Builds the iCalendar download filename.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @param int $version iCalendar major version.
-	 * @return string Filename.
-	 */
-	private function getFilename($begin, $ende, $version)
-	{
-		$studiensemester = $this->getStudiensemester($begin, $ende);
-
-		$filename = $this->p->t('global', 'termine');
-		if ($studiensemester !== null)
-			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
-		$filename .= '-'.date('Ymd').'_ical'.$version.'.ics';
-
-		return $filename;
-	}
-
-	/**
-	 * Gets the study semester covered by the requested date range.
-	 *
-	 * @param int $begin Range start timestamp.
-	 * @param int $ende Range end timestamp.
-	 * @return object|null Study semester, if one overlaps the range.
-	 */
-	private function getStudiensemester($begin, $ende)
-	{
-		$semesterRange = $this->StudiensemesterModel->getByDateRange(
-			date('Y-m-d', $begin),
-			date('Y-m-d', $ende)
-		);
-
-		if (isError($semesterRange) || !hasData($semesterRange))
-			return null;
-
-		$studiensemester = current(getData($semesterRange));
-
-		return $studiensemester;
-	}
-
-	/**
-	 * @param string $name GET parameter name.
-	 * @return int Unix timestamp.
-	 */
-	private function getTimestamp($name)
-	{
-		$value = $this->input->get($name, true);
-
-		if (!is_string($value) || !ctype_digit($value))
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		$timestamp = filter_var(
-			$value,
-			FILTER_VALIDATE_INT,
-			array('options' => array('min_range' => 0))
-		);
-
-		if ($timestamp === false)
-			show_error('Ungueltiger Parameter: '.$name, 400);
-
-		return $timestamp;
-	}
-
-	/**
-	 * Ensures access to another user's timetable is explicitly permitted.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function authorizeUid($uid)
-	{
-		if ($uid !== getAuthUID()
-			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
-		{
-			show_error('Forbidden', 403);
-		}
-	}
-
-	/**
-	 * Ensures the requested user exists.
-	 *
-	 * @param string $uid Requested user UID.
-	 * @return void
-	 */
-	private function validateUid($uid)
-	{
-		$this->BenutzerModel->addSelect('uid');
-		$user = $this->BenutzerModel->load(array($uid));
-
-		if (isError($user))
-			show_error(getError($user), 500);
-
-		if (!hasData($user))
-			show_error('Ungueltiger Parameter: pers_uid', 400);
-	}
-}

application/controllers/LvPlanICALSubscription.php

@@ -1,167 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-
-class LvPlanICALSubscription extends FHC_Controller
-{
-	/**
-	 * Encrypted calendar subscription token.
-	 *
-	 * @var string|null
-	 */
-	private $cal;
-
-	/**
-	 * UID authenticated by the calendar subscription token.
-	 *
-	 * @var string
-	 */
-	private $uid;
-
-	/**
-	 * First date included in the subscription feed.
-	 *
-	 * @var int Unix timestamp at local midnight
-	 */
-	private $begin;
-
-	/**
-	 * Last date included in the subscription feed.
-	 *
-	 * @var int Unix timestamp at local midnight
-	 */
-	private $ende;
-
-	/**
-	 * Object initialization.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->cal = $this->input->get('cal', true);
-		$this->uid = $this->authenticateSubscription($this->cal);
-
-		list($this->begin, $this->ende) = $this->determineDateRange();
-	}
-
-	/**
-	 * Serves the iCalendar subscription feed.
-	 *
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->library('LvPlanICALLib');
-
-		$content = $this->lvplanicallib->getContent(
-			$this->uid,
-			$this->begin,
-			$this->ende,
-			null,
-			2,
-			null,
-			null,
-			'FH-Kalender'
-		);
-
-		$filename = 'FH-Kalender_'.date('m_Y', $this->begin).'_ical.ics';
-
-		$this->output
-			->set_content_type('text/calendar', 'UTF-8')
-			->set_header('Content-Disposition: inline; filename="'.$filename.'"')
-			->set_header('Pragma: public')
-			->set_header('Expires: 0')
-			->set_output($content);
-	}
-
-	/**
-	 * Authenticates an encrypted calendar subscription token.
-	 *
-	 * @param string|null $cal Encrypted UID from the subscription URL.
-	 * @return string Authenticated UID.
-	 */
-	private function authenticateSubscription($cal)
-	{
-		if (isEmptyString($cal))
-			show_error('Fehlerhafter Parameter', 400);
-
-		if (!defined('LVPLAN_CYPHER_KEY'))
-			show_error('LVPLAN_CYPHER_KEY is not configured', 500);
-
-		$uid = decryptData($cal, constant('LVPLAN_CYPHER_KEY'));
-
-		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
-			show_error('Fehlerhafter Parameter', 400);
-
-		$this->BenutzerModel->addSelect('uid');
-		$user = $this->BenutzerModel->load([$uid]);
-
-		if (isError($user))
-			show_error(getError($user), 500);
-
-		if (!hasData($user))
-			show_error('Ungueltiger Benutzername', 401);
-
-		return $uid;
-	}
-
-	/**
-	 * Determines the subscription range from the current or next semester.
-	 *
-	 * During the final 30 days of the selected semester, the range is
-	 * extended through the following semester. The resulting range is
-	 * expanded to complete Monday-to-Sunday weeks.
-	 *
-	 * @return array{0: int, 1: int} Begin and end timestamps.
-	 */
-	private function determineDateRange()
-	{
-		$semesterResult = $this->StudiensemesterModel->getAkt();
-
-		if (isError($semesterResult))
-			show_error(getError($semesterResult), 500);
-
-		if (!hasData($semesterResult))
-		{
-			$semesterResult = $this->StudiensemesterModel->getNext();
-
-			if (isError($semesterResult))
-				show_error(getError($semesterResult), 500);
-		}
-
-		if (!hasData($semesterResult))
-			show_error('Studiensemester konnte nicht gefunden werden', 500);
-
-		$semester = current(getData($semesterResult));
-		$begin = strtotime($semester->start);
-		$ende = strtotime($semester->ende);
-
-		$semesterEnd = new DateTime($semester->ende);
-		$daysFromSemesterEnd = (int)$semesterEnd
-			->diff(new DateTime())
-			->format('%R%a');
-
-		if ($daysFromSemesterEnd >= -30)
-		{
-			$nextSemesterResult = $this->StudiensemesterModel
-				->getNextFrom($semester->studiensemester_kurzbz);
-
-			if (isError($nextSemesterResult))
-				show_error(getError($nextSemesterResult), 500);
-
-			if (hasData($nextSemesterResult))
-				$ende = strtotime(current(getData($nextSemesterResult))->ende);
-		}
- 
-		$begin = strtotime('monday this week', $begin);
-		$ende = strtotime('sunday this week', $ende);
-		return [$begin, $ende];
-	}
-}

application/controllers/Tempus.php

@@ -1,40 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Tempus extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin')
-			],
-			'variables' => [
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			]
-		]);
-	}
-}

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,95 +31,28 @@ class CisMenu extends FHCAPI_Controller
 			'getMenu' => self::PERM_LOGGED,
 		]);
 
-
+		
 
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	/**
+    /**
 	 * fetches the menu for CIS from the database based on the userLanguage
 	 */
-	public function getMenu()
+    public function getMenu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
 		$this->load->config('cis');
-		$cis4_content_id = $this->config->item('cis_menu_root_content_id');
-		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(), getUserLanguage());
+		$cis4_content_id =$this->config->item('cis_menu_root_content_id');
+		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
 		$result = $this->getDataOrTerminateWithError($result);
 		$menu = $result->childs ?? [];
-
-		$menu = $this->generateUrlsForMenuItems($menu);
 		$this->terminateWithSuccess($menu);
-	}
-
-	private function generateUrlsForMenuItems($menuItems)
-	{
-		return array_map(
-			function ($menuItem) {
-				return $this->generateUrlForMenuItem($menuItem);
-			},
-			$menuItems
-		);
-	}
-
-	private function generateUrlForMenuItem($menuItem)
-	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
-
-		if ($menuItem->childs && count($menuItem->childs)) {
-			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
-		}
-
-		return $menuItem;
-	}
-
-	private function menuItemUrlHelper($menuItem)
-	{
-		if ($menuItem->template_kurzbz !== 'redirect') {
-			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
-		}
-
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		if (!$urlElem) {
-			return '';
-		}
-
-		$url = $urlElem->textContent;
-
-		if (strpos($url, '../cms/news.php') !== false) {
-			$newsRegex = '/^\.\.\/cms\/news\.php/';
-			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
-		}
-
-		if (strpos($url, '../cms/content.php?') !== false) {
-			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
-			$matches = [];
-			preg_match($contentRegex, $url, $matches);
-			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
-		}
-
-		if (strpos($url, '../index.ci.php') !== false) {
-			$indexRegex = '/^\.\.\/index\.ci\.php/';
-			$url = preg_replace($indexRegex, site_url(), $url);
-		}
-
-		if (strpos($url, '../') !== false) {
-			$relativeRegex = '/^\.\.\//';
-			$url = preg_replace($relativeRegex, base_url(), $url);
-		}
-
-		return $url;
-	}
+    }
 
+	
+	
 }
 

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

@@ -208,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -220,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -250,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -334,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

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/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,25 +33,19 @@ class LvPlan extends FHCAPI_Controller
 
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
-			'Stunden' => self::PERM_LOGGED,
-			'getReservierungen' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED,
+            'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'eventsPersonal' => self::PERM_LOGGED,
 			'eventsLv' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'eventsStgOrg' => self::PERM_LOGGED,
-			'fetchFerienEvents' => self::PERM_LOGGED,
-			'getStudiengaenge' => self::PERM_LOGGED,
-			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
-			'compactibleEventTypes' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);
 
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -60,17 +53,17 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));
 
-		$this->load->library('form_validation');
+        $this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-	 * fetches LvPlan and Moodle events together
-	 * @access public
-	 *
-	 */
+     * fetches LvPlan and Moodle events together
+     * @access public
+     *
+     */
 	public function LvPlanEvents()
 	{
 		$hasLv = $this->input->post('lv_id');
@@ -90,30 +83,24 @@ class LvPlan extends FHCAPI_Controller
 		// form validation
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's events if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
 
 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
-
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -122,45 +109,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
-	/**
-	 * fetches LvPlan for studiengang / semester / verband / gruppe
-	 *
-	 * @access public
-	 */
-	public function eventsStgOrg()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-			$stgOrgEvents = [];
-			$ferienEvents = [];
-		} else {
-			$start_date = $this->input->post('start_date', true);
-			$end_date = $this->input->post('end_date', true);
-			$stg_kz = $this->input->post('stg_kz', true);
-			$sem = $this->input->post('sem', true);
-			$verband = $this->input->post('verband', true);
-			$gruppe = $this->input->post('gruppe', true);
-
-			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
-			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
-			$ferienEvents = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess(array_merge(
-			$stgOrgEvents,
-			$ferienEvents
-		));
-	}
-
 	/**
 	 * fetches LvPlan and Ferien events together for the lv
 	 *
@@ -174,7 +122,7 @@ class LvPlan extends FHCAPI_Controller
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
 		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -189,6 +137,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -197,42 +146,40 @@ class LvPlan extends FHCAPI_Controller
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
-		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
+	public function studiensemesterDateInterval($date){
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
+		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}
 
-	public function getLvPlanForStudiensemester($studiensemester, $lvid)
-	{
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
 		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'), date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
-
+		
 	}
+		
 
-
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function Stunden()
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     *
+     */
+    public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
 		$this->StundeModel->addOrder('stunde', 'ASC');
 		$stunden = $this->StundeModel->load();
 
-		$stunden = $this->getDataOrTerminateWithError($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		$this->terminateWithSuccess($stunden);
 	}
@@ -263,10 +210,10 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
 		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
+		
 		$this->terminateWithSuccess($roomplan_data);
 	}
-
+	
 	/**
 	 * gets the reservierungen of a room if the ort_kurzbz parameter is
 	 * supplied otherwise gets the reservierungen of the lvplan of a student
@@ -279,32 +226,25 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's reservierungen if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// get data
 		$this->load->library('StundenplanLib');
 
-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
 
 		$result = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
+	public function getLehreinheitStudiensemester($lehreinheit_id){
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -347,68 +287,6 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current($result));
 	}
 
-	public function getStudiengaenge()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
-	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$where = [
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-		];
-
-		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
-			$where['semester'] = $semester;
-		}
-		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
-			$where['verband'] = $verband;
-		}
-
-		$this->LehrverbandModel->addOrder('studiengang_kz');
-		$this->LehrverbandModel->addOrder('semester');
-		$this->LehrverbandModel->addOrder('verband');
-		$this->LehrverbandModel->addOrder('gruppe');
-		$result = $this->LehrverbandModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Checks if the current user has permission to view other users' timetables
-	 *
-	 * @return void
-	 */
-	public function permissionOtherLvPlan()
-	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
-	}
-
-	/**
-	 * get event types which can be compacted in lv plan display
-	 *
-	 * @return void
-	 */
-	public function compactibleEventTypes()
-	{
-		$this->terminateWithSuccess(["lehreinheit", "reservierung", "ferien", "moodle"]);
-	}
-
 	/**
 	 * fetch moodle events
 	 *
@@ -416,34 +294,30 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
+	private function fetchMoodleEvents($start_date, $end_date)
 	{
-		if ($uid && $uid !== getAuthUID()) {
-			return [];
-		}
-
 		$this->load->config('calendar');
 
 		$tz = new DateTimeZone($this->config->item('timezone'));
-
+		
 		$start = new DateTime($start_date);
 		$start->setTimezone($tz);
-
+		
 		$end = new DateTime($end_date);
 		$end->setTimezone($tz);
 		$end->modify('+1 day -1 second');
-
+		
 		$moodle_events = [];
-
+		
 		Events::trigger(
 			'moodleCalendarEvents',
-			function &() use (&$moodle_events) {
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
 				'start_date' => $start->format('c'),
 				'end_date' => $end->format('c'),
-				'username' => $uid ?? getAuthUID()
+				'username' => getAuthUID()
 			]
 		);
 
@@ -457,23 +331,23 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date, $uid = null)
+	private function fetchFerienEvents($start_date, $end_date)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
 
 		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
+		
 		if ($currentStudiensemester) {
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
 
 			$studiengang = $this->StudentLehrverbandModel->loadWhere([
-				"student_uid" => $uid ?? getAuthUID(),
+				"student_uid" => getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+			
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -483,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }

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

@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-        ]);
-
-        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-        $this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * retrieves viewData for other lv plan view
-     * @access public
-     * @param  $uid the userID for which the other lv plan is being viewed
-     */
-    public function otherLvPlanViewData($uid)
-    {
-        $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-        $isMitarbeiter = getData($isMitarbeiterResult);
-        $isStudent = !$isMitarbeiter;
-
-        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
-        $this->BenutzerModel->addJoin("tbl_person", "person_id");
-        $personResult = $this->BenutzerModel->load([$uid]);
-        $person = hasData($personResult) ? getData($personResult) : null;
-
-        $viewData = [
-            "user_data" => [
-                "username" => $uid,
-                "is_student" => $isStudent,
-                "is_mitarbeiter" => $isMitarbeiter,
-                "foto" => $person[0]->foto,
-                "vorname" => $person[0]->vorname,
-                "nachname" => $person[0]->nachname,
-            ],
-        ];
-
-        $this->terminateWithSuccess($viewData);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-

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/RendererLoader.php

@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller
 
 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-			'GetTempusRenderers' => self::PERM_LOGGED,
+           
 		]);
 
         $this->load->library('LogLib');
@@ -66,26 +66,6 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}
 
-	public function GetTempusRenderers(){
-		$renderer_paths = [];
-		Events::trigger(
-				'loadRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-
-		Events::trigger(
-				'loadTempusRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-		$this->terminateWithSuccess($renderer_paths);
-	}
-
 	
 	
 

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;
 		}))){
@@ -230,8 +216,6 @@ class Studium extends FHCAPI_Controller
 		$studienplaene = array_map(function($studienplan){
 			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
 			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
-			// bezeichnung_mehrsprachig
-			$studienplan->orgform_bezeichnung_english = $orgform->bezeichnung_mehrsprachig[1];
 			return $studienplan;
 		},$studienplaene);
 		return $studienplaene;

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

@@ -1,142 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Board extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'create'				=> 'dashboard/admin:rw',
-			'update'				=> 'dashboard/admin:rw',
-			'delete'				=> 'dashboard/admin:rw'
-		]);
-
-		// Models
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-
-	public function list()
-	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
-		$result = $this->DashboardModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function create()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		
-		$result = $this->DashboardModel->insert([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-
-		$result = $this->DashboardModel->update([
-			'dashboard_id' => $dashboard_id
-		], [
-			'dashboard_kurzbz' => $dashboard_kurzbz,
-			'beschreibung' => $beschreibung
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-
-		$result = $this->DashboardPresetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$result = $this->DashboardWidgetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->DashboardModel->delete($dashboard_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

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

@@ -1,199 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Preset extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'getBatch'				=> 'dashboard/admin:r',
-			'addWidget'				=> 'dashboard/admin:rw',
-			'removeWidget'			=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function list($dashboard_kurzbz)
-	{
-		$sql = "
-			WITH
-			dashboard_presets AS (
-				SELECT
-					*
-				FROM
-					dashboard.tbl_dashboard_preset dp
-				JOIN
-					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
-				WHERE
-					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general AS 	(
-				SELECT
-					'general' AS funktion_kurzbz,
-					'Allgemein' AS beschreibung
-			)
-
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					general f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz IS NULL
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-			)
-			UNION ALL
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					public.tbl_funktion f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-				ORDER BY
-					f.beschreibung ASC
-			)
-		";
-
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		$funktionen = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function getBatch()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$db = $this->input->post('db');
-		$funktionen = $this->input->post('funktionen') ?: [];
-
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->dashboardlib->getPreset($db, $funktion);
-			if ($conf) {
-				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
-			} else {
-				$result[$funktion] = [];
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widget = $this->input->post('widget');
-
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$preset_decoded[$widget['widgetid']] = $widget;
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('db');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgetid = $this->input->post('widgetid');
-
-		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if (!$preset)
-			show_404();
-
-		$preset_decoded = json_decode($preset->preset, true);
-
-		if (!isset($preset_decoded[$widgetid]))
-			show_404();
-		
-		unset($preset_decoded[$widgetid]);
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-}

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

@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class User extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> 'dashboard/benutzer:r',
-			'addWidget'						=> 'dashboard/benutzer:rw',
-			'removeWidget'					=> 'dashboard/benutzer:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function get($dashboard_kurzbz)
-	{
-		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
-		if (!$dashboard)
-			show_404();
-		
-		$uid = $this->authlib->getAuthObj()->username;
-
-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
-
-		$this->terminateWithSuccess($mergedconfig);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		if (isset($widget['source']))
-			unset($widget['source']);
-
-		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-
-		$override_decoded = json_decode($override->override, true);
-
-		$override_decoded[$widget['widgetid']] = $widget;
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget_id = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (!$override)
-			show_404();
-		
-		$override_decoded = json_decode($override->override, true);
-
-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess();
-	}
-}

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

@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Widget extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'list'							=> 'dashboard/admin:r',
-			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setAllowed'					=> 'dashboard/admin:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-	}
-
-	public function get($id)
-	{
-		$result = $this->WidgetModel->load($id);
-
-		$widget = $this->getDataOrTerminateWithError($result);
-
-		if (!$widget)
-			return $this->terminateWithSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current($widget);
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		$this->terminateWithSuccess($widget);
-	}
-
-	public function list($dashboard)
-	{
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function listAllowed($dashboard)
-	{
-		$result = $this->WidgetModel->getForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function setAllowed()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$data = [
-			'dashboard_id' => $this->input->post('dashboard_id'),
-			'widget_id' => $this->input->post('widget_id')
-		];
-
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		
-		if ($this->input->post('allowed'))
-			$result = $this->DashboardWidgetModel->insert($data);
-		else
-			$result = $this->DashboardWidgetModel->delete($data);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

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

@@ -118,17 +118,54 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
+											studiengang_kz,
+											semester,
+											bezeichnung,
+											gid,
+											\'false\' as lehrverband');
+		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->GruppeModel->db->group_start();
+			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->group_end();
+		}
+		$this->_ci->GruppeModel->db->group_end();
+
+		$gruppen_result = $this->_ci->GruppeModel->load();
+
+		$gruppen_array = array();
 
 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
 
-		$gruppen_array = array();
-
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);
 
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
+												studiengang_kz,
+												semester,
+												tbl_lehrverband.bezeichnung,
+												gid,
+												\'true\' as lehrverband');
+		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehrverbandModel->addOrder('verband');
+		$this->_ci->LehrverbandModel->addOrder('gruppe');
+		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->_ci->LehrverbandModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehrverbandModel->db->group_start();
+			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->group_end();
+		}
+		$this->_ci->LehrverbandModel->db->group_end();
+		$lehrverband_result = $this->_ci->LehrverbandModel->load();
 
 		$lehrverband_array = array();
 

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

@@ -25,25 +25,7 @@ class StgTree extends FHCAPI_Controller
 			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]);
-			else
-				return $this->getStudiengang($method, $params[0]);
-		}
-		if ($count == 2) {
-			if (is_numeric($params[0]))
-				return $this->getVerband($method, $params[0], $params[1]);
-			else
-				return $this->getSemester($method, $params[1], $params[0]);
-		}
-
-
-
+		return $this->getStudiengang($method);
 		show_404();
 	}
 
@@ -82,27 +64,16 @@ class StgTree extends FHCAPI_Controller
 		$this->terminateWithSuccess($list);
 	}
 
-	protected function getStudiengang($studiengang_kz, $org_form = null)
+	protected function getStudiengang($studiengang_kz)
 	{
 		$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("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);
@@ -126,8 +97,6 @@ class StgTree extends FHCAPI_Controller
 				$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("p.orgform_kurzbz AS orgform_kurzbz");
-				$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
 				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
 
 				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
@@ -142,115 +111,6 @@ class StgTree extends FHCAPI_Controller
 				$list = array_merge($list, $result);
 			}
 		}
-		$this->terminateWithSuccess($list);
-	}
-
-	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);
-	}
-
-	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)
-			$where['v.orgform_kurzbz'] = $org_form;
-
-		$result = $this->StudiengangModel->loadWhere($where);
-
-		$list = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($list);
 	}

application/controllers/api/frontend/v1/messages/Messages.php

@@ -42,22 +42,14 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size=null, $page=null)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		if(!(is_null($size) && is_null($page)))
-		{
-			$offset = $size * ($page - 1);
-			$limit = $size;
-		}
-		else
-		{
-			$offset = null;
-			$limit = null;
-		}
+		$offset = $size * ($page - 1);
+		$limit = $size;
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 

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

@@ -78,32 +78,52 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
+
+		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$mergedArray = [];
+		$docNames = array_map(function ($item) {
+			return $item->dokument_kurzbz;
+		}, $resultPreDoc);
 
-		foreach ($resultPreDoc as $pre)
+		foreach($docNames as $doc)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
+			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
+			}
 			if (hasData($result))
 			{
-				foreach (getData($result) as $doc)
+				$data = getData($result);
+				foreach ($data as $value)
 				{
-					$merged = clone $doc;
-					$merged->docdatum = $pre->docdatum;
-					$merged->insertvonma = $pre->insertvonma;
-					$merged->bezeichnung = $pre->bezeichnung;
-					$mergedArray[] = $merged;
+					array_push($arrayAccepted, $value);
 				}
 			}
-			else
-			{
-				$mergedArray[] = $pre;
+		}
+
+		//Mapping with document_kurzbz
+		$preDocMap = [];
+		foreach ($resultPreDoc as $pre) {
+			$preDocMap[$pre->dokument_kurzbz] = $pre;
+		}
+
+		$mergedArray = [];
+		foreach ($arrayAccepted as $doc) {
+			$merged = clone $doc;
+
+			if (isset($preDocMap[$doc->dokument_kurzbz])) {
+				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
+				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
+				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
+			} else {
+				$merged->akzeptiertdatum = null;
+				$merged->akzeptiertvon = null;
 			}
+
+			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);

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

@@ -48,8 +48,7 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto',
-			'lehre'
+			'konto'
 		]);
 	}
 
@@ -113,7 +112,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen($studiensemester_kurzbz = null)
+	public function getBuchungstypen()
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -123,7 +122,6 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -496,43 +494,4 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
-
-	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
-	{
-		if (is_null($studiensemester_kurzbz))
-		{
-			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
-		}
-		else
-		{
-			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-				$studiensemester_akt = $studiensemester_kurzbz;
-			else
-				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
-		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
-
-		$oehStandardbetrag = null;
-		if (hasData($oehBeitrag))
-		{
-			$oeh = getData($oehBeitrag)[0];
-			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
-			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
-		}
-
-		if ($oehStandardbetrag !== null)
-		{
-			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
-				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
-				{
-					$buchungstyp->standardbetrag = $oehStandardbetrag;
-				}
-				return $buchungstyp;
-			}, $data);
-		}
-	}
 }

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

@@ -90,15 +90,6 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
-		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-	
-	private function fetchProjektarbeitById($projektarbeit_id) {
-		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -106,10 +97,13 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		return $this->ProjektarbeitModel->loadWhere(
+		$result = $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -138,8 +132,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
-		
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -287,7 +280,10 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
-		$result = $this->NoteModel->getAllActive();
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+
+		$result = $this->NoteModel->load();
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 

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

@@ -25,6 +25,9 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
+	private $allowedStgs = [];
+
+
 	public function __construct()
 	{
 		$permissions = [];
@@ -32,17 +35,16 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$allowedStgs) {
+		if (!$this->allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}
 
 		// Load Libraries
 		$this->load->library('PhrasesLib');
-		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -109,19 +111,23 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -129,13 +135,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -155,7 +164,10 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -175,12 +187,14 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -188,13 +202,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -214,18 +231,23 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -233,13 +255,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -288,6 +313,8 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -304,38 +331,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
+		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
 
 		if ($orgform_kurzbz) {
-			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
 		}
 
 		switch ($filter) {
 			case "interessenten":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				break;
 			case "bewerbungnichtabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum'] = null;
 				break;
 			case "bewerbungabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['ps.bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -347,69 +374,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				
 				if ($stg->typ == 'm') {
-					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
+					$where['zgvmas_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
+						$where['zgvmas_erfuellt'] = true;
 				} elseif ($stg->typ == 'p') {
-					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
+					$where['zgvdoktor_code IS NOT NULL'] = null;
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
+						$where['zgvdoktor_erfuellt'] = true;
 				} else {
-					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
+					$where['zgv_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgv_erfuellt', true);
+						$where['zgv_erfuellt'] = true;
 				}
 				break;
 			case "reihungstestangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$where['ps.status_kurzbz'] = 'Bewerber';
 				break;
 			case "bewerberrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', true);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = true;
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = false;
 				break;
 			case "aufgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
 				break;
 			case "warteliste":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
+				$where['ps.status_kurzbz'] = 'Wartender';
 				break;
 			case "absage":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
+				$where['ps.status_kurzbz'] = 'Incoming';
 				break;
 			case "absolvent":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
+				$where['ps.status_kurzbz'] = 'Absolvent';
 				break;
 			case "diplomand":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
+				$where['ps.status_kurzbz'] = 'Diplomand';
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -417,9 +444,9 @@ class Students extends FHCAPI_Controller
 					 * show all prestudents in this stg who don't have a status
 					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
 					 */
-					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
+					$where['ps.status_kurzbz'] = null;
 				} else {
-					$this->studentlistlib->addWhere('ps.status_kurzbz', [
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -430,19 +457,21 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->studentlistlib->addSelect("
+		$this->prepareQuery($studiensemester_kurzbz);
+		
+		$this->PrestudentModel->addSelect("
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
 				THEN ps.ausbildungssemester::text 
 				ELSE ''::text 
 			END AS semester", false);
-		$this->studentlistlib->addSelect("'' AS verband");
-		$this->studentlistlib->addSelect("'' AS gruppe");
-
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere($where);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -545,6 +574,7 @@ class Students extends FHCAPI_Controller
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -552,29 +582,34 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
-		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
+		$this->prepareQuery($studiensemester_kurzbz, '');
 
-		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+
+
+		$where = [];
 
 		if ($gruppe_kurzbz !== null) {
-			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
-			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
-			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
 		} else {
-			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
+			$where['v.studiengang_kz'] = $studiengang_kz;
 
 			if ($semester !== null)
-				$this->studentlistlib->addWhere('v.semester', $semester);
+				$where['v.semester'] = $semester;
 
 			if ($verband !== null)
-				$this->studentlistlib->addWhere('v.verband', $verband);
+				$where['v.verband'] = $verband;
 
 			if ($gruppe !== null)
-				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
+				$where['v.gruppe'] = $gruppe;
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->studentlistlib->addWhere(
+				$this->PrestudentModel->db->where(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -588,11 +623,10 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
-
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
-
+		$result = $this->PrestudentModel->loadWhere($where);
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -618,8 +652,11 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		
-		$this->studentlistlib->addSelect("COALESCE(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -627,15 +664,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
-		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -662,13 +700,23 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();
+
 
-		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
-		
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -696,13 +744,21 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->studentlistlib->addWhere('p.person_id', $person_id);
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();
 
-		
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -734,8 +790,29 @@ class Students extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
 		$prestudent_ids = [];
 		$student_uids = [];
+			$this->addMeta('data', $data);
 		foreach ($data as $row) {
 			$dataset = json_decode($row->data);
 			if ($row->type == 'prestudent') {
@@ -745,38 +822,187 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
-
-		$this->studentlistlib->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-
-
 		if ($prestudent_ids && $student_uids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}
 
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * @param string|null	$studiensemester_kurzbz
+	 * @param string		$type
+	 *
+	 * @return void
+	 */
+	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+		$this->load->config('stv');
+		$tags = $this->config->item('stv_prestudent_tags');
+
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags)) {
+			$tags = array_keys($tags);
+
+			foreach ($tags as $key => $tag) {
+				$tags[$key] = $this->db->escape($tag);
+			}
+			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+		}
+		$subQueryTag = "
+		  (
+			SELECT
+			  tag.prestudent_id,
+			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+			FROM (
+			  SELECT DISTINCT ON (n.notiz_id)
+				n.notiz_id AS id,
+				nt.typ_kurzbz,
+				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+				n.text AS notiz,
+				nt.style,
+				n.erledigt AS done,
+				nz.prestudent_id
+			  FROM public.tbl_notizzuordnung AS nz
+				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+			. $whereTags .
+			"
+			) AS tag
+			GROUP BY tag.prestudent_id
+		  ) AS tag_data_agg
+		";
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			$type
+		);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('foto');
+		$this->PrestudentModel->addSelect('foto_sperre');
+
+		// semester
+		// verband
+		// gruppe
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->PrestudentModel->addSelect("s.matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
+		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+		// priorisierung_relativ
+
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect('unruly');
+
+		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function addSelectPrioRel()
+	{
+		$this->PrestudentModel->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
+	}
+
 	/**
 	 * Adds additional filters to the query
 	 *

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

@@ -1,133 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'getHeader' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-			'updateCollision' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-	}
-
-	public function get()
-	{
-		$config = [];
-
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre', 'ignore_resources_collisions']);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$config['ignore_kollision'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_kollision'),
-			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
-
-		];
-
-		$config['kollision_student'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'kollision_student'),
-			"value" => ($data['kollision_student'] ?? 'false') === 'true'
-		];
-
-		$config['ignore_reservierung'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_reservierung'),
-			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
-
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
-			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
-		];
-
-		$config['ignore_resources_collisions'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_resources_collisions'),
-			"value" => ($data['ignore_resources_collisions'] ?? 'false') === 'true'
-		];
-
-		$this->terminateWithSuccess($config);
-	}
-	public function getHeader()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
-		$this->_ci->KalenderStatusModel->addOrder('sort');
-		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
-		$visible_status = $this->_ci->KalenderStatusModel->load();
-
-		$visible_status = getData($visible_status);
-
-		$config['visible_status']['all'] = 'Alle';
-
-		foreach ($visible_status as $status)
-		{
-			$config['visible_status'][$status->status_kurzbz] = $status->status;
-		}
-
-		$this->terminateWithSuccess($config);
-	}
-
-	public function set()
-	{
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_kollision',
-			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'kollision_student',
-			$this->input->post('kollision_student') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_reservierung',
-			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_zeitsperre',
-			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_resources_collisions',
-			$this->input->post('ignore_resources_collisions') === true ? 'true' : 'false'
-		);
-		$this->terminateWithSuccess();
-	}
-
-	public function updateCollision()
-	{
-		$original_ignore = $this->_ci->variablelib->getVar('ignore_kollision');
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_kollision',
-			$original_ignore === 'true' ? 'false' : 'true'
-		);
-	}
-
-}

application/controllers/api/frontend/v1/tempus/Coursepicker.php

@@ -1,300 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-	public function __construct()
-	{
-		parent::__construct([
-			'search' => self::PERM_LOGGED,
-			'getByStg' => self::PERM_LOGGED
-		]);
-
-		$this->_ci = &get_instance();
-		$this->load->library('form_validation');
-
-		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
-
-
-		$this->loadPhrases(['ui']);
-	}
-
-	public function search()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		//TODO Where weiter anpassen z.B. Fachbereich
-		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
-												tbl_lehreinheit.lvnr,
-												tbl_lehreinheit.lehrfach_id,
-												lehrfach.kurzbz AS lehrfach,
-												lehrfach.bezeichnung AS lehrfach_bez,
-												lehrfach.farbe AS lehrfach_farbe,
-												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-												lema.mitarbeiter_uid AS lektor_uid,
-												tbl_mitarbeiter.kurzbz AS lektor,
-												tbl_studiengang.studiengang_kz,
-												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-												lvb.semester,
-												lvb.verband,
-												lvb.gruppe,
-												lvb.gruppe_kurzbz,
-												tbl_lehreinheit.raumtyp,
-												tbl_lehreinheit.raumtypalternativ,
-												tbl_lehreinheit.stundenblockung,
-												tbl_lehreinheit.wochenrythmus,
-												lema.semesterstunden,
-												lema.planstunden,
-												tbl_lehreinheit.start_kw,
-												tbl_lehreinheit.anmerkung,
-												tbl_lehreinheit.studiensemester_kurzbz');
-
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehreinheitModel->db->group_start();
-			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
-				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
-			}
-			$this->_ci->LehreinheitModel->db->group_end();
-
-		}
-		$this->_ci->LehreinheitModel->db->group_end();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
-		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
-
-		$result = $this->_ci->LehreinheitModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-	public function getByStg()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('studiengaenge[]',"studiengaenge","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$studiengaenge = $this->input->post('studiengaenge');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$this->_ci->LehreinheitModel->addSelect('
-			tbl_lehreinheit.lehreinheit_id,
-			tbl_lehreinheit.lvnr,
-			tbl_lehreinheit.lehrfach_id,
-			lehrfach.kurzbz AS lehrfach,
-			lehrfach.bezeichnung AS lehrfach_bez,
-			lehrfach.farbe AS lehrfach_farbe,
-			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-			lema.mitarbeiter_uid AS lektor_uid,
-			ma.kurzbz AS lektor,
-			tbl_person.vorname,
-			tbl_person.nachname,
-			tbl_studiengang.studiengang_kz,
-			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-			lvb.semester,
-			lvb.verband,
-			lvb.gruppe,
-			lvb.gruppe_kurzbz,
-			tbl_lehreinheit.raumtyp,
-			tbl_lehreinheit.raumtypalternativ,
-			tbl_lehreinheit.stundenblockung,
-			tbl_lehreinheit.wochenrythmus,
-			lema.semesterstunden,
-			lema.planstunden,
-			tbl_lehreinheit.start_kw,
-			tbl_lehreinheit.anmerkung,
-			tbl_lehreinheit.studiensemester_kurzbz
-		');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
-
-		$this->_ci->LehreinheitModel->db->group_start();
-		$first = true;
-		foreach ($studiengaenge as $studiengang)
-		{
-			if ($first)
-				$this->_ci->LehreinheitModel->db->group_start();
-			else
-			{
-				$this->_ci->LehreinheitModel->db->or_group_start();
-			}
-			$first = false;
-
-			$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang['studiengang_kz']);
-
-			if (isset($studiengang['semester']))
-				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.semester', $studiengang['semester']);
-
-			if (isset($studiengang['orgform_kurzbz']))
-				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.orgform_kurzbz', $studiengang['orgform_kurzbz']);
-
-			$this->_ci->LehreinheitModel->db->group_end();
-		}
-		$this->_ci->LehreinheitModel->db->group_end();
-
-		$result = $this->_ci->LehreinheitModel->loadWhere(array(
-			'tbl_lehrform.verplanen' => true,
-			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$result = hasData($result) ? getData($result) : array();
-
-		$lehreinheit_ids = array_values(array_unique(array_column($result, 'lehreinheit_id')));
-
-		$offen_map = array();
-		if (!empty($lehreinheit_ids))
-		{
-			$offen_result = $this->_ci->LehreinheitModel->getOffeneStunden($lehreinheit_ids);
-			if (hasData($offen_result))
-			{
-				foreach (getData($offen_result) as $row)
-				{
-					$offen_map[$row->lehreinheit_id . '_' . $row->mitarbeiter_uid] = $row;
-				}
-			}
-		}
-
-		$grouped = array();
-
-		foreach ($result as $row)
-		{
-			$lehreinheit_id = $row->lehreinheit_id;
-			if (!isset($grouped[$lehreinheit_id]))
-			{
-				$grouped[$lehreinheit_id] = (object)array(
-					'lehrfach_id' => $row->lehrfach_id,
-					'lehrfach_bez' => $row->lehrfach_bez,
-					'lehrfach_farbe' => $row->lehrfach_farbe,
-					'studiengang_kz' => $row->studiengang_kz,
-					'studiengang' => $row->studiengang,
-					'semester' => $row->semester,
-					'verband' => $row->verband,
-					'gruppe' => $row->gruppe,
-					'gruppe_kurzbz' => $row->gruppe_kurzbz,
-					'raumtyp' => $row->raumtyp,
-					'raumtypalternativ' => $row->raumtypalternativ,
-					'anmerkung' => $row->anmerkung,
-					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
-					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
-					'lektoren' => array(),
-					'lehreinheit_id' => $lehreinheit_id,
-					'lvnr' => array(),
-					'lehrfach' => array(),
-					'lehrform' => array(),
-					'stundenblockung' => array(),
-					'wochenrythmus' => array(),
-					'planstunden' => array(),
-					'start_kw' => array(),
-					'verplant' => array(),
-					'offenestunden' => array(),
-					'lehrverband' => array(),
-					'lem' => array(),
-					'verplant_gesamt' => 0,
-				);
-			}
-
-			$group = $grouped[$lehreinheit_id];
-
-			$group->lektoren[$row->lektor_uid] = (object)array(
-				'uid' => $row->lektor_uid,
-				'kurzbz' => trim($row->lektor),
-				'name' => $row->vorname . ' ' . $row->nachname,
-			);
-
-			$group->lvnr[] = $row->lvnr;
-			$group->lehrfach[] = $row->lehrfach;
-			$group->lehrform[] = $row->lehrform;
-			$group->stundenblockung[] = $row->stundenblockung;
-			$group->wochenrythmus[] = $row->wochenrythmus;
-			$group->planstunden[] = $row->planstunden;
-			$group->start_kw[] = $row->start_kw;
-
-			$offen_key = $lehreinheit_id . '_' . $row->lektor_uid;
-			$offen = isset($offen_map[$offen_key]) ? $offen_map[$offen_key] : null;
-			$verplant_wert = $offen ? $offen->verplant : 0;
-			$offenestunden_wert = $offen ? $offen->offenestunden : 0;
-
-			$group->verplant[] = $verplant_wert;
-			$group->offenestunden[] = $offenestunden_wert;
-			$group->verplant_gesamt += $verplant_wert;
-
-			$lvb = $row->studiengang . '-' . $row->semester;
-
-			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
-				$lvb .= $row->verband;
-
-			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
-				$lvb .= $row->gruppe;
-
-			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
-
-			$group->lem[] = array(
-				'lehreinheit_id' => $row->lehreinheit_id,
-				'mitarbeiter_uid' => $row->lektor_uid,
-			);
-		}
-
-		foreach ($grouped as $group)
-		{
-			$group->lektoren = array_values($group->lektoren);
-			$group->lehrverband = array_values(array_unique($group->lehrverband));
-			$group->lehrfach = $this->_formatArr($group->lehrfach);
-			$group->lehrform = $this->_formatArr($group->lehrform);
-			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
-			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
-			$group->planstunden = $this->_formatArr($group->planstunden);
-			$group->start_kw = $this->_formatArr($group->start_kw);
-			$group->verplant = $this->_formatArr($group->verplant);
-			$group->offenestunden = $this->_formatArr($group->offenestunden);
-		}
-
-		$this->terminateWithSuccess(array_values($grouped));
-	}
-
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($values) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-
-}

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

@@ -1,47 +0,0 @@
-<?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(), ['tempus_favorites']);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			$this->terminateWithSuccess(null);
-		else
-			$this->terminateWithSuccess(isset($data['tempus_favorites']) ? $data['tempus_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(), 'tempus_favorites', $favorites);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess(true);
-	}
-}

application/controllers/api/frontend/v1/tempus/Info.php

@@ -1,37 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Info extends FHCAPI_Controller
-{
-
-	private $_ci;
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudiengaenge' => self::PERM_LOGGED,
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->loadPhrases([
-			'ui'
-		]);
-
-	}
-
-	public function getStudiengaenge()
-	{
-		$this->_ci->StudiengangModel->addDistinct();
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz');
-		$this->_ci->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name");
-
-		$result = $this->getDataOrTerminateWithError($this->_ci->StudiengangModel->load());
-		$this->terminateWithSuccess($result);
-	}
-}

application/controllers/api/frontend/v1/tempus/Kalender.php

@@ -1,437 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Kalender extends FHCAPI_Controller
-{
-
-	private $_ci;
-	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
-	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
-
-	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => self::PERM_LOGGED,
-			'getCalendarHours' => self::PERM_LOGGED,
-			'getPlan' => self::PERM_LOGGED,
-			'getPlanByOrt' => self::PERM_LOGGED,
-			'getRaumvorschlag' => self::PERM_LOGGED,
-			'getHistory' => 'lehre/lvplan:rw',
-			'deleteEntry' => 'lehre/lvplan:rw',
-			'syncToLecturer' => 'lehre/lvplan:rw',
-			'syncToStudent' => 'lehre/lvplan:rw',
-			'getPlanLecturer' =>'lehre/lvplan:rw',
-			'getPlanStudent' => 'lehre/lvplan:rw',
-			'getZeitwuensche' => self::PERM_LOGGED,
-			'getZeitsperren' => self::PERM_LOGGED,
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'addKalenderEvent' => 'lehre/lvplan:rw',
-			'calculateMultiWeekPlan' => 'lehre/lvplan:rw',
-			'confirmMultiWeekPlan' => 'lehre/lvplan:rw',
-			'addToKalenderEvent' => 'lehre/lvplan:rw',
-			'sync' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
-		$this->_ci->load->library('RaumvorschlagLib', ["uid" => getAuthUID()]);
-		$this->loadPhrases([
-			'ui'
-		]);
-		$this->_ci->load->config('tempus');
-
-
-		$this->_ci->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function getStunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
-		$stunden = $this->_ci->StundeModel->load();
-
-		$stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$this->terminateWithSuccess($stunden);
-	}
-
-	public function getCalendarHours()
-	{
-		$calender_start = $this->_ci->config->item('calendar_start') ?? 7;
-		$calender_end = $this->_ci->config->item('calendar_end') ?? 23;
-
-		$this->terminateWithSuccess(array(
-			'start' => $calender_start,
-			'end' => $calender_end
-		));
-	}
-
-	public function getPlan()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
-			$start_date,
-			$end_date,
-			isset($filter->ort) ? $filter->ort : null,
-			isset($filter->uid) ? $filter->uid : null,
-			isset($filter->stg) ? $filter->stg : null
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanStudent()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanLecturer()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
-	{
-		if (!isset($start_date) || !isset($end_date) || !isset($ort))
-		{
-			$this->_ci->form_validation->set_data($_GET);
-			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-			$this->_ci->form_validation->set_rules('ort',"ort","required");
-			if($this->_ci->form_validation->run() === FALSE)
-				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-			$start_date = $this->_ci->input->get('start_date', TRUE);
-			$end_date = $this->_ci->input->get('end_date', TRUE);
-			$ort = $this->_ci->input->get('ort', TRUE);
-		}
-
-		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
-	}
-
-	public function getZeitsperren()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getZeitwuensche()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function updateKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result),  $result->code);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function getRaumvorschlag()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-
-		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
-		$this->terminateWithSuccess($this->_ci->raumvorschlaglib->getVorschlaege($filter->kalender_id));
-	}
-
-	public function getHistory()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteEntry()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function sync()
-	{
-		$result = $this->_ci->kalenderlib->sync();
-		$this->terminateWithSuccess(getData($result));
-	}
-	public function syncToLecturer()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-	public function syncToStudent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-	public function addKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function calculateMultiWeekPlan()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-		$result = $this->_ci->kalenderlib->calculateMultiWeekPlan($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function confirmMultiWeekPlan()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('plan[]',"plan","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$plan = $this->_ci->input->post('plan', TRUE);
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->confirmMultiWeekPlan($plan, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function addToKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('target_kalender_id',"target_kalender_id","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$target_kalender_id = $this->_ci->input->post('target_kalender_id', TRUE);
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->addToKalenderEvent($target_kalender_id, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = true;
-		$filter_object = new stdClass();
-		foreach ($filters as $filter)
-		{
-			if ($this->_ci->input->post($filter))
-			{
-				$filter_valid = true;
-				$filter_object->$filter = $this->_ci->input->post($filter);
-			}
-		}
-
-		if (!$filter_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		return $filter_object;
-	}
-
-	private function _checkUpdate($updateInfos)
-	{
-		$update_valid = false;
-		$update_object = new stdClass();
-		foreach (self::ALLOWED_TO_UPDATE as $filter)
-		{
-			if (isset($updateInfos[$filter]))
-			{
-				$update_valid = true;
-				$update_object->$filter = $updateInfos[$filter];
-			}
-		}
-
-		if (!$update_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-
-		return $update_object;
-	}
-}

application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php

@@ -1,84 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class OperationalResourceToCalenderAPI extends FHCAPI_Controller
-{
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getAssignedResourcesByCalender' => ['admin:r', 'assistenz:r'],
-			'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w'],
-			'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->load->model('ressource/BetriebsmittelKalender_model', 'BetriebsmittelKalenderModel');
-		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
-		$this->load->model('ressource/Kalender_model', 'KalenderModel');
-
-		$this->load->library('CollisionChecker', ["uid" => getAuthUID()]);
-		$this->load->library('KalenderLib', ["uid" => getAuthUID()]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function getSchedulableResourcesByCalendar($calenderID)
-	{ 
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (isError($result)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
- 
-		$calender = $this->getDataOrTerminateWithError($result)[0];
-		if (!isset($calender)) $this->terminateWithError("Calendar with id '$calenderID' not found");
-
-		$result = $this->BetriebsmittelModel->getSchedulableEntriesByDatetimeInterval($calender->von, $calender->bis);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getAssignedResourcesByCalender($calenderID)
-	{
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
- 
-		$calenderGroupID = $this->getDataOrTerminateWithError($result)[0]->eindeutige_kalender_gruppen_id;
-		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
-
-
-		$this->BetriebsmittelKalenderModel->addSelect(['tbl_betriebsmittel_kalender.*', 'tbl_betriebsmittel.beschreibung', 'tbl_betriebsmittel.verplanen']);
-		$this->BetriebsmittelKalenderModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
-		$result = $this->BetriebsmittelKalenderModel->loadWhere([
-			'eindeutige_kalender_gruppen_id' => $calenderGroupID,
-			'tbl_betriebsmittel.verplanen' => true,
-		]);
-
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function storeResourcesToCalendarRelationship()
-	{
-		$calenderID = $this->input->post('kalender_id');
-		$assignedResources = $this->input->post('assignedResources');
-
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'", 'general');
-		if (!isset($assignedResources)) $this->terminateWithError("Missing required parameter 'assignedResources'", 'general');
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
-
-		$calendar = $this->getDataOrTerminateWithError($result)[0];
-		
-		$calenderGroupID = $calendar->eindeutige_kalender_gruppen_id;
-		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
-
-		$result = $this->kalenderlib->addOperationalResourcesToKalenderEvent($calendar, $assignedResources);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(['message' => 'Resources assigned successfully']);
-	}
-}

application/controllers/api/frontend/v1/tempus/Reservierung.php

@@ -1,231 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Reservierung extends FHCAPI_Controller
-{
-	private $_ci;
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addReservierung' => 'lehre/lvplan:rw',
-			'getRollen' => 'lehre/lvplan:rw',
-			'getInformation' => 'lehre/lvplan:rw',
-			'getLektor' => 'lehre/lvplan:rw',
-			'searchGroup' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
-
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
-
-
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getInformation()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
-
-		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError(getError($studiengaenge));
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$rollen = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemester = $this->_ci->StudiensemesterModel->load();
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
-		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
-
-
-		$this->terminateWithSuccess($return_array);
-	}
-	public function getRaeume()
-	{
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	public function searchGroup()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-
-		$query_words = explode(' ', urldecode($query));
-
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
-
-		if (isError($gruppen_result))
-			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
-
-		$gruppen_array = array();
-
-		if (hasData($gruppen_result))
-			$gruppen_array = getData($gruppen_result);
-
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
-
-		$lehrverband_array = array();
-
-		if (isError($lehrverband_result))
-			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
-
-		if (hasData($lehrverband_result))
-			$lehrverband_array = getData($lehrverband_result);
-
-		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
-
-		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
-		{
-			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
-		});
-
-		$this->terminateWithSuccess($gefilterte_gruppen);
-	}
-
-	public function getRollen()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$result = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-	public function addReservierung()
-	{
-
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('titel',"titel","required");
-		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
-		$this->_ci->form_validation->set_rules('ort_kurzbz[]',"ort_kurzbz","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
-		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
-		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
-		$groups = $this->_ci->input->post('groups', TRUE);
-
-		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-		{
-			if (empty($teilnehmer) || !is_array($teilnehmer))
-			{
-				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-			}
-		}
-		else
-			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-
-
-		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
-
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-
-
-	public function getLektor()
-	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-
-		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->MitarbeiterModel->db->group_start();
-			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->group_end();
-		}
-		$this->_ci->MitarbeiterModel->db->group_end();
-		$this->_ci->MitarbeiterModel->addOrder('nachname');
-		$this->_ci->MitarbeiterModel->addOrder('vorname');
-		$result = $this->_ci->MitarbeiterModel->load();
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-}

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

@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'getTagsByCalendar' => self::BERECHTIGUNG_KURZBZ,
-			'addTag' => self::BERECHTIGUNG_KURZBZ,
-			'updateTag' => self::BERECHTIGUNG_KURZBZ,
-			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ
-		]);
-
-	$this->config->load('tempus');
-	}
-
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('tempus_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('tempus_tags'));
-	}
-	public function getTagsByCalendar($eindeutige_kalender_gruppen_id = null)
-	{
-		parent::getTagsByAssignmentTypeValue('eindeutige_kalender_gruppen_id', $eindeutige_kalender_gruppen_id, $this->config->item('tempus_tags'));
-	}
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::addTag(true, $this->config->item('tempus_tags'));
-	}
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('tempus_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('tempus_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('tempus_tags'));
-	}
-}

application/controllers/dashboard/Admin.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- */
-class Admin extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		// Set required permissions
-		parent::__construct(
-			array(
-				'index' => 'dashboard/admin:rw',
-				'preview' => 'dashboard/admin:r',
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-		$this->load->view('dashboard/admin.php', []);
-	}
-
-	public function preview($dashboard_kurzbz = 'CIS')
-	{
-		$this->load->view('dashboard/preview.php', [
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-	}
-}

application/controllers/dashboard/Api.php

@@ -0,0 +1,76 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Api extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
+			)
+		);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
+
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		$result = $this->NewsModel->getAll($limit);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln()
+	{
+
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/dashboard/Config.php

@@ -0,0 +1,216 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Config
+ *
+ * @author bambi
+ */
+class Config extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/benutzer:r',
+				'dummy'							=> 'dashboard/benutzer:r',
+				'genWidgetId'					=> 'dashboard/benutzer:rw',
+				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+				'funktionen'					=> 'dashboard/admin:r',
+				'preset'						=> 'dashboard/admin:r',
+				'presetBatch'					=> 'dashboard/admin:r'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+	
+	public function index()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$uid = $this->AuthLib->getAuthObj()->username;
+
+		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+		if(!$dashboard) {
+			http_response_code(404);
+			$this->terminateWithJsonError(array(
+				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+			));
+		}
+		
+		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$this->outputJsonSuccess($mergedconfig);
+	}
+	
+	public function genWidgetId()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		$this->outputJsonSuccess(array(
+			'widgetid' => $widgetid
+		));
+	}
+	
+	public function addWidgetsToPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$preset->preset = json_encode($preset_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('preset could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
+	}
+	
+	public function removeWidgetFromPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$widgetid = $input->widgetid;
+				
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if ($preset === null) {
+			http_response_code(404);
+			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
+		}
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+	}
+
+	public function addWidgetsToUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override)) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
+	public function funktionen()
+	{
+		$funktionen = $this->FunktionModel->load();
+
+		if (isError($funktionen)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($funktionen)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($funktionen) ?: []);
+	}
+	
+	public function preset()
+	{
+		$db = $this->input->get('db');
+		$funktion = $this->input->get('funktion');
+
+		$conf = $this->DashboardLib->getPreset($db, $funktion);
+
+		if (!$conf)
+			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+		return $this->outputJsonSuccess(json_decode($conf->preset, true));
+	}
+	
+	public function presetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->DashboardLib->getPreset($db, $funktion);
+			if ($conf)
+			{
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			}
+			else
+				$result[$funktion] = [];
+		}
+
+		return $this->outputJsonSuccess($result);
+	}
+}

application/controllers/dashboard/Dashboard.php

@@ -0,0 +1,86 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Dashboard extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/admin:r',
+				'create'						=> 'dashboard/admin:rw',
+				'update'						=> 'dashboard/admin:rw',
+				'delete'						=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+	
+	public function index()
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function create()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->insert($input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function update()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function delete()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->delete($input->dashboard_id);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+}

application/controllers/dashboard/DashboardDemo.php

@@ -0,0 +1,58 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class DashboardDemo extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'dashboard/benutzer:r',
+                'admin' => 'dashboard/admin:rw'
+            )
+        );
+
+        $this->load->library('AuthLib');
+        $this->load->library('WidgetLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/dashboard_demo.php', []);
+	}
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+}

application/controllers/dashboard/Widget.php

@@ -0,0 +1,134 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Widget extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+				'getAll'						=> 'dashboard/admin:r',
+				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+				'setAllowed'					=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+	}
+	
+	public function index()
+	{
+		$widget_id = $this->input->get('id');
+
+		$widget = $this->WidgetModel->load($widget_id);
+
+		if (isError($widget) || !getData($widget))
+			return $this->outputJsonSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => [
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+				],
+				"setup" => [
+					"name" => 'Widget Not Found',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"width" => 1,
+					"height" => 1
+				]
+			]);
+
+		$widget = current(getData($widget));
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		return $this->outputJsonSuccess($widget);
+	}
+	
+	public function getAll()
+	{
+		$dashboard_id = $this->input->get('dashboard_id');
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function getWidgetsForDashboard()
+	{
+		$db = $this->input->get('db');
+		$result = $this->WidgetModel->getForDashboard($db);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function setAllowed()
+	{
+		$input = $this->getPostJSON();
+
+		$dashboard_id = $input->dashboard_id;
+		$widget_id = $input->widget_id;
+		$action = $input->action;
+
+		if ($action == 'add') {
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} elseif ($action == 'delete') {
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} else {
+			http_response_code(404); // TODO(chris): 400?
+			$this->terminateWithJsonError([
+				'error' => 'action value invalid'
+			]);
+		}
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		return $this->outputJsonSuccess(getData($result));
+	}
+}

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;
@@ -502,10 +495,6 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
-		if(!$retval) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -568,8 +557,6 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
-			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -588,8 +575,6 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
-				$relevantCounter++;
-
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -648,11 +633,6 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
-			if($relevantCounter == 0) {
-				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
-				continue;
-			}
-			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 

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))
@@ -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/TempusJob.php

@@ -1,27 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class TempusJob extends JOB_Controller
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->helper('hlp_sancho_helper');
-		$this->_ci->load->library('KalenderLib', ["uid" => null]);
-	}
-
-
-	public function sync()
-	{
-		$this->_ci->logInfo('Start job FHC-Core->Tempus->sync');
-		$this->_ci->kalenderlib->sync();
-		$this->_ci->logInfo('End job FHC-Core->Tempus->sync');
-	}
-
-}

application/controllers/lehre/Studierendenantrag.php

@@ -28,9 +28,7 @@ class Studierendenantrag extends FHC_Controller
 			'studierendenantrag'
 		]);
 
-		$this->load->config('studierendenantrag');
-
-		if (strtolower($this->router->method) === 'leitung')
+        if (strtolower($this->router->method) === 'leitung')
         	$this->_isAllowed([
         		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
         	]);
@@ -56,27 +54,18 @@ class Studierendenantrag extends FHC_Controller
 					'bezeichnungStg' => $antrag->bezeichnung,
 					'bezeichnungOrgform' => $antrag->orgform
 				);
+				
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
 
-				if ($this->config->item('wiederholung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
-				}
+				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
 
-				if ($this->config->item('unterbrechung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
-				}
-
-				if ($this->config->item('abmeldung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
-				}
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
@@ -99,59 +88,45 @@ class Studierendenantrag extends FHC_Controller
 
 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
-			'stgL' => $stgL,
-			'abmeldung_enabled' => $this->config->item('abmeldung_stg_enabled')
+			'stgL' => $stgL
 		]);
 	}
 
 	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('abmeldung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Abmeldung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Abmeldung'
+		]);
 	}
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
 
-		if ($this->config->item('abmeldung_stg_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'AbmeldungStgl'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'AbmeldungStgl'
+		]);
 	}
 
 	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('unterbrechung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Unterbrechung'
-			]);
-		}
-
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Unterbrechung'
+		]);
 	}
 
 	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('wiederholung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Wiederholung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Wiederholung'
+		]);
 	}
 
 	/**

application/controllers/system/MigrateKalender.php

@@ -1,865 +0,0 @@
-<?php
-/*
- * Job zur einmaligen Migration des Stundenplans
- *
- * Aufruf
- * php index.ci.php system/MigrateKalender
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateKalender extends CLI_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
-		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
-		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
-		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
-		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
-		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function refreshTablesAndFullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
-	{
-		echo "Refreshing calendar related tables...\n";
-		$this->resetBeforeNewStundenplanReservierungImport();
-		echo "Calendar related tables refreshed successfully.\n\n";
-
-		echo "Starting full migration of Stundenplan and Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->fullMigrateOfStundenplanReservierung($von, $bis, $studiengang_kz, $ort_kurzbz);
-		echo "Full migration of Stundenplan and Reservierung completed successfully.\n";
-	}
-
-	public function fullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
-	{
-		echo "Starting migration of Stundenplan from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->migrateStundenplan($von, $bis, $studiengang_kz);
-		echo "Stundenplan migration completed successfully.\n\n";
-
-		echo "Starting migration of Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->migrateReservierung($von, $bis, $ort_kurzbz);
-		echo "Reservierung migration completed successfully.\n\n";
-
-		echo "Starting migration of Stundenplan Betriebsmittel entries...\n";
-		$this->migrateStundenplanBetriebsmittelEntries();
-		echo "Stundenplan Betriebsmittel entries migration completed successfully.\n\n";
-
-		echo "Starting to add title values as tags to calendar entries...\n";
-		$this->addTitleValuesAsTagsToKalenderEntries();
-		echo "Adding title values as tags to calendar entries completed successfully.\n\n";
-	}
-
-	public function migrateStundenplan($von, $bis = null, $studiengang_kz = null)
-	{
-		if (is_null($von))
-			return error('Parameter "von" ist erforderlich');
-
-		if (is_null($bis))
-			$bis = '2100-12-31';
-
-		$db = new DB_Model();
-
-		$stpldevsql = '
-			WITH eindeutige_stunden AS (
-				SELECT DISTINCT unr, datum, stunde
-				FROM lehre.tbl_stundenplandev
-				WHERE datum >= ? AND datum <= ?';
-
-		$params = [$von, $bis];
-
-		if (!is_null($studiengang_kz))
-		{
-			$stpldevsql .= ' AND studiengang_kz = ?';
-
-			$params[] = $studiengang_kz;
-		}
-
-		$stpldevsql .= '),
-			
-			block_keys AS (
-				SELECT
-					unr,
-					datum,
-					stunde,
-					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
-				FROM eindeutige_stunden
-			),
-			blocks AS (
-				SELECT
-					bk.unr,
-					bk.datum,
-					bk.block_nr,
-					MIN(bk.stunde) AS stunde_von,
-					MAX(bk.stunde) AS stunde_bis,
-					array_agg(DISTINCT sp.lehreinheit_id) AS lehreinheit_id,
-					array_agg(DISTINCT sp.ort_kurzbz) AS ort_kurzbz,
-					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
-					MIN(sp.insertamum) AS insertamum,
-					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
-					MAX(sp.updateamum) AS updateamum,
-					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
-				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
-				WHERE sp.datum >= ? AND sp.datum <= ?
-				GROUP BY bk.unr, bk.datum, bk.block_nr
-			)
-			SELECT
-				b.stundenplandev_ids,
-				b.unr,
-				b.datum,
-				b.block_nr,
-				b.lehreinheit_id,
-				b.ort_kurzbz,
-				b.datum + stundevon.beginn AS von,
-				b.datum + stundebis.ende AS bis,
-				b.insertamum,
-				b.insertvon,
-				b.updateamum,
-				b.updatevon
-			FROM blocks b
-				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
-				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
-			ORDER BY b.datum, b.unr, b.block_nr;';
-
-		array_push($params, $von, $bis);
-		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
-
-		if (hasData($stpldev))
-		{
-			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
-			// Wenn neuere Änderungen vorhanden dann Update
-			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
-			// Wenn noch nicht vorhanden neu anlegen
-			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
-			// in der neuen Tabelle auch archivieren oder loeschen
-
-			$data = getData($stpldev);
-			foreach($data as $block)
-			{
-				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
-				/*$ids = array_map('intval', $ids);*/
-
-				$this->SyncModel->db->where_in('stundenplandev_id', $ids);
-				$sync_result = $this->SyncModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
-					if ($kalender_id)
-					{
-						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'stundenplandev_id');
-
-					if ($block->updateamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertSync($fehlende, $kalender_id);
-					}
-				}
-			}
-		}
-	}
-
-	public function migrateReservierung($von, $bis = null, $ort_kurzbz = null)
-	{
-		if (is_null($von))
-			return error('Parameter "von" ist erforderlich');
-
-		if (is_null($bis))
-			$bis = '2100-12-31';
-
-		$db = new DB_Model();
-
-		$qry = "WITH eindeutige_stunden AS (
-					SELECT DISTINCT titel, beschreibung, datum, stunde
-					FROM campus.tbl_reservierung
-					WHERE datum >= ? AND datum <= ?";
-
-		$params = array($von, $bis);
-
-		if (!is_null($ort_kurzbz))
-		{
-			$qry .= " AND ort_kurzbz = ?";
-			$params[] = $ort_kurzbz;
-		}
-
-		$qry .=	"),
-					block_keys AS (
-						SELECT
-							titel, beschreibung, datum, stunde,
-							stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
-						FROM eindeutige_stunden
-					),
-					blocks AS (
-						 SELECT
-							bk.titel,
-							bk.beschreibung,
-							bk.datum,
-							bk.block_nr,
-							MIN(bk.stunde) AS stunde_von,
-							MAX(bk.stunde) AS stunde_bis,
-							array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
-							array_agg(DISTINCT r.uid) AS uids,
-							array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
-							array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe, r.studiengang_kz)::text) AS svg_kombis,
-							array_agg(DISTINCT r.ort_kurzbz) AS ort_kurzbz,
-							MIN(r.studiengang_kz) AS studiengang_kz,
-							MIN(r.reservierung_id) AS reservierung_id,
-							MAX(r.insertamum) AS insertamum,
-							(array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
-						FROM block_keys bk
-							JOIN campus.tbl_reservierung r
-									ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
-						WHERE r.datum >= ? AND r.datum <= ?
-						GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
-					)
-				SELECT
-					b.*,
-					(b.datum + s_von.beginn) AS von,
-					(b.datum + s_bis.ende) AS bis
-				FROM blocks b
-						JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
-						JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
-				ORDER BY b.reservierung_id DESC;";
-
-		array_push($params, $von, $bis);
-		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
-
-
-		if (hasData($reservierung_data))
-		{
-			$data = getData($reservierung_data);
-
-			foreach($data as $block)
-			{
-
-				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
-
-				$this->SyncReservierungModel->db->where_in('reservierung_id', $ids);
-				$sync_result = $this->SyncReservierungModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'reservierung');
-					if ($kalender_id)
-					{
-						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'reservierung_id');
-
-					if ($block->insertamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateReservierungSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertReservierungSync($fehlende, $kalender_id);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Removes calendar entries created by the Stundenplan and Reservierung migrations,
-	 * so that both imports can be started from scratch.
-	 */
-	public function resetBeforeNewStundenplanReservierungImport()
-	{
-		
-		$db = new DB_Model();
-
-		$db->db->trans_start();
-
-		$db->db->query('DELETE FROM sync.tbl_stundenplandev_kalender');
-		$db->db->query('DELETE FROM sync.tbl_reservierung_kalender');
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_event_teilnehmer
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_event
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_lehreinheit
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'lehreinheit' OR typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_ort
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ IN ('lehreinheit', 'reservierung')
-			)");
-
-		$db->db->query("DELETE FROM public.tbl_notiz
-			WHERE notiz_id IN (
-				SELECT notiz_id
-				FROM public.tbl_notizzuordnung
-				WHERE eindeutige_kalender_gruppen_id IN (
-					SELECT eindeutige_kalender_gruppen_id
-					FROM lehre.tbl_kalender
-				)
-			)");
-
-		$db->db->query("DELETE FROM public.tbl_notizzuordnung
-			WHERE eindeutige_kalender_gruppen_id IN (
-				SELECT eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-			)");
-		
-		$db->db->query("DELETE FROM public.tbl_betriebsmittel_kalender
-			WHERE eindeutige_kalender_gruppen_id IN (
-				SELECT eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender
-			WHERE typ IN ('lehreinheit', 'reservierung')");
-
-		$db->db->trans_complete();
-
-		if ($db->db->trans_status() === false)
-			return error('Reset before new import failed');
-
-		return success('Migration data reset successfully');
-	}
-
-	public function migrateStundenplanBetriebsmittelEntries() {
-		$this->setKalendarEntriesGroupIDs();
-		$this->setKalendarEntriesGroupIDsForChildren();
-
-		$dbModel = new DB_Model();
-
-		$deleteOldImportedTempusEntriesQuery = "DELETE from lehre.tbl_betriebsmittel_kalender WHERE quelle != 'tempus_neu' OR quelle IS NULL;";
-		$createHelperTypeQuery = "DO $$
-			BEGIN
-				IF NOT EXISTS (
-					SELECT 1
-					FROM pg_type
-					WHERE typname = 'betriebsmittel_info'
-				) THEN
-					CREATE TYPE betriebsmittel_info AS (
-						betriebsmittel_id bigint,
-						insertamum timestamp,
-						insertvon text
-					);
-				END IF;
-			END $$;";
-		
-		$query = $deleteOldImportedTempusEntriesQuery . 
-				 $createHelperTypeQuery .
-		"WITH test AS (
-			SELECT 
-				tk.eindeutige_kalender_gruppen_id AS eindeutige_kalender_gruppen_id,
-				array_agg(tk.kalender_id),
-				array_agg(
-					ROW(tsb.betriebsmittel_id, tsb.insertamum, tsb.insertvon)::betriebsmittel_info
-				) AS betriebsmittel_data
-			FROM sync.tbl_stundenplandev_kalender AS sk
-			JOIN lehre.tbl_kalender tk ON tk.kalender_id = sk.kalender_id
-			JOIN lehre.tbl_stundenplan_betriebsmittel tsb ON tsb.stundenplandev_id = sk.stundenplandev_id 
-			GROUP BY tk.eindeutige_kalender_gruppen_id 
-			)
-			INSERT INTO lehre.tbl_betriebsmittel_kalender (
-				eindeutige_kalender_gruppen_id, 
-				betriebsmittel_id,
-				insertamum,
-				insertvon
-				)
-			SELECT
-				t.eindeutige_kalender_gruppen_id,
-				bm.betriebsmittel_id,
-				bm.insertamum,
-				bm.insertvon
-			FROM test t
-			CROSS JOIN LATERAL unnest(t.betriebsmittel_data) AS bm
-			ON CONFLICT (eindeutige_kalender_gruppen_id, betriebsmittel_id) DO NOTHING;
-			;";
-
-		$dbModel->db->query($query);
-	}
-
-	public function addTitleValuesAsTagsToKalenderEntries() {
-		$dbModel = new DB_Model();
-
-		
-		$query = "SELECT 
-				k.eindeutige_kalender_gruppen_id,
-				ARRAY_AGG(DISTINCT(spd.titel) ORDER BY spd.titel) AS titel,
-				MAX(spd.updateamum) AS updateamum
-			FROM lehre.tbl_stundenplandev spd
-			JOIN sync.tbl_stundenplandev_kalender spdk ON spd.stundenplandev_id = spdk.stundenplandev_id
-			JOIN lehre.tbl_kalender k ON k.kalender_id = spdk.kalender_id
-			WHERE k.typ = 'lehreinheit' AND k.eindeutige_kalender_gruppen_id IS NOT NULL AND spd.titel IS NOT NULL
-			GROUP BY k.eindeutige_kalender_gruppen_id";
-
-		$result = $dbModel->execReadOnlyQuery($query);
-
-		if (isError($result)) {
-			error("Error while fetching title values for adding as tags: " . getError($result));
-			return;
-		}
-		if (!hasData($result)) {
-			error("No title values found for adding as tags.");
-			return;
-		}
-
-		$data = getData($result);
-
-		foreach($data as $block) {
-			$eindeutige_kalender_gruppen_id = $block->eindeutige_kalender_gruppen_id;
-			$notizText = implode(' - ', array_filter($block->titel, function($titel) {
-				return !empty(trim($titel));
-			}));
-
-			if (!empty($notizText)) {
-				$this->addTag($eindeutige_kalender_gruppen_id, $notizText, $block->updateamum);
-			}
-		}
-	}
-
-	private function setKalendarEntriesGroupIDs() {
-		$dbModel = new DB_Model();
-
-		$query = "UPDATE lehre.tbl_kalender
-			SET eindeutige_kalender_gruppen_id = gen_random_uuid()
-			WHERE vorgaenger_kalender_id IS NULL
-			AND eindeutige_kalender_gruppen_id IS NULL;";
-
-		$dbModel->db->query($query);
-
-	}
-
-	private function setKalendarEntriesGroupIDsForChildren() {
-		$dbModel = new DB_Model();
-
-		$query = "WITH RECURSIVE tree AS 
-			(
-				SELECT
-					kalender_id,
-					vorgaenger_kalender_id,
-					kalender_id AS root_id,
-					eindeutige_kalender_gruppen_id as root_eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-				WHERE vorgaenger_kalender_id IS NULL
-
-				UNION ALL
-
-				SELECT
-					i.kalender_id,
-					i.vorgaenger_kalender_id,
-					t.root_id,
-					t.root_eindeutige_kalender_gruppen_id 
-				FROM lehre.tbl_kalender i
-				JOIN tree t
-				ON i.vorgaenger_kalender_id = t.kalender_id
-				where i.eindeutige_kalender_gruppen_id is NULL
-			
-			)
-			UPDATE lehre.tbl_kalender k
-			SET eindeutige_kalender_gruppen_id = t.root_eindeutige_kalender_gruppen_id
-			FROM tree t
-			WHERE k.kalender_id = t.kalender_id
-			AND k.eindeutige_kalender_gruppen_id IS NULL;";
-
-		$dbModel->db->query($query);
-	}
-	
-	private function _insertKalender($block, $typ)
-	{
-		$result = $this->KalenderModel->insert(
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'typ' => $typ,
-				'status_kurzbz'=> 'live',
-				'insertamum' => $block->insertamum,
-				'insertvon' => $block->insertvon,
-				'updateamum' => $block->updateamum ?? null,
-				'updatevon' => $block->updatevon ?? null
-			)
-		);
-		if(!isSuccess($result))
-			return null;
-
-		$kalender_id = getData($result);
-
-		if ($typ === 'lehreinheit')
-		{
-			$lehreinheit_ids = is_array($block->lehreinheit_id) ? $block->lehreinheit_id : explode(',', $block->lehreinheit_id);
-			foreach ($lehreinheit_ids as $lehreinheit_id)
-			{
-				$leResult = $this->KalenderLehreinheitModel->insert(
-					array (
-						'kalender_id' => $kalender_id,
-						'lehreinheit_id'=> $lehreinheit_id
-					)
-				);
-
-				if (!isSuccess($leResult))
-					return null;
-			}
-		}
-		else if ($typ === 'reservierung')
-		{
-			$eventResult = $this->KalenderEventModel->insert(array(
-				'kalender_id' => $kalender_id,
-				'titel' => $block->titel,
-				'beschreibung' => $block->beschreibung
-			));
-
-			if (!isSuccess($eventResult))
-				return null;
-
-			if ($block->insertvon)
-			{
-				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
-
-				if (hasData($user))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'uid' => getData($user)[0]->uid,
-						'rolle_kurzbz' => 'organisator'
-					));
-				}
-			}
-
-			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
-			foreach ($uids as $uid)
-			{
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'uid' => $uid,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-
-			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
-
-			if (isError($semester_range))
-				return null;
-
-			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
-
-			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
-
-			foreach ($gruppen as $gruppe_kurzbz)
-			{
-				$gruppe_kurzbz = trim($gruppe_kurzbz);
-				if (!empty($gruppe_kurzbz))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'gruppe_kurzbz' => $gruppe_kurzbz,
-						'studiengang_kz' => $block->studiengang_kz,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'rolle_kurzbz' => 'teilnehmer'
-					));
-				}
-			}
-
-			foreach ($block->svg_kombis as $kombi_str)
-			{
-				$kombi_str = trim($kombi_str, '()');
-				list($sem, $verb, $grp, $stg_kz) = explode(',', $kombi_str);
-
-				$sem = trim($sem) === '' ? null : trim($sem);
-				$verb = trim($verb) === '' ? null : trim($verb);
-				$grp = trim($grp) === '' ? null : trim($grp);
-				$stg_kz = trim($stg_kz) === '' ? null : trim($stg_kz);
-
-				if (is_null($sem) && is_null($verb) && is_null($grp) && is_null($stg_kz))
-					continue;
-
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'studiengang_kz' => $stg_kz,
-					'semester' => $sem,
-					'verband' => $verb,
-					'gruppe' => $grp,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-		}
-
-		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
-
-		foreach ($orte as $ort)
-		{
-			$ort = trim($ort);
-			if (!empty($ort))
-			{
-				$this->KalenderOrtModel->insert(
-					array (
-						'kalender_id' => $kalender_id,
-						'ort_kurzbz' => $ort
-					)
-				);
-			}
-		}
-
-		return $kalender_id;
-	}
-
-	private function _insertSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->insert(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-	private function _insertReservierungSync($ids, $kalender_id)
-	{
-
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->insert(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateKalender($kalender_id, $block)
-	{
-		$this->KalenderModel->update(
-			array (
-				'kalender_id' => $kalender_id
-			),
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'updateamum'=> $block->updateamum,
-				'updatevon' => $block->updatevon
-			)
-		);
-
-		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
-		$orte = array_filter(array_map('trim', $orte));
-
-		$this->KalenderOrtModel->delete(array('kalender_id' => $kalender_id));
-
-		foreach ($orte as $ort)
-		{
-			$this->KalenderOrtModel->insert(
-				array (
-					'kalender_id' => $kalender_id,
-					'ort_kurzbz' => $ort
-				)
-			);
-		}
-	}
-
-	private function _updateSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->update(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateReservierungSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->update(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function addTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem): bool
-	{
-		$notizType = 'hinweis';
-		$insertvonMockUser = 'oldToNewTempusMigration';
-		
-		if (is_null($eindeutige_kalender_gruppen_id) || empty($eindeutige_kalender_gruppen_id)) {
-			var_dump("Error: eindeutige_kalender_gruppen_id is null or empty.");
-			return false;
-		}
-
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		$checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $notizType));
-
-		if (isError($checkTyp))
-		{
-			error("Error occurred while checking Notiztyp: " . $checkTyp->message);
-			return false;
-		}
-
-		if (!hasData($checkTyp))
-		{
-			error("Notiztyp 'hinweis' does not exist. Please create it before adding tags.");
-			return false;
-		}
-		 
-
-		$this->NotizzuordnungModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_notizzuordnung.notiz_id', 'LEFT');
-		$this->NotizzuordnungModel->db->where('tbl_notiz.typ', $notizType);
-		$this->NotizzuordnungModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
-		$oldNotizZuordnung = $this->NotizzuordnungModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
-		if (isError($oldNotizZuordnung))
-		{
-			error("Error occurred while checking Notizzuordnung: " . $oldNotizZuordnung->message);
-			return false;
-		}
-		if (hasData($oldNotizZuordnung))
-		{
-			return $this->updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem);
-		}
-
-		
-		$insertResult = $this->NotizModel->insert(array(
-			'titel' => 'TAG',
-			'text' => $notizText,
-			'verfasser_uid' => null,
-			'erledigt' => false,
-			'insertamum' => date('Y-m-d H:i:s'),
-			'insertvon' => $insertvonMockUser,
-			'typ' => $notizType
-		));
-
-		if (isError($insertResult))
-		{
-			error("Error occurred while inserting Notiz: " . $insertResult->message);
-			return false;
-		}
-
-		$insertZuordnung = $this->NotizzuordnungModel->insert(array(
-			'notiz_id' => $insertResult->retval,
-			'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id
-		));
-
-		if (isError($insertZuordnung)) 
-		{
-			error("Error occurred while inserting Notizzuordnung: " . $insertZuordnung->message);
-			return false;
-		}
-
-		return true;
-	}
-
-	private function updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem)
-	{
-		$notizType = 'hinweis';
-		$insertvonMockUser = 'oldToNewTempusMigration';
-		
-		$this->NotizzuordnungModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_notizzuordnung.notiz_id', 'LEFT');
-		$this->NotizzuordnungModel->db->where('tbl_notiz.typ', $notizType);
-		$this->NotizzuordnungModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
-		$notizZuordnungRes = $this->NotizzuordnungModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
-		if (isError($notizZuordnungRes))
-		{
-			error("Error occurred while loading Notizzuordnung: " . $notizZuordnungRes->message);
-			return false;
-		}
-
-
-		$tag = $this->NotizModel->loadWhere(array('notiz_id' => $notizZuordnungRes->retval[0]->notiz_id));
-		if (isError($tag))
-		{
-			error("Error occurred while loading Notiz: " . $tag->message);
-			return false;
-		}
-
-		if (!hasData($tag))
-		{
-			error("Error occurred while loading Notiz: " . $tag->message);
-			return false;
-		}
-
-		$adjustedLastUpdatedInOldSystem = date('Y-m-d H:i:s', strtotime($lastUpdatedInOldSystem) + 5);
-		if ($tag->retval[0]->updateamum >= $adjustedLastUpdatedInOldSystem)
-		{
-			return true;
-		}
-
-		$updateData = $this->NotizModel->update(array('notiz_id' => $tag->retval[0]->notiz_id),
-			array('text' => $notizText,
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => $insertvonMockUser,
-				'bearbeiter_uid' => null,
-			)
-		);
-		if (isError($updateData))
-		{
-			error("Error occurred while updating Notiz: " . $updateData->message);
-			return false;
-		}
-
-		return true;
-	}
-}

application/core/ICollisionCheck.php

@@ -1,10 +0,0 @@
-<?php
-interface ICollisionCheck
-{
-	public function getName();
-
-	public function check($data);
-
-	public function checkAll($kalender_ids);
-
-}

application/core/Notiz_Controller.php

@@ -417,7 +417,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');

application/core/Tag_Controller.php

@@ -38,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))
@@ -64,7 +62,7 @@ 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.erledigt as done,
@@ -89,12 +87,9 @@ class Tag_Controller extends FHCAPI_Controller
 
 	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,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung,
 			style,
 			beschreibung,
 			tag
@@ -111,36 +106,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$notiztypen = $this->NotiztypModel->loadWhere(array('aktiv' => true));
 		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
 	}
-	public function getTagsByAssignmentTypeValue($zuordnung_typ, $zuordnung_id, $tags = null)
-	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
 
-		$this->NotizzuordnungModel->addSelect(
-			'tbl_notizzuordnung.notiz_id as notiz_id,
-			typ_kurzbz as tag_typ_kurzbz,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as bezeichnung,
-			style,
-			beschreibung,
-			tag,
-			tbl_notiz.erledigt as done
-			'
-		);
-		
-		if (is_array($tags) && !isEmptyArray($tags))
-		{
-			$tags = $this->_filterTag($tags, false);
-			$this->NotizzuordnungModel->db->where_in('tbl_notiz_typ.typ_kurzbz', $tags);
-		}
-
-		$this->NotizzuordnungModel->addJoin('public.tbl_notiz', 'public.tbl_notizzuordnung.notiz_id = public.tbl_notiz.notiz_id');
-		$this->NotizzuordnungModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
-
-		$this->NotizzuordnungModel->addOrder('prioritaet');
-
-		$notiztypen = $this->NotizzuordnungModel->loadWhere(array('aktiv' => true, $zuordnung_typ => $zuordnung_id));
-		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
-	}
 	public function addTag($withZuordnung = true, $updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
@@ -160,7 +126,7 @@ class Tag_Controller extends FHCAPI_Controller
 			if (!in_array($postData->tag_typ_kurzbz, $tags))
 				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
 		}
-		
+
 		if ($withZuordnung)
 		{
 			$return = array();
@@ -169,7 +135,7 @@ class Tag_Controller extends FHCAPI_Controller
 				$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
 
 			$values = array_unique($postData->values);
-			
+
 			foreach ($values as $value)
 			{
 				$insertResult = $this->addNotiz($postData);

application/helpers/hlp_common_helper.php

@@ -570,13 +570,3 @@ function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $ord
 		];
 
 }
-
-function generateUUID()
-{
-	$data = openssl_random_pseudo_bytes(16);
-
-	$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
-	$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
-
-	return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
-}

application/helpers/hlp_header_helper.php

@@ -111,7 +111,9 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'theme' => [
 			'name'=>$ci->config->item('theme_name'),
 			'modes'=>$ci->config->item('theme_modes'),
-		]
+		],
+		'fhcomplete_build_version' => $ci->config->item('fhcomplete_build_version'),
+		'use_fhcomplete_build_version_in_path' => $ci->config->item('use_fhcomplete_build_version_in_path'),
 	);
 
 	$toPrint = "\n";
@@ -178,6 +180,8 @@ function generateJSModulesInclude($JSModules)
 
 	$ci =& get_instance();
 	$cachetoken = '?'.$ci->config->item('fhcomplete_build_version');
+	$ci->load->config('javascript');
+	$use_bundled_javascript = $ci->config->item('use_bundled_javascript');
 
 	if (isset($JSModules))
 	{
@@ -185,14 +189,20 @@ function generateJSModulesInclude($JSModules)
 
 		for ($tmpJSsCounter = 0; $tmpJSsCounter < count($tmpJSs); $tmpJSsCounter++)
 		{
+			$item = $tmpJSs[$tmpJSsCounter];
+			if($use_bundled_javascript && preg_match('#/js/apps/#', $item))
+			{
+				$item = preg_replace('#^public/#', 'public/dist/', $item);
+			}
+			echo "<!--{$item}-->".PHP_EOL;
 			if($ci->config->item('use_fhcomplete_build_version_in_path'))
 			{
-				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $tmpJSs[$tmpJSsCounter]);
+				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $item);
 				$toPrint = sprintf($jsInclude, base_url($relurl)).PHP_EOL;
 			}
 			else
 			{
-				$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+				$toPrint = sprintf($jsInclude, base_url($item.$cachetoken)).PHP_EOL;
 			}
 
 			if ($tmpJSsCounter > 0) $toPrint = "\t\t".$toPrint;

application/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,
@@ -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/CollisionChecker.php

@@ -1,74 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class CollisionChecker
-{
-	private $_checks = [];
-
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->library('collision/checks/RoomCollisionCheck', ['uid' => $this->_uid]);
-		$this->_ci->load->library('collision/checks/LectureCollisionCheck', ['uid' => $this->_uid]);
-		$this->_ci->load->library('collision/checks/VerbandCollisionCheck', ['uid' => $this->_uid]);
-		$this->_ci->load->library('collision/checks/StudentCollisionCheck', ['uid' => $this->_uid]);
-		$this->_ci->load->library('collision/checks/ResourcesCollisionCheck', ['uid' => $this->_uid]);
-		$this->register($this->_ci->roomcollisioncheck);
-		$this->register($this->_ci->lecturecollisioncheck);
-		$this->register($this->_ci->verbandcollisioncheck);
-		$this->register($this->_ci->studentcollisioncheck);
-		$this->register($this->_ci->resourcescollisioncheck);
-		Events::trigger('collision_register', $this);
-	}
-
-	public function register(ICollisionCheck $check)
-	{
-		$this->_checks[$check->getName()] = $check;
-	}
-
-	public function run($data)
-	{
-		$errors = [];
-
-		foreach ($this->_checks as $check)
-		{
-			$result = $check->check($data);
-
-			if (!empty($result))
-			{
-				$errors = array_merge($errors, $result);
-			}
-		}
-
-		return $errors;
-	}
-
-	public function runAll($kalender_ids)
-	{
-		$results = array_fill_keys($kalender_ids, []);
-
-		foreach ($this->_checks as $check)
-		{
-			$batchResult = $check->checkAll($kalender_ids);
-			foreach ($batchResult as $kalender_id => $errors)
-			{
-				$results[$kalender_id] = array_merge($results[$kalender_id], $errors);
-			}
-		}
-
-		return $results;
-	}
-}

application/libraries/ExtensionsLib.php

@@ -42,7 +42,7 @@ class ExtensionsLib
 	// Directories that are part of the extension archive
 	private $SOFTLINK_TARGET_DIRECTORIES = array(
 		APPPATH => array('config', 'components', 'controllers', 'helpers', 'hooks', 'libraries', 'models', 'views', 'widgets'),
-		DOC_ROOT => array('public')
+		DOC_ROOT => array('public', 'public/dist')
 	);
 
 	private $_errorOccurred; // boolean, true if an error occurred while installing an extension

application/libraries/KalenderNotificationLib.php

@@ -1,170 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-class KalenderNotificationLib
-{
-	private $_ci;
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->library('MailLib');
-		$this->_ci->load->config('tempus');
-
-	}
-
-	public function sendMails($mail_infos)
-	{
-		if (!$this->_ci->config->item('send_update_mails'))
-			return true;
-
-		$lektor_added = array();
-		$lektor_changed = array();
-		$lektor_deleted = array();
-
-		$student_added = array();
-		$student_changed = array();
-		$student_deleted = array();
-
-		foreach ($mail_infos as $info)
-		{
-			$entry = $info['entry'];
-			$new_status = $info['new_status'];
-			$notify = $info['notify'];
-
-			$old_entry = null;
-			if ($entry->vorgaenger_kalender_id)
-			{
-				$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-				$vorgaenger = $this->_ci->KalenderModel->load(array('tbl_kalender.kalender_id' => $entry->vorgaenger_kalender_id));
-				if (hasData($vorgaenger))
-					$old_entry = getData($vorgaenger)[0];
-			}
-
-			if ($new_status === 'deleted')
-				$row = $this->_buildMailDeleted($entry);
-			else if ($old_entry)
-				$row = $this->_buildMailChanged($old_entry, $entry);
-			else
-				$row = $this->_buildMailNew($entry);
-
-			if (in_array('lektor', $notify))
-			{
-				if ($new_status === 'deleted')
-					$lektor_deleted[] = $row;
-				else if ($old_entry)
-					$lektor_changed[] = $row;
-				else
-					$lektor_added[] = $row;
-			}
-
-			if (in_array('student', $notify))
-			{
-				if ($new_status === 'deleted')
-					$student_deleted[] = $row;
-				else if ($old_entry)
-					$student_changed[] = $row;
-				else
-					$student_added[] = $row;
-			}
-		}
-
-		$lektor_entries = '';
-		$student_entries = '';
-
-		if (!empty($lektor_added))
-			$lektor_entries .= $this->_addToList($lektor_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($lektor_changed))
-			$lektor_entries .= $this->_addToList($lektor_changed, 'geändert') . '<hr/>';
-
-		if (!empty($lektor_deleted))
-			$lektor_entries .= $this->_addToList($lektor_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($student_added))
-			$student_entries .= $this->_addToList($student_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($student_changed))
-			$student_entries .= $this->_addToList($student_changed, 'geändert') . '<hr/>';
-
-		if (!empty($student_deleted))
-			$student_entries .= $this->_addToList($student_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($lektor_entries))
-			$this->_ci->maillib->send('', '[email protected]', 'Lektor Tempus Update', $lektor_entries);
-		if (!empty($student_entries))
-			$this->_ci->maillib->send('', '[email protected]', 'Student Tempus Update', $student_entries);
-	}
-
-	private function _addToList($entries, $status)
-	{
-		return 'Folgende Einträge wurden <b>'. $status .'</b>: <ul>' . implode('', $entries) . '</ul>';
-
-	}
-	private function _buildMailNew($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li>
-					<b>Kalender ID ' . ($entry->kalender_id ?? '-') . '</b>
-					<ul>
-						<li><b>Uhrzeit:</b> ' . $von . ' - ' . $bis . '</li>
-						<li><b>Ort:</b> ' . ($entry->ort_kurzbz ?? '-') . '</li>
-					</ul>
-				</li>';
-	}
-
-	private function _buildMailChanged($old_entry, $new_entry)
-	{
-		$old_von = date('d.m.Y H:i', strtotime($old_entry->von));
-		$old_bis = date('H:i', strtotime($old_entry->bis));
-		$new_von = date('d.m.Y H:i', strtotime($new_entry->von));
-		$new_bis = date('H:i', strtotime($new_entry->bis));
-
-		$old_ort = $old_entry->ort_kurzbz ?? '-';
-		$new_ort = $new_entry->ort_kurzbz ?? '-';
-
-		$uhrzeit_changed = ($old_von . $old_bis) !== ($new_von . $new_bis);
-		$ort_changed = $old_ort !== $new_ort;
-
-		$changes = '';
-
-		if ($uhrzeit_changed)
-		{
-			$changes .= '<li>
-							<b>Uhrzeit:</b>
-							<s style="color:red;">' . $old_von . ' - ' . $old_bis . '</s>
-							<span style="color:green;">' . $new_von . ' - ' . $new_bis . '</span>
-						</li>';
-		}
-
-		if ($ort_changed)
-		{
-			$changes .= '<li>
-				<b>Ort:</b>
-				<s style="color:red;">' . $old_ort . '</s>
-				<span style="color:green;">' . $new_ort . '</span>
-			</li>';
-		}
-
-		return '<li>
-					<b>Kalender ID ' . ($new_entry->kalender_id ?? '-') . '</b>
-					<ul>' . $changes . '</ul>
-				</li>';
-	}
-
-	private function _buildMailDeleted($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li style="color:red;">
-					<b><s>Kalender ID ' . ($entry->kalender_id ?? '-') . '</s></b>
-					<ul>
-						<li><s>' . $von . ' - ' . $bis . '</s></li>
-						<li><s>' . ($entry->ort_kurzbz ?? '-') . '</s></li>
-					</ul>
-				</li>';
-	}
-}

application/libraries/LvPlanCSVLib.php

@@ -1,420 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class LvPlanCSVLib
-{
-	const TARGET_OUTLOOK = 'outlook';
-
-	const GENERIC_HEADER = array(
-		'title',
-		'category',
-		'location',
-		'description',
-		'keywords',
-		'start_date',
-		'start_time',
-		'end_date',
-		'end_time',
-		'alarm',
-		'recur_type',
-		'recur_end_date',
-		'recur_interval',
-		'recur_data'
-	);
-
-	const OUTLOOK_HEADER = array(
-		'Betreff',
-		'Beginnt am',
-		'Beginnt um',
-		'Endet am',
-		'Endet um',
-		'Ganztaegiges Ereignis',
-		'Erinnerung Ein/Aus',
-		'Erinnerung am',
-		'Erinnerung um',
-		'Besprechungsplanung',
-		'Erforderliche Teilnehmer',
-		'Optionale Teilnehmer',
-		'Besprechungsressourcen',
-		'Abrechnungsinformationen',
-		'Beschreibung',
-		'Kategorien',
-		'Ort',
-		'Priorität',
-		'Privat',
-		'Reisekilometer',
-		'Vertraulichkeit',
-		'Zeitspanne zeigen als'
-	);
-
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-	}
-
-	/**
-	 * Builds CSV content for a user's timetable.
-	 *
-	 * @param string $uid User UID.
-	 * @param int $begin First included date as Unix timestamp.
-	 * @param int $ende Last included date as Unix timestamp.
-	 * @param string $type Timetable type (student, lektor, ort or verband).
-	 * @param string|null $target Optional CSV target (outlook).
-	 * @param string|null $ortKurzbz Room identifier for room plans.
-	 * @param array|null $verbandFilters Lehrverband filters.
-	 * @return string
-	 */
-	public function getContent(
-		$uid,
-		$begin,
-		$ende,
-		$type,
-		$target = null,
-		$ortKurzbz = null,
-		$verbandFilters = null
-	) {
-		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			throw new InvalidArgumentException('Unsupported timetable type');
-		if ($target !== null && $target !== self::TARGET_OUTLOOK)
-			throw new InvalidArgumentException('Unsupported CSV target');
-		if ($type === 'ort' && (!is_string($ortKurzbz) || $ortKurzbz === ''))
-			throw new InvalidArgumentException('Missing room timetable filter');
-		if ($type === 'verband'
-			&& (!is_array($verbandFilters)
-				|| !array_key_exists('stg_kz', $verbandFilters)
-				|| !array_key_exists('sem', $verbandFilters)))
-		{
-			throw new InvalidArgumentException('Missing Lehrverband timetable filters');
-		}
-
-		$isLecturer = $type === 'lektor';
-		$this->ci->load->library('KalenderLib', array('uid' => $uid));
-
-		$startDate = date('Y-m-d', $begin);
-		$endDate = date('Y-m-d', $ende);
-
-		if ($type === 'verband')
-		{
-			$events = $this->ci->kalenderlib->getPlanForVerband(
-				$startDate,
-				$endDate,
-				$verbandFilters['stg_kz'],
-				$verbandFilters['sem'],
-				isset($verbandFilters['ver']) ? $verbandFilters['ver'] : null,
-				isset($verbandFilters['grp']) ? $verbandFilters['grp'] : null
-			);
-		}
-		elseif ($type === 'ort')
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForRoom($startDate, $endDate, $ortKurzbz);
-		}
-		elseif ($isLecturer)
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForLecturerByLecturer($startDate, $endDate, $uid);
-		}
-		else
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForStudentByStudent($startDate, $endDate, $uid);
-		}
-
-		if (!is_array($events))
-			$events = array();
-
-		$content = $this->buildCSVLine(
-			$target === self::TARGET_OUTLOOK ? self::OUTLOOK_HEADER : self::GENERIC_HEADER
-		);
-
-		foreach ($events as $event)
-		{
-			$eventData = $this->getEventData($event, $type);
-			if ($eventData === null)
-				continue;
-
-			$content .= $this->buildCSVLine(
-				$target === self::TARGET_OUTLOOK
-					? $this->buildOutlookRow($eventData)
-					: $this->buildGenericRow($eventData)
-			);
-		}
-
-		return $content;
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return array|null Normalized CSV values or null for invalid dates.
-	 */
-	private function getEventData($event, $type = null)
-	{
-		$start = $this->createDateTime(isset($event->isostart) ? $event->isostart : null);
-		$end = $this->createDateTime(isset($event->isoend) ? $event->isoend : null);
-
-		if ($start === null || $end === null)
-			return null;
-
-		$timezone = new DateTimeZone('Europe/Vienna');
-		$start->setTimezone($timezone);
-		$end->setTimezone($timezone);
-
-		$isReservation = isset($event->type) && $event->type === 'reservierung';
-		
-		$title = $isReservation
-			? (isset($event->titel) ? $event->titel : '')
-			: $this->joinValues(isset($event->topic) ? $event->topic : array());
-		if ($type === 'verband') {
-			$title = '';
-		}
-
-		$location = $this->joinValues(
-			isset($event->ort_kurzbz) ? $event->ort_kurzbz : array(),
-			' / '
-		);
-
-		$description = $this->getDescription(
-			$event,
-			$isReservation
-		);
-
-		return array(
-			'title' => $title,
-			'location' => $location,
-			'description' => $description,
-			'start_date' => $start->format('d.m.Y'),
-			'start_time' => $start->format('H:i:s'),
-			'end_date' => $end->format('d.m.Y'),
-			'end_time' => $end->format('H:i:s')
-		);
-	}
-
-	/**
-	 * Builds a localized event description from populated event details.
-	 *
-	 * @param object $event Calendar event.
-	 * @param bool $isReservation Whether the event is a reservation.
-	 * @param string $participants Participant abbreviations.
-	 * @param string $lecturers Lecturer abbreviations.
-	 * @param string $groups Participant group labels.
-	 * @return string Description lines separated by CRLF.
-	 */
-	private function getDescription($event, $isReservation)
-	{
-		$groups = $this->getGroups($event);
-		$lecturers = $this->getLecturers($event);
-		$participants = $this->getParticipants($event);
-
-		$parts = array();
-		if ($isReservation)
-		{
-			if ($participants !== '')
-				$parts[] = $this->ci->p->t('ui', 'teilnehmende').': '.$participants;
-		}
-		else
-		{
-			$subject = isset($event->lehrfach_bez) ? $event->lehrfach_bez : '';
-
-			if ($subject !== '')
-				$parts[] = $this->ci->p->t('global', 'lehrfach').': '.$subject;
-			if ($lecturers !== '')
-				$parts[] = $this->ci->p->t('lehre', 'lektorInnen').': '.$lecturers;
-		}
-
-		if ($groups !== '')
-			$parts[] = $this->ci->p->t('global', 'gruppen').': '.$groups;
-
-		$description = isset($event->beschreibung) ? $event->beschreibung : '';
-		if ($description !== '')
-			$parts[] = $this->ci->p->t('global', 'beschreibung').': '.$description;
-
-		return implode("\r\n", $parts);
-	}
-
-	/**
-	 * @param array $eventData Normalized event values.
-	 * @return array Generic CSV row.
-	 */
-	private function buildGenericRow(array $eventData)
-	{
-		$category = defined('LVPLAN_KATEGORIE') ? LVPLAN_KATEGORIE : 'StundenplanTW';
-
-		return array(
-			$eventData['title'],
-			$category,
-			$eventData['location'],
-			$eventData['description'],
-			'Stundenplan',
-			$eventData['start_date'],
-			$eventData['start_time'],
-			$eventData['end_date'],
-			$eventData['end_time'],
-			'',
-			'',
-			'',
-			'',
-			''
-		);
-	}
-
-	/**
-	 * @param array $eventData Normalized event values.
-	 * @return array Outlook CSV row.
-	 */
-	private function buildOutlookRow(array $eventData)
-	{
-		$subject = $eventData['title'];
-
-		return array(
-			$subject,
-			$eventData['start_date'],
-			$eventData['start_time'],
-			$eventData['end_date'],
-			$eventData['end_time'],
-			'Aus',
-			'Aus',
-			'',
-			'',
-			'',
-			'',
-			'',
-			'',
-			'',
-			$eventData['description'],
-			'StundenplanFH',
-			$eventData['location'],
-			'Normal',
-			'Aus',
-			'',
-			'Normal',
-			'2'
-		);
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Lecturer abbreviations.
-	 */
-	private function getLecturers($event)
-	{
-		$lecturers = array();
-
-		if (isset($event->lektor) && is_array($event->lektor))
-		{
-			foreach ($event->lektor as $lecturer)
-			{
-				if (isset($lecturer['kurzbz']) && $lecturer['kurzbz'] !== '')
-					$lecturers[] = $lecturer['kurzbz'];
-			}
-		}
-
-		sort($lecturers, SORT_NATURAL | SORT_FLAG_CASE);
-		
-		return implode(' / ', array_unique($lecturers));
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Participant group labels.
-	 */
-	private function getGroups($event)
-	{
-		$groups = array();
-
-		if (isset($event->gruppe) && is_array($event->gruppe))
-		{
-			foreach ($event->gruppe as $group)
-			{
-				if (isset($group['bezeichnung']) && $group['bezeichnung'] !== '')
-					$groups[] = $group['bezeichnung'];
-			}
-		}
-
-		if (isset($event->teilnehmer_gruppe) && is_array($event->teilnehmer_gruppe))
-		{
-			foreach ($event->teilnehmer_gruppe as $group)
-			{
-				if (isset($group['gruppe_kurzbz']) && $group['gruppe_kurzbz'] !== '')
-					$groups[] = $group['gruppe_kurzbz'];
-			}
-		}
-
-		sort($groups, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(' / ', array_unique($groups));
-	}
-
-	/**
-	 * @param mixed $value String or list of strings.
-	 * @param string $separator Join separator.
-	 * @return string
-	 */
-	private function joinValues($value, $separator = ' / ')
-	{
-		return is_array($value) ? implode($separator, $value) : (string)$value;
-	}
-
-	/**
-	 * Builds one fully quoted RFC-style CSV row.
-	 *
-	 * @param array $values Row values.
-	 * @return string
-	 */
-	private function buildCSVLine(array $values)
-	{
-		$escapedValues = array_map(function ($value) {
-			$value = preg_replace('/\r\n|\r|\n/', "\r\n", (string)$value);
-			return '"'.str_replace('"', '""', $value).'"';
-		}, $values);
-
-		return implode(',', $escapedValues)."\r\n";
-	}
-
-	/**
-	 * @param mixed $dateTime Date/time input.
-	 * @return DateTime|null
-	 */
-	private function createDateTime($dateTime)
-	{
-		if ($dateTime instanceof DateTime)
-			return clone $dateTime;
-
-		if ($dateTime === null || $dateTime === '')
-			return null;
-
-		try
-		{
-			if (is_numeric($dateTime))
-				return new DateTime('@'.(int)$dateTime);
-
-			return new DateTime($dateTime);
-		}
-		catch (Exception $e)
-		{
-			return null;
-		}
-	}
-
-	private function getParticipants($event)
-	{
-		$values = array();
-		if (!isset($event->teilnehmer_person) || !is_array($event->teilnehmer_person))
-			return '';
-
-		foreach ($event->teilnehmer_person as $participant)
-		{
-			$value = $participant['kurzbz'];
-
-			if ($value !== '')
-				$values[] = $value;
-		}
-
-		sort($values, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($values));
-	}
-}

application/libraries/LvPlanExcelLib.php

@@ -1,473 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/Excel/excel.php');
-
-class LvPlanExcelLib
-{
-	const WORKSHEET_NAME = 'Termine';
-
-	const HEADER = array(
-		'Datum',
-		'Von',
-		'Bis',
-		'Ort',
-		'Lektoren',
-		'Gruppen',
-		'Lehrfach',
-		'Anmerkung',
-		'StundeVon',
-		'StundeBis'
-	);
-
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-	}
-
-	/**
-	 * Builds a BIFF8 Excel workbook for a user's timetable.
-	 *
-	 * @param string $uid User UID.
-	 * @param int $begin First included date as Unix timestamp.
-	 * @param int $ende Last included date as Unix timestamp.
-	 * @param string $type Timetable type (student, lektor, ort or verband).
-	 * @param string|null $ortKurzbz Room identifier for room plans.
-	 * @param array|null $verbandFilters Lehrverband filters.
-	 * @return string Binary workbook content.
-	 */
-	public function getContent(
-		$uid,
-		$begin,
-		$ende,
-		$type,
-		$ortKurzbz = null,
-		$verbandFilters = null
-	) {
-		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			throw new InvalidArgumentException('Unsupported timetable type');
-		if ($type === 'ort' && (!is_string($ortKurzbz) || $ortKurzbz === ''))
-			throw new InvalidArgumentException('Missing room timetable filter');
-		if ($type === 'verband'
-			&& (!is_array($verbandFilters)
-				|| !array_key_exists('stg_kz', $verbandFilters)
-				|| !array_key_exists('sem', $verbandFilters)))
-		{
-			throw new InvalidArgumentException('Missing Lehrverband timetable filters');
-		}
-
-		$isLecturer = $type === 'lektor';
-		$this->ci->load->library('KalenderLib', array('uid' => $uid));
-		$this->ci->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$startDate = date('Y-m-d', $begin);
-		$endDate = date('Y-m-d', $ende);
-
-		if ($type === 'verband')
-		{
-			$events = $this->ci->kalenderlib->getPlanForVerband(
-				$startDate,
-				$endDate,
-				$verbandFilters['stg_kz'],
-				$verbandFilters['sem'],
-				isset($verbandFilters['ver']) ? $verbandFilters['ver'] : null,
-				isset($verbandFilters['grp']) ? $verbandFilters['grp'] : null
-			);
-		}
-		elseif ($type === 'ort')
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForRoom($startDate, $endDate, $ortKurzbz);
-		}
-		elseif ($isLecturer)
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForLecturerByLecturer($startDate, $endDate, $uid);
-		}
-		else
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForStudentByStudent($startDate, $endDate, $uid);
-		}
-
-		if (!is_array($events))
-			$events = array();
-
-		usort($events, array($this, 'compareEventsByStart'));
-		$hourRaster = $this->loadHourRaster();
-		$rows = array();
-
-		foreach ($events as $event)
-		{
-			$row = $this->buildEventRow($event, $hourRaster);
-			if ($row !== null)
-				$rows[] = $row;
-		}
-
-		return $this->buildWorkbook($rows);
-	}
-
-	/**
-	 * @return array Timetable-hour raster ordered by hour number.
-	 */
-	private function loadHourRaster()
-	{
-		$this->ci->StundeModel->addSelect('stunde, beginn, ende');
-		$this->ci->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->ci->StundeModel->load();
-
-		if (isError($result))
-			throw new RuntimeException(getError($result));
-
-		if (!hasData($result))
-			return array();
-
-		$raster = array();
-		foreach (getData($result) as $hour)
-		{
-			$begin = $this->timeToSeconds($hour->beginn);
-			$end = $this->timeToSeconds($hour->ende);
-
-			if ($begin === null || $end === null)
-				continue;
-
-			$raster[] = array(
-				'stunde' => $hour->stunde,
-				'begin' => $begin,
-				'end' => $end
-			);
-		}
-
-		return $raster;
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @param array $hourRaster Timetable-hour raster.
-	 * @return array|null Excel row or null for invalid dates.
-	 */
-	private function buildEventRow($event, array $hourRaster)
-	{
-		$start = $this->createDateTime(isset($event->isostart) ? $event->isostart : null);
-		$end = $this->createDateTime(isset($event->isoend) ? $event->isoend : null);
-
-		if ($start === null || $end === null)
-			return null;
-
-		$timezone = new DateTimeZone('Europe/Vienna');
-		$start->setTimezone($timezone);
-		$end->setTimezone($timezone);
-
-		$isReservation = isset($event->type) && $event->type === 'reservierung';
-		$subject = $this->getSubject($event);
-
-		$note = isset($event->beschreibung) ? $event->beschreibung : '';
-		if ($note === '' && isset($event->titel) && !$isReservation)
-			$note = $event->titel;
-
-		return array(
-			$start->format('d.m.Y'),
-			$start->format('H:i:s'),
-			$end->format('H:i:s'),
-			$this->joinValues(isset($event->ort_kurzbz) ? $event->ort_kurzbz : array()),
-			!$isReservation ? $this->getParticipants($event) : $this->getLecturers($event),
-			$this->getGroups($event),
-			$subject,
-			$note,
-			$this->findHour($start->format('H:i:s'), $hourRaster, "start"),
-			$this->findHour($end->format('H:i:s'), $hourRaster, "end")
-		);
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Event subject.
-	 */
-	private function getSubject($event)
-	{
-		if (isset($event->type) && $event->type === 'reservierung')
-		{
-			return isset($event->titel) ? $event->titel : '';
-		}
-
-		$subject = isset($event->lehrfach_bez) ? $event->lehrfach_bez : '';
-
-		if ($subject === '')
-			$subject = $this->joinValues(isset($event->topic) ? $event->topic : array());
-
-		return $subject;
-	}
-
-	/**
-	 * @param array $rows Workbook rows.
-	 * @return string Binary BIFF8 workbook content.
-	 */
-	private function buildWorkbook(array $rows)
-	{
-		$tempFile = tempnam(sys_get_temp_dir(), 'lvplan_excel_');
-		if ($tempFile === false)
-			throw new RuntimeException('Could not create temporary Excel file');
-
-		try
-		{
-			$workbook = new Spreadsheet_Excel_Writer($tempFile);
-			$workbook->setVersion(8);
-			$workbook->setTempDir(sys_get_temp_dir());
-
-			$worksheet =& $workbook->addWorksheet(self::WORKSHEET_NAME);
-			$worksheet->setInputEncoding('utf-8');
-
-			$boldFormat =& $workbook->addFormat();
-			$boldFormat->setBold();
-
-			$maxLengths = array();
-			foreach (self::HEADER as $column => $title)
-			{
-				$worksheet->writeString(0, $column, $title, $boldFormat);
-				$maxLengths[$column] = $this->getMaxLineLength($title);
-			}
-
-			foreach ($rows as $rowIndex => $row)
-			{
-				foreach ($row as $column => $value)
-				{
-					$value = (string)$value;
-					$worksheet->writeString($rowIndex + 1, $column, $value);
-					$maxLengths[$column] = max(
-						$maxLengths[$column],
-						$this->getMaxLineLength($value)
-					);
-				}
-			}
-
-			foreach ($maxLengths as $column => $length)
-				$worksheet->setColumn($column, $column, min($length + 2, 255));
-
-			$result = $workbook->close();
-			if ($result !== true)
-				throw new RuntimeException('Could not generate Excel workbook');
-
-			$content = file_get_contents($tempFile);
-			if ($content === false)
-				throw new RuntimeException('Could not read generated Excel workbook');
-
-			return $content;
-		}
-		finally
-		{
-			if (is_file($tempFile))
-				unlink($tempFile);
-		}
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Lecturer names.
-	 */
-	private function getLecturers($event)
-	{
-		$lecturers = array();
-
-		if (isset($event->lektor) && is_array($event->lektor))
-		{
-			foreach ($event->lektor as $lecturer)
-			{
-				$name = trim(
-					(isset($lecturer['vorname']) ? $lecturer['vorname'] : '').' '
-					.(isset($lecturer['nachname']) ? $lecturer['nachname'] : '')
-				);
-
-				if ($name === '' && isset($lecturer['kurzbz']))
-					$name = $lecturer['kurzbz'];
-				if ($name !== '')
-					$lecturers[] = $name;
-			}
-		}
-
-		sort($lecturers, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($lecturers));
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Participant group labels.
-	 */
-	private function getGroups($event)
-	{
-		$groups = array();
-
-		if (isset($event->gruppe) && is_array($event->gruppe))
-		{
-			foreach ($event->gruppe as $group)
-			{
-				if (isset($group['bezeichnung']) && $group['bezeichnung'] !== '')
-					$groups[] = $group['bezeichnung'];
-			}
-		}
-
-		if (isset($event->teilnehmer_gruppe) && is_array($event->teilnehmer_gruppe))
-		{
-			foreach ($event->teilnehmer_gruppe as $group)
-			{
-				if (isset($group['gruppe_kurzbz']) && $group['gruppe_kurzbz'] !== '')
-					$groups[] = $group['gruppe_kurzbz'];
-			}
-		}
-
-		sort($groups, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(',', array_unique($groups));
-	}
-
-	/**
-	 * @param string $time Local time.
-	 * @param array $hourRaster Timetable-hour raster.
-	 * @return string|int Timetable-hour number or an empty string.
-	 */
-	private function findHour($time, array $hourRaster, string $context = '')
-	{
-		$seconds = $this->timeToSeconds($time);
-		if ($seconds === null || count($hourRaster) === 0)
-			return '';
-
-		$firstHour = current($hourRaster);
-		$lastHour = end($hourRaster);
-		if ($seconds < $firstHour['begin'] || $seconds > $lastHour['end'])
-			return '';
-
-		foreach ($hourRaster as $hour)
-		{
-			if (
-				($seconds < $hour['end'] && $context === "start") ||
-				($seconds <= $hour['end'] && $context === "end")
-			)
-				return $hour['stunde'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * @param string $time Time in HH:MM[:SS] format.
-	 * @return int|null Seconds since midnight.
-	 */
-	private function timeToSeconds($time)
-	{
-		if (!is_string($time) || !preg_match('/^(\d{1,2}):(\d{2})(?::(\d{2}))?$/', $time, $matches))
-			return null;
-
-		$hour = (int)$matches[1];
-		$minute = (int)$matches[2];
-		$second = isset($matches[3]) ? (int)$matches[3] : 0;
-
-		if ($hour > 23 || $minute > 59 || $second > 59)
-			return null;
-
-		return $hour * 3600 + $minute * 60 + $second;
-	}
-
-	/**
-	 * @param mixed $value String or list of strings.
-	 * @return string
-	 */
-	private function joinValues($value)
-	{
-		return is_array($value) ? implode(' / ', $value) : (string)$value;
-	}
-
-	/**
-	 * @param string $value Cell content.
-	 * @return int Maximum visual line length.
-	 */
-	private function getMaxLineLength($value)
-	{
-		$lines = preg_split('/\r\n|\r|\n/', (string)$value);
-		$maxLength = 0;
-
-		foreach ($lines as $line)
-			$maxLength = max($maxLength, mb_strlen($line));
-
-		return $maxLength;
-	}
-
-	/**
-	 * @param object $first First event.
-	 * @param object $second Second event.
-	 * @return int Comparison result.
-	 */
-	private function compareEventsByStart($first, $second)
-	{
-		$firstTimestamp = isset($first->isostart) ? strtotime($first->isostart) : false;
-		$secondTimestamp = isset($second->isostart) ? strtotime($second->isostart) : false;
-
-		$firstTimestamp = $firstTimestamp === false ? PHP_INT_MAX : $firstTimestamp;
-		$secondTimestamp = $secondTimestamp === false ? PHP_INT_MAX : $secondTimestamp;
-
-		if ($firstTimestamp === $secondTimestamp)
-			return 0;
-
-		return $firstTimestamp < $secondTimestamp ? -1 : 1;
-	}
-
-	/**
-	 * @param mixed $dateTime Date/time input.
-	 * @return DateTime|null
-	 */
-	private function createDateTime($dateTime)
-	{
-		if ($dateTime instanceof DateTime)
-			return clone $dateTime;
-
-		if ($dateTime === null || $dateTime === '')
-			return null;
-
-		try
-		{
-			if (is_numeric($dateTime))
-				return new DateTime('@'.(int)$dateTime);
-
-			return new DateTime($dateTime);
-		}
-		catch (Exception $e)
-		{
-			return null;
-		}
-	}
-
-	private function getParticipants($event)
-	{
-		$values = array();
-		if (!isset($event->teilnehmer_person) || !is_array($event->teilnehmer_person))
-			return '';
-
-		foreach ($event->teilnehmer_person as $participant)
-		{
-			$value = $participant['vorname'] . ' ' . $participant['nachname'];
-
-			if ($value !== '')
-				$values[] = $value;
-		}
-
-		sort($values, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($values));
-	}
-
-	private function getNestedValue($value, array $properties)
-	{
-		foreach ($properties as $property)
-		{
-			if (is_array($value) && isset($value[$property]))
-				return (string)$value[$property];
-			if (is_object($value) && isset($value->{$property}))
-				return (string)$value->{$property};
-		}
-
-		return is_scalar($value) ? (string)$value : '';
-	}
-}

application/libraries/LvPlanHTMLDetailLib.php

@@ -1,780 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-require_once(FHCPATH.'include/functions.inc.php');
-require_once(FHCPATH.'include/phrasen.class.php');
-
-class LvPlanHTMLDetailLib
-{
-	const TIMEZONE = 'Europe/Vienna';
-
-	private $ci;
-	private $legacyPhrases;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-		$this->legacyPhrases = new phrasen(getSprache());
-	}
-
-	/**
-	 * Builds a timetable detail document for one date and hour.
-	 *
-	 * @param string $datum Date in YYYY-MM-DD format.
-	 * @param array $hour Selected timetable hour.
-	 * @param string $type Timetable type.
-	 * @param array $filters Type-specific filters.
-	 * @return string
-	 */
-	public function getContent($datum, array $hour, $type, array $filters)
-	{
-		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
-			throw new InvalidArgumentException('Unsupported timetable type');
-		foreach (array('number', 'begin', 'end') as $property)
-		{
-			if (!isset($hour[$property]) || !is_scalar($hour[$property]))
-				throw new InvalidArgumentException('Invalid timetable hour');
-		}
-
-		$events = $this->loadEvents($datum, $type, $filters);
-		$events = $this->filterEventsByHour($events, $datum, $hour);
-		if ($type === 'verband'
-			&& isset($filters['ort_kurzbz'])
-			&& $filters['ort_kurzbz'] !== '')
-		{
-			$events = $this->filterEventsByRoom(
-				$events,
-				$filters['ort_kurzbz']
-			);
-		}
-		$sections = array(
-			'teaching' => array(),
-			'reservations' => array(),
-			'events' => array()
-		);
-
-		foreach ($events as $event)
-		{
-			if ($event->type === 'lehreinheit')
-				$sections['teaching'][] = $event;
-			elseif ($event->type === 'reservierung')
-				$sections['reservations'][] = $event;
-			else
-				$sections['events'][] = $event;
-		}
-
-		return $this->renderDocument($datum, $hour, $sections);
-	}
-
-	/**
-	 * Loads the same published calendar data used by the HTML preview.
-	 *
-	 * @return array
-	 */
-	private function loadEvents($datum, $type, array $filters)
-	{
-		$uid = isset($filters['uid']) && is_string($filters['uid'])
-			? $filters['uid']
-			: getAuthUID();
-		$this->ci->load->library('KalenderLib', array('uid' => $uid));
-
-		if ($type === 'verband')
-		{
-			$events = $this->ci->kalenderlib->getPlanForVerband(
-				$datum,
-				$datum,
-				$filters['stg_kz'],
-				$filters['sem'],
-				isset($filters['ver']) ? $filters['ver'] : null,
-				isset($filters['grp']) ? $filters['grp'] : null
-			);
-		}
-		elseif ($type === 'ort')
-		{
-			$events = $this->ci->kalenderlib->getPlanForRoom(
-				$datum,
-				$datum,
-				$filters['ort_kurzbz']
-			);
-		}
-		elseif ($type === 'lektor')
-		{
-			$events = $this->ci->kalenderlib->getPlanForLecturerByLecturer(
-				$datum,
-				$datum,
-				$filters['uid']
-			);
-		}
-		else
-		{
-			$events = $this->ci->kalenderlib->getPlanForStudentByStudent(
-				$datum,
-				$datum,
-				$filters['uid']
-			);
-		}
-
-		return is_array($events) ? $events : array();
-	}
-
-	/**
-	 * Keeps events that overlap the selected timetable hour.
-	 *
-	 * @return array
-	 */
-	private function filterEventsByHour(array $events, $datum, array $hour)
-	{
-		$timezone = new DateTimeZone(self::TIMEZONE);
-		$hourStart = DateTime::createFromFormat(
-			'!Y-m-d H:i:s',
-			$datum.' '.$this->normalizeTime($hour['begin']),
-			$timezone
-		);
-		$hourEnd = DateTime::createFromFormat(
-			'!Y-m-d H:i:s',
-			$datum.' '.$this->normalizeTime($hour['end']),
-			$timezone
-		);
-
-		if ($hourStart === false || $hourEnd === false || $hourEnd <= $hourStart)
-			throw new InvalidArgumentException('Invalid timetable hour range');
-
-		$matches = array();
-		foreach ($events as $event)
-		{
-			$start = $this->getEventDateTime($event, 'isostart', 'datum', 'beginn');
-			$end = $this->getEventDateTime($event, 'isoend', 'datum', 'ende');
-
-			if ($start === null || $end === null || $end <= $start)
-				continue;
-			if ($start < $hourEnd && $end > $hourStart)
-			{
-				$matches[] = array(
-					'event' => $event,
-					'start' => $start,
-					'end' => $end
-				);
-			}
-		}
-
-		usort($matches, function ($first, $second) {
-			$comparison = $first['start']->getTimestamp()
-				<=> $second['start']->getTimestamp();
-			if ($comparison !== 0)
-				return $comparison;
-
-			$firstId = isset($first['event']->kalender_id)
-				? (int)$first['event']->kalender_id
-				: 0;
-			$secondId = isset($second['event']->kalender_id)
-				? (int)$second['event']->kalender_id
-				: 0;
-			return $firstId <=> $secondId;
-		});
-
-		return array_map(function ($match) {
-			return $match['event'];
-		}, $matches);
-	}
-
-	/**
-	 * Keeps Verband events assigned to the room selected in the preview cell.
-	 *
-	 * @return array
-	 */
-	private function filterEventsByRoom(array $events, $ortKurzbz)
-	{
-		$matches = array();
-		foreach ($events as $event)
-		{
-			$rooms = isset($event->ort_kurzbz)
-				? $event->ort_kurzbz
-				: array();
-			if (!is_array($rooms))
-				$rooms = array($rooms);
-
-			foreach ($rooms as $room)
-			{
-				if (is_scalar($room) && (string)$room === (string)$ortKurzbz)
-				{
-					$matches[] = $event;
-					continue 2;
-				}
-			}
-
-			if (!isset($event->ort_details) || !is_array($event->ort_details))
-				continue;
-
-			foreach ($event->ort_details as $room)
-			{
-				if ($this->getNestedValue($room, 'ort_kurzbz') === (string)$ortKurzbz)
-				{
-					$matches[] = $event;
-					continue 2;
-				}
-			}
-		}
-
-		return $matches;
-	}
-
-	/**
-	 * Renders the complete HTML document.
-	 */
-	private function renderDocument($datum, array $hour, array $sections)
-	{
-		$title = $this->phrase('lvplan', 'lehrveranstaltungsplanDetails');
-		$html = '<!DOCTYPE html><html lang="de"><head><meta charset="UTF-8">';
-		$html .= '<meta name="viewport" content="width=device-width, initial-scale=1">';
-		$html .= '<title>'.$this->escape($title).'</title>';
-		$html .= '<link rel="stylesheet" href="'
-			.$this->escape($this->getAppRoot().'skin/style.css.php')
-			.'" type="text/css">';
-		$html .= '<style>'
-			.'.stdplan td{vertical-align:top}.detail-lines{white-space:normal}'
-			.'.detail-empty{color:#666}.stdplan{margin-bottom:1em}'
-			.'</style></head><body id="inhalt">';
-		$html .= '<h2>'.$this->escape($this->phrase('lvplan', 'lehrveranstaltungsplan'))
-			.' &rArr; '.$this->escape($this->phrase('abgabetool', 'details')).'</h2>';
-		$html .= $this->escape($this->phrase('abgabetool', 'datum')).': '
-			.$this->escape($this->formatDate($datum)).'<br>';
-		$html .= $this->escape($this->phrase('global', 'stunde')).': '
-			.$this->escape($hour['number']).' ('
-			.$this->escape(substr((string)$hour['begin'], 0, 5)).'–'
-			.$this->escape(substr((string)$hour['end'], 0, 5)).')<br><br>';
-
-		if (!empty($sections['teaching']))
-			$html .= $this->renderTeachingTable($sections['teaching']);
-		if (!empty($sections['reservations']))
-			$html .= $this->renderReservationTable($sections['reservations']);
-		if (!empty($sections['events']))
-			$html .= $this->renderEventTable($sections['events']);
-
-		if (empty($sections['teaching'])
-			&& empty($sections['reservations'])
-			&& empty($sections['events']))
-		{
-			$html .= '<p class="detail-empty">0 '
-				.$this->escape($this->phrase('global', 'termine')).'</p>';
-		}
-
-		if (defined('MAIL_LVPLAN'))
-		{
-			$html .= '<p>'.$this->phrase(
-				'lvplan',
-				'FragenZuLvPlan',
-				array(constant('MAIL_LVPLAN'))
-			).'</p>';
-		}
-
-		return $html.'</body></html>';
-	}
-
-	/**
-	 * Renders teaching-unit details.
-	 */
-	private function renderTeachingTable(array $events)
-	{
-		$html = '<table class="stdplan"><thead><tr>';
-		foreach (array(
-			array('lvplan', 'unr'),
-			array('lvaliste', 'lektor'),
-			array('lvplan', 'ort'),
-			array('lvaliste', 'lehrfach'),
-			array('global', 'bezeichnung'),
-			array('global', 'verband'),
-			array('lvplan', 'einheit'),
-			array('lvplan', 'info')
-		) as $heading)
-		{
-			$html .= '<th>'.$this->escape($this->phrase($heading[0], $heading[1])).'</th>';
-		}
-		$html .= '</tr></thead><tbody>';
-
-		foreach ($events as $index => $event)
-		{
-			$html .= '<tr class="liste'.(($index + 1) % 2).'">';
-			$html .= $this->cell($this->renderScalarLines(
-				isset($event->unr) ? $event->unr : array()
-			));
-			$html .= $this->cell($this->renderPeople(
-				isset($event->lektor) ? $event->lektor : array(),
-				'profile'
-			));
-			$html .= $this->cell($this->renderRooms($event));
-			$html .= $this->cell($this->renderSubjectValues($event, 'kurzbz'));
-			$html .= $this->cell($this->renderSubjectValues($event, 'bezeichnung'));
-			$html .= $this->cell($this->renderTeachingGroups($event, false));
-			$html .= $this->cell($this->renderTeachingGroups($event, true));
-			$html .= $this->cell($this->renderOldTempusNoticeTagNote($event));
-			$html .= '</tr>';
-		}
-
-		return $html.'</tbody></table>';
-	}
-
-	/**
-	 * Renders reservation details.
-	 */
-	private function renderReservationTable(array $events)
-	{
-		$html = '<h2>'.$this->escape($this->phrase('lvplan', 'reservierungen')).'</h2>';
-		$html .= '<table class="stdplan"><thead><tr>';
-		foreach (array(
-			array('global', 'titel'),
-			array('lvplan', 'ort'),
-			array('global', 'person'),
-			array('global', 'beschreibung'),
-			array('lvplan', 'reserviertVon')
-		) as $heading)
-		{
-			$html .= '<th>'.$this->escape($this->phrase($heading[0], $heading[1])).'</th>';
-		}
-		$html .= '</tr></thead><tbody>';
-
-		foreach ($events as $index => $event)
-		{
-			$html .= '<tr class="liste'.(($index + 1) % 2).'">';
-			$html .= $this->cell($this->escape($this->getScalar($event, 'titel')));
-			$html .= $this->cell($this->renderRooms($event));
-			$html .= $this->cell($this->renderParticipants($event));
-			$html .= $this->cell($this->renderText(
-				$this->getScalar($event, 'beschreibung')
-			));
-			$html .= $this->cell($this->renderCreator($event));
-			$html .= '</tr>';
-		}
-
-		return $html.'</tbody></table>';
-	}
-
-	/**
-	 * Renders non-teaching, non-reservation calendar events.
-	 */
-	private function renderEventTable(array $events)
-	{
-		$html = '<h2>'.$this->escape($this->phrase('global', 'termine')).'</h2>';
-		$html .= '<table class="stdplan"><thead><tr>';
-		foreach (array(
-			array('global', 'titel'),
-			array('lvplan', 'ort'),
-			array('ui', 'organisierende'),
-			array('ui', 'teilnehmende'),
-			array('global', 'beschreibung')
-		) as $heading)
-		{
-			$html .= '<th>'.$this->escape($this->phrase($heading[0], $heading[1])).'</th>';
-		}
-		$html .= '</tr></thead><tbody>';
-
-		foreach ($events as $index => $event)
-		{
-			$html .= '<tr class="liste'.(($index + 1) % 2).'">';
-			$html .= $this->cell($this->escape($this->getEventTitle($event)));
-			$html .= $this->cell($this->renderRooms($event));
-			$html .= $this->cell($this->renderPeople(
-				isset($event->lektor) ? $event->lektor : array(),
-				'mail'
-			));
-			$html .= $this->cell($this->renderParticipants($event));
-			$html .= $this->cell($this->renderText(
-				$this->getScalar($event, 'beschreibung')
-			));
-			$html .= '</tr>';
-		}
-
-		return $html.'</tbody></table>';
-	}
-
-	private function renderSubjectValues($event, $property)
-	{
-		$values = array();
-		if (isset($event->lehrfach_details) && is_array($event->lehrfach_details))
-		{
-			foreach ($event->lehrfach_details as $subject)
-			{
-				$value = $this->getNestedValue($subject, $property);
-				if ($value !== '')
-					$values[] = $value;
-			}
-		}
-
-		if (empty($values))
-		{
-			$fallback = $property === 'kurzbz'
-				? $this->getScalar($event, 'lehrfach')
-				: $this->getScalar($event, 'lehrfach_bez');
-			if ($fallback !== '')
-				$values[] = $fallback;
-		}
-
-		return $this->renderScalarLines($values);
-	}
-
-	private function renderTeachingGroups($event, $specialGroups)
-	{
-		$values = array();
-		if (isset($event->gruppe) && is_array($event->gruppe))
-		{
-			foreach ($event->gruppe as $group)
-			{
-				$groupCode = $this->getNestedValue($group, 'gruppe_kurzbz');
-				if ($specialGroups && $groupCode !== '')
-					$values[] = $groupCode;
-				elseif (!$specialGroups && $groupCode === '')
-				{
-					$designation = $this->getNestedValue($group, 'bezeichnung');
-					if ($designation !== '')
-						$values[] = $designation;
-				}
-			}
-		}
-
-		return $this->renderGroupLinks($values);
-	}
-
-	private function renderParticipants($event)
-	{
-		$parts = array();
-		$people = $this->renderPeople(
-			isset($event->teilnehmer_person) ? $event->teilnehmer_person : array(),
-			'mail'
-		);
-		if ($people !== '')
-			$parts[] = $people;
-
-		$groups = array();
-		if (isset($event->teilnehmer_gruppe) && is_array($event->teilnehmer_gruppe))
-		{
-			foreach ($event->teilnehmer_gruppe as $group)
-			{
-				$value = $this->getNestedValue($group, 'bezeichnung');
-				if ($value === '')
-					$value = $this->getNestedValue($group, 'gruppe_kurzbz');
-				if ($value !== '')
-					$groups[] = $value;
-			}
-		}
-		$groupLinks = $this->renderGroupLinks($groups);
-		if ($groupLinks !== '')
-			$parts[] = $groupLinks;
-
-		return implode('<br>', $parts);
-	}
-
-	private function renderCreator($event)
-	{
-		if (isset($event->created_by) && (is_array($event->created_by) || is_object($event->created_by)))
-			return $this->renderPeople(array($event->created_by), 'plain');
-
-		return $this->renderPeople(
-			isset($event->lektor) ? $event->lektor : array(),
-			'plain'
-		);
-	}
-
-	private function renderPeople(array $people, $linkType)
-	{
-		$values = array();
-		$seen = array();
-		foreach ($people as $person)
-		{
-			$uid = $this->getNestedValue($person, 'mitarbeiter_uid');
-			if ($uid === '')
-				$uid = $this->getNestedValue($person, 'uid');
-
-			$nameParts = array();
-			foreach (array('titelpre', 'vorname', 'nachname', 'titelpost') as $property)
-			{
-				$value = trim($this->getNestedValue($person, $property));
-				if ($value !== '')
-					$nameParts[] = $value;
-			}
-			$name = implode(' ', $nameParts);
-			if ($name === '')
-				$name = $uid !== '' ? $uid : $this->getNestedValue($person, 'kurzbz');
-			if ($name === '')
-				continue;
-
-			$key = $uid !== '' ? $uid : $name;
-			if (isset($seen[$key]))
-				continue;
-			$seen[$key] = true;
-
-			$label = $this->escape($name);
-			if ($linkType === 'profile' && $uid !== '')
-			{
-				$personalNumber = $this->getNestedValue($person, 'personalnummer');
-				$profileAllowed = $personalNumber === ''
-					|| !is_numeric($personalNumber)
-					|| (int)$personalNumber >= 0;
-				if ($profileAllowed)
-				$label = $this->link($this->getProfileUrl($uid), $label);
-			}
-			elseif ($linkType === 'mail' && $uid !== '' && defined('DOMAIN'))
-			{
-				$label = $this->link(
-					'mailto:'.$uid.'@'.constant('DOMAIN'),
-					$label
-				);
-			}
-
-			$values[] = $label;
-		}
-
-		return implode('<br>', $values);
-	}
-
-	private function renderRooms($event)
-	{
-		$values = array();
-		$seen = array();
-		if (isset($event->ort_details) && is_array($event->ort_details))
-		{
-			foreach ($event->ort_details as $room)
-			{
-				$code = $this->getNestedValue($room, 'ort_kurzbz');
-				if ($code === '' || isset($seen[$code]))
-					continue;
-				$seen[$code] = true;
-
-				$label = $this->escape($code);
-				$contentId = $this->getNestedValue($room, 'content_id');
-				$title = $this->getNestedValue($room, 'bezeichnung');
-				if ($contentId !== '')
-				$label = $this->link($this->getRoomUrl($contentId), $label, $title);
-				elseif ($title !== '')
-					$label = '<span title="'.$this->escape($title).'">'.$label.'</span>';
-
-				$values[] = $label;
-			}
-		}
-
-		if (isset($event->ort_kurzbz) && is_array($event->ort_kurzbz))
-		{
-			foreach ($event->ort_kurzbz as $code)
-			{
-				$code = is_scalar($code) ? (string)$code : '';
-				if ($code === '' || isset($seen[$code]))
-					continue;
-				$seen[$code] = true;
-				$values[] = $this->escape($code);
-			}
-		}
-
-		if (isset($event->locations) && is_array($event->locations))
-		{
-			foreach ($event->locations as $location)
-			{
-				$location = is_scalar($location) ? trim((string)$location) : '';
-				if ($location !== '' && !isset($seen['location:'.$location]))
-				{
-					$seen['location:'.$location] = true;
-					$values[] = $this->escape($location);
-				}
-			}
-		}
-
-		return implode('<br>', $values);
-	}
-
-	private function renderGroupLinks(array $groups)
-	{
-		$values = array();
-		foreach ($this->uniqueScalarValues($groups) as $group)
-		{
-			$label = $this->escape($group);
-			if (defined('DOMAIN'))
-			{
-				$label = $this->link(
-					'mailto:'.mb_strtolower($group).'@'.constant('DOMAIN'),
-					$label
-				);
-			}
-			$values[] = $label;
-		}
-
-		return implode('<br>', $values);
-	}
-
-	private function renderScalarLines($values)
-	{
-		if (!is_array($values))
-			$values = array($values);
-
-		$escaped = array_map(array($this, 'escape'), $this->uniqueScalarValues($values));
-		return implode('<br>', $escaped);
-	}
-
-	private function uniqueScalarValues(array $values)
-	{
-		$result = array();
-		$seen = array();
-		foreach ($values as $value)
-		{
-			if (!is_scalar($value))
-				continue;
-			$value = trim((string)$value);
-			if ($value === '' || isset($seen[$value]))
-				continue;
-			$seen[$value] = true;
-			$result[] = $value;
-		}
-
-		sort($result, SORT_STRING | SORT_FLAG_CASE);
-		return $result;
-	}
-
-	private function renderOldTempusNoticeTagNote($event)
-	{
-		if (empty($event->tags)) return null;
-
-		$parsedTags = $event->tags;
-		if (!is_array($event->tags)) 
-			$parsedTags = json_decode($event->tags, true);
-
-		foreach ($parsedTags as $tag)
-		{
-			if (isset($tag['typ_kurzbz']) && $tag['typ_kurzbz'] === 'hinweis' && isset($tag['insertvon']) && $tag['insertvon'] === 'oldToNewTempusMigration')
-				return $tag['notiz'] ?? null;
-		}
-
-		return null;
-	}
-
-	private function renderText($value)
-	{
-		return nl2br($this->escape($value), false);
-	}
-
-	private function getEventTitle($event)
-	{
-		foreach (array('titel', 'lehrfach_bez', 'lehrfach') as $property)
-		{
-			$value = trim($this->getScalar($event, $property));
-			if ($value !== '')
-				return $value;
-		}
-
-		return '';
-	}
-
-	private function getEventDateTime($event, $isoProperty, $dateProperty, $timeProperty)
-	{
-		$value = isset($event->{$isoProperty}) ? $event->{$isoProperty} : null;
-		if (($value === null || $value === '')
-			&& isset($event->{$dateProperty})
-			&& isset($event->{$timeProperty}))
-		{
-			$value = $event->{$dateProperty}.' '.$event->{$timeProperty};
-		}
-
-		if ($value === null || $value === '')
-			return null;
-
-		try
-		{
-			$date = is_numeric($value)
-				? new DateTime('@'.(int)$value)
-				: new DateTime($value, new DateTimeZone(self::TIMEZONE));
-			$date->setTimezone(new DateTimeZone(self::TIMEZONE));
-			return $date;
-		}
-		catch (Exception $exception)
-		{
-			return null;
-		}
-	}
-
-	private function normalizeTime($time)
-	{
-		$time = (string)$time;
-		if (preg_match('/^(\d{1,2}:\d{2}:\d{2})(?:\.\d+)?$/', $time, $matches))
-			return $matches[1];
-		if (preg_match('/^\d{1,2}:\d{2}$/', $time))
-			return $time.':00';
-
-		return $time;
-	}
-
-	private function formatDate($datum)
-	{
-		$date = DateTime::createFromFormat(
-			'!Y-m-d',
-			$datum,
-			new DateTimeZone(self::TIMEZONE)
-		);
-		return $date === false ? $datum : $date->format('d.m.Y');
-	}
-
-	private function getScalar($object, $property)
-	{
-		return isset($object->{$property}) && is_scalar($object->{$property})
-			? (string)$object->{$property}
-			: '';
-	}
-
-	private function getNestedValue($value, $property)
-	{
-		if (is_array($value) && isset($value[$property]) && is_scalar($value[$property]))
-			return (string)$value[$property];
-		if (is_object($value) && isset($value->{$property}) && is_scalar($value->{$property}))
-			return (string)$value->{$property};
-
-		return '';
-	}
-
-	private function cell($content)
-	{
-		return '<td class="detail-lines">'.$content.'</td>';
-	}
-
-	private function link($url, $escapedLabel, $title = '')
-	{
-		$html = '<a href="'.$this->escape($url).'"';
-		if ($title !== '')
-			$html .= ' title="'.$this->escape($title).'"';
-		return $html.'>'.$escapedLabel.'</a>';
-	}
-
-	private function getProfileUrl($uid)
-	{
-		return $this->getAppRoot().'cis/private/profile/index.php?'
-			.http_build_query(array('uid' => $uid), '', '&', PHP_QUERY_RFC3986);
-	}
-
-	private function getRoomUrl($contentId)
-	{
-		return $this->getAppRoot().'cms/content.php?'
-			.http_build_query(
-				array('content_id' => $contentId),
-				'',
-				'&',
-				PHP_QUERY_RFC3986
-			);
-	}
-
-	private function phrase($category, $phrase, array $parameters = array())
-	{
-		if (($category === 'global' && $phrase === 'termine')
-			|| ($category === 'ui'
-				&& in_array($phrase, array('organisierende', 'teilnehmende'), true)))
-		{
-			return $this->ci->p->t($category, $phrase, $parameters);
-		}
-
-		return $this->legacyPhrases->t($category.'/'.$phrase, $parameters);
-	}
-
-	private function escape($value)
-	{
-		return htmlspecialchars((string)$value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-	}
-
-	private function getAppRoot()
-	{
-		return defined('APP_ROOT') ? rtrim(APP_ROOT, '/').'/' : '/';
-	}
-}

application/libraries/LvPlanHTMLLib.php

@@ -1,864 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class LvPlanHTMLLib
-{
-	const TIMEZONE = 'Europe/Vienna';
-	const DETAIL_WINDOW_NAME = 'Details';
-	const DETAIL_WINDOW_OPTIONS = 'height=320,width=550,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=no,toolbar=no,location=no,menubar=no,dependent=yes';
-
-	CONST NOTICE_TAG_ICON = '📝';
-
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-	}
-
-	/**
-	 * Builds a complete printable timetable document.
-	 *
-	 * @param int $begin First included date as Unix timestamp.
-	 * @param int $ende Last included date as Unix timestamp.
-	 * @param string $type Timetable type.
-	 * @param array $filters Type-specific filters.
-	 * @return string
-	 */
-	public function getContent($begin, $ende, $type, array $filters)
-	{
-		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
-			throw new InvalidArgumentException('Unsupported timetable type');
-
-		if ($type === 'verband')
-			$events = $this->getVerbandEvents($begin, $ende, $filters);
-		elseif ($type === 'ort')
-			$events = $this->getRoomEvents($begin, $ende, $filters);
-		else
-			$events = $this->getPersonalEvents($begin, $ende, $type, $filters);
-
-		$hourRaster = $this->loadHourRaster();
-		$normalizedEvents = $this->normalizeEvents($events);
-		
-		return $this->renderDocument(
-			$begin,
-			$ende,
-			$type,
-			$filters,
-			$hourRaster,
-			$normalizedEvents
-		);
-	}
-
-	/**
-	 * @return array Personal plan events.
-	 */
-	private function getPersonalEvents($begin, $ende, $type, array $filters)
-	{
-		if (!isset($filters['uid']) || !is_string($filters['uid']) || $filters['uid'] === '')
-			throw new InvalidArgumentException('Missing personal timetable UID');
-
-		$uid = $filters['uid'];
-		$isLecturer = $type === 'lektor';
-		$this->ci->load->library('KalenderLib', array('uid' => $uid));
-
-		$startDate = $this->formatLocalDate($begin);
-		$endDate = $this->formatLocalDate($ende);
-
-		if ($isLecturer)
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForLecturerByLecturer($startDate, $endDate, $uid);
-		}
-		else
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForStudentByStudent($startDate, $endDate, $uid);
-		}
-
-		return is_array($events) ? $events : array();
-	}
-
-	/**
-	 * @return array Room plan events.
-	 */
-	private function getRoomEvents($begin, $ende, array $filters)
-	{
-		if (!isset($filters['ort_kurzbz'])
-			|| !is_string($filters['ort_kurzbz'])
-			|| $filters['ort_kurzbz'] === '')
-		{
-			throw new InvalidArgumentException('Missing room timetable filter');
-		}
-
-		$this->ci->load->library('KalenderLib', array('uid' => getAuthUID()));
-		$events = $this->ci->kalenderlib->getPlanForRoom(
-			$this->formatLocalDate($begin),
-			$this->formatLocalDate($ende),
-			$filters['ort_kurzbz']
-		);
-
-		return is_array($events) ? $events : array();
-	}
-
-	/**
-	 * @return array Lehrverband plan events.
-	 */
-	private function getVerbandEvents($begin, $ende, array $filters)
-	{
-		foreach (array('stg_kz', 'sem') as $name)
-		{
-			if (!array_key_exists($name, $filters))
-				throw new InvalidArgumentException('Missing Lehrverband filter: '.$name);
-		}
-
-		$this->ci->load->library('KalenderLib', array('uid' => getAuthUID()));
-		$events = $this->ci->kalenderlib->getPlanForVerband(
-			$this->formatLocalDate($begin),
-			$this->formatLocalDate($ende),
-			$filters['stg_kz'],
-			$filters['sem'],
-			isset($filters['ver']) ? $filters['ver'] : null,
-			isset($filters['grp']) ? $filters['grp'] : null
-		);
-
-		return is_array($events) ? $events : array();
-	}
-
-	/**
-	 * @return array Timetable-hour raster.
-	 */
-	private function loadHourRaster()
-	{
-		$this->ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$result = $this->ci->StundeModel->execReadOnlyQuery(
-			'SELECT stunde, beginn, ende
-			FROM lehre.tbl_stunde
-			ORDER BY stunde'
-		);
-
-		if (isError($result))
-			throw new RuntimeException(getError($result));
-		if (!hasData($result))
-			return array();
-
-		$raster = array();
-		foreach (getData($result) as $hour)
-		{
-			$start = $this->timeToSeconds($hour->beginn);
-			$end = $this->timeToSeconds($hour->ende);
-
-			if ($start === null || $end === null || $end <= $start)
-				continue;
-
-			$raster[] = array(
-				'number' => (string)$hour->stunde,
-				'begin' => $start,
-				'end' => $end,
-				'begin_label' => substr((string)$hour->beginn, 0, 5),
-				'end_label' => substr((string)$hour->ende, 0, 5)
-			);
-		}
-
-		return $raster;
-	}
-
-	/**
-	 * @param array $events Events from KalenderLib.
-	 * @return array
-	 */
-	private function normalizeEvents(array $events)
-	{
-		$normalized = array();
-
-		foreach ($events as $event)
-		{
-			$start = $this->getEventDateTime($event, 'isostart', 'datum', 'beginn');
-			$end = $this->getEventDateTime($event, 'isoend', 'datum', 'ende');
-
-			if ($start === null || $end === null || $end <= $start)
-				continue;
-
-			$isReservation = isset($event->type) && $event->type === 'reservierung';
-			
-			$title = '';
-			if ($isReservation) {
-				$title = $this->getScalar($event, 'titel');
-			} else {
-				$title = $this->joinValue(isset($event->topic) ? $event->topic : '');
-			}
-
-			if ($title === '')
-				$title = $this->getScalar($event, 'lehrfach_bez');
-
-			$infoTag = $this->getOldTempusNoticeTag($event);
-			if (!empty($infoTag))
-			{
-				$title .= ' ' . self::NOTICE_TAG_ICON;
-			}
-
-			$normalized[] = array(
-				'start' => $start,
-				'end' => $end,
-				'date' => $start->format('Y-m-d'),
-				'title' => $title,
-				'location' => $this->joinValue(
-					isset($event->ort_kurzbz) ? $event->ort_kurzbz : '',
-					' / '
-				),
-				'detail_ort_kurzbz' => $this->getFirstScalarValue(
-					isset($event->ort_kurzbz) ? $event->ort_kurzbz : ''
-				),
-				'lecturers' => $this->getLecturers($event),
-				'participants' => $this->getParticipants($event),
-				'groups' => $this->getGroups($event),
-				'note' => $this->getEventNote($event, $isReservation),
-				'color' => $this->getColor($event),
-				'infoTagTitle' => !empty($infoTag) && isset($infoTag['notiz']) ? $infoTag['notiz'] : '',
-			);
-		}
-
-		usort($normalized, function ($first, $second) {
-			return $first['start']->getTimestamp() <=> $second['start']->getTimestamp();
-		});
-
-		return $normalized;
-	}
-
-	/**
-	 * Renders the complete HTML document.
-	 */
-	private function renderDocument(
-		$begin,
-		$ende,
-		$type,
-		array $filters,
-		array $hourRaster,
-		array $events
-	) {
-		$timezone = new DateTimeZone(self::TIMEZONE);
-		$rangeStart = (new DateTime('@'.$begin))->setTimezone($timezone)->setTime(0, 0, 0);
-		$rangeEnd = (new DateTime('@'.$ende))->setTimezone($timezone)->setTime(23, 59, 59);
-
-		$weeks = $this->buildWeeks($rangeStart, $rangeEnd, $hourRaster, $events);
-		$title = $this->getDocumentTitle($type, $filters);
-		$appRoot = $this->getAppRoot();
-
-		$html = '<!DOCTYPE html><html lang="de"><head><meta charset="UTF-8">';
-		$html .= '<meta name="viewport" content="width=device-width, initial-scale=1">';
-		$html .= '<title>'.$this->escape('Kalender').'</title>';
-		$html .= '<link rel="stylesheet" href="'.$this->escape($appRoot.'skin/style.css.php').'" type="text/css">';
-		$html .= '<link rel="stylesheet" media="print" href="'.$this->escape($appRoot.'skin/cis.css').'" type="text/css">';
-		$html .= '<link rel="stylesheet" media="print" href="'.$this->escape($appRoot.'skin/print.css').'" type="text/css">';
-		$html .= '<style>'.$this->getStyles().'</style></head>';
-		$html .= '<body id="inhalt"><h1>'.$this->escape($title).'</h1>';
-
-		foreach ($weeks as $week)
-			$html .= $this->renderWeek($week, $hourRaster, $type, $filters);
-
-		if (empty($weeks))
-			$html .= '<p>Keine Termine im gewählten Zeitraum.</p>';
-
-		$html .= '</body></html>';
-		return $html;
-	}
-
-	/**
-	 * Builds week/day/cell collections for rendering.
-	 */
-	private function buildWeeks(DateTime $rangeStart, DateTime $rangeEnd, array $raster, array $events)
-	{
-		$weeks = array();
-		$weekStart = clone $rangeStart;
-
-		while ($weekStart <= $rangeEnd)
-		{
-			$weekKey = $weekStart->format('Y-m-d');
-			$weekEnd = (clone $weekStart)->modify('+6 days');
-			$days = array();
-
-			for ($dayOffset = 0; $dayOffset < 7; $dayOffset++)
-			{
-				$date = (clone $weekStart)->modify('+'.$dayOffset.' days');
-				$days[$date->format('Y-m-d')] = array(
-					'date' => $date,
-					'cells' => array_fill(0, count($raster), array())
-				);
-			}
-
-			$weeks[$weekKey] = array(
-				'start' => clone $weekStart,
-				'end' => $weekEnd,
-				'days' => $days,
-				'outside' => array()
-			);
-
-			$weekStart->modify('+7 days');
-		}
-
-		foreach ($events as $event)
-		{
-			$eventWeek = clone $event['start'];
-			$eventWeek->modify('monday this week')->setTime(0, 0, 0);
-			$weekKey = $eventWeek->format('Y-m-d');
-			$dateKey = $event['date'];
-
-			if (!isset($weeks[$weekKey]['days'][$dateKey]))
-				continue;
-
-			$matchingSlots = $this->getMatchingSlots($event, $raster);
-			if (empty($matchingSlots))
-			{
-				$weeks[$weekKey]['outside'][] = $event;
-				continue;
-			}
-
-			foreach ($matchingSlots as $slot)
-				$weeks[$weekKey]['days'][$dateKey]['cells'][$slot][] = $event;
-		}
-
-		return array_values($weeks);
-	}
-
-	/**
-	 * @return array Raster indexes overlapping an event.
-	 */
-	private function getMatchingSlots(array $event, array $raster)
-	{
-		if ($event['start']->format('Y-m-d') !== $event['end']->format('Y-m-d'))
-			return array();
-
-		$start = $this->timeToSeconds($event['start']->format('H:i:s'));
-		$end = $this->timeToSeconds($event['end']->format('H:i:s'));
-		$matches = array();
-
-		foreach ($raster as $index => $hour)
-		{
-			if ($start < $hour['end'] && $end > $hour['begin'])
-				$matches[] = $index;
-		}
-
-		return $matches;
-	}
-
-	/**
-	 * Renders one printable week.
-	 */
-	private function renderWeek(array $week, array $raster, $type, array $filters)
-	{
-		$weekdayNames = array(
-			1 => 'Montag',
-			2 => 'Dienstag',
-			3 => 'Mittwoch',
-			4 => 'Donnerstag',
-			5 => 'Freitag',
-			6 => 'Samstag',
-			7 => 'Sonntag'
-		);
-		$html = '<div style="padding-top: 10px;" class="page-break-after">';
-		$html .= '<table class="stdplan" width="100%" border="0" cellpadding="1" cellspacing="1" name="Stundenplantabelle" align="center">';
-		$html .= '<thead><tr>';
-		$html .= '<th align="right">Stunde&nbsp;<br>Beginn&nbsp;<br>Ende&nbsp;</th>';
-
-		foreach ($raster as $hour)
-		{
-			$html .= '<th><div align="center">'.$this->escape($hour['number']).'<br>';
-			$html .= '&nbsp;'.$this->escape($hour['begin_label']).'&nbsp;<br>';
-			$html .= '&nbsp;'.$this->escape($hour['end_label']).'&nbsp;</div></th>';
-		}
-
-		$html .= '</tr></thead><tbody>';
-
-		foreach ($week['days'] as $day)
-		{
-			$weekday = (int)$day['date']->format('N');
-			$html .= '<tr><td>'.$weekdayNames[$weekday].'<br>';
-			$html .= $day['date']->format('j.M Y').'<br></td>';
-
-			foreach ($day['cells'] as $slotIndex => $events)
-			{
-				if (empty($events))
-				{
-					$html .= '<td valign="center" align="center"></td>';
-					continue;
-				}
-
-				$html .= '<td nowrap valign="top" align="center">';
-
-				$hourNumber = isset($raster[$slotIndex]['number'])
-					? $raster[$slotIndex]['number']
-					: null;
-				foreach ($events as $event)
-					$html .= $this->renderEvent(
-						$event,
-						$type,
-						false,
-						$filters,
-						$hourNumber
-					);
-				$html .= '</td>';
-			}
-
-			$html .= '</tr>';
-		}
-
-		$html .= '</tbody></table>';
-
-		if (!empty($week['outside']))
-		{
-			$html .= '<div class="outside"><h3>Termine außerhalb des Stundenrasters</h3>';
-			foreach ($week['outside'] as $event)
-			{
-				$html .= $this->renderEvent(
-					$event,
-					$type,
-					true,
-					$filters,
-					$this->getNearestHourNumber($event, $raster)
-				);
-			}
-			$html .= '</div>';
-		}
-
-		if ($type === 'ort')
-			$html .= $this->renderRoomReservationNotice($week, $filters);
-
-		return $html.'</div>';
-	}
-
-	/**
-	 * Renders the room reservation warning used by the legacy weekly plan.
-	 */
-	private function renderRoomReservationNotice(array $week, array $filters)
-	{
-		$requiredFilters = array(
-			'room_reservable',
-			'room_reservation_permitted',
-			'room_reservation_start',
-			'room_reservation_end',
-			'room_not_reservable_message',
-			'room_reservation_restricted_message'
-		);
-		foreach ($requiredFilters as $filter)
-		{
-			if (!array_key_exists($filter, $filters))
-				return '';
-		}
-
-		$weekEnd = (clone $week['end'])->modify('+1 day')->getTimestamp();
-		$canReserveInWeek = $filters['room_reservation_permitted']
-			&& $filters['room_reservable']
-			&& $weekEnd >= time()
-			&& $weekEnd >= $filters['room_reservation_start']
-			&& $week['start']->getTimestamp() <= $filters['room_reservation_end'];
-
-		if ($canReserveInWeek)
-			return '';
-
-		$message = $filters['room_reservation_permitted']
-			&& !$filters['room_reservable']
-			? $filters['room_not_reservable_message']
-			: $filters['room_reservation_restricted_message'];
-
-		return '<table><tr><td><br><span style="color: orange">'
-			.$this->escape($message)
-			.'</span></td></tr></table>';
-	}
-
-	/**
-	 * Renders an escaped event card.
-	 */
-	private function renderEvent(
-		array $event,
-		$type,
-		$showDate,
-		array $filters,
-		$hourNumber
-	) {
-		$style = $event['color'] !== ''
-			? ' style="background-color: #'.$event['color'].'; margin-bottom: 3px;"'
-			: '';
-		$html = '<div align="center"'.$style.'>';
-		$detailUrl = $this->buildDetailUrl($event, $type, $filters, $hourNumber);
-
-		$linkTitle = $this->escape($event['note']);
-		$infoTagTitle = isset($event['infoTagTitle']) && $event['infoTagTitle'] !== ''
-			? $event['infoTagTitle']
-			: null;
-		if ($infoTagTitle !== null)
-		{
-			$linkTitle = $this->escape($infoTagTitle);
-		}
-
-		$html .= '<a class="stpl_detail" title="'.$linkTitle.'"';
-		if ($detailUrl !== null)
-		{
-			$onclick = 'window.open('
-				.$this->encodeJavaScriptString($detailUrl).','
-				.$this->encodeJavaScriptString(self::DETAIL_WINDOW_NAME).','
-				.$this->encodeJavaScriptString(self::DETAIL_WINDOW_OPTIONS)
-				.');return false;';
-			$html .= ' href="'.$this->escape($detailUrl).'"';
-			$html .= ' target="'.self::DETAIL_WINDOW_NAME.'"';
-			$html .= ' onclick="'.$this->escape($onclick).'"';
-		}
-		$html .= '>';
-
-		if ($showDate)
-			$html .= $event['start']->format('d.m.Y H:i').'–'.$event['end']->format('H:i').'<br>';
-
-		$html .= $this->escape($event['title']);
-
-		if (($type === 'lektor' || $type === 'verband' || $type === 'ort')
-			&& $event['groups'] !== '')
-			$html .= '<br>'.$this->renderLines($event['groups']);
-		if ($type !== 'lektor' && $type !== 'ort' && $event['lecturers'] !== '')
-			$html .= '<br>'.$this->renderLines($event['lecturers']);
-		if ($type === 'ort' && $event['participants'] !== '')
-			$html .= '<br>'.$this->renderLines($event['participants']);
-		if ($event['location'] !== '' && $type !== 'ort')
-			$html .= '<br>'.$this->escape($event['location']);
-		if ($event['note'] !== '' && $this->shouldShowNotes())
-			$html .= '<br>'.$this->escape($event['note']);
-
-		return $html.'</a></div>';
-	}
-
-	/**
-	 * Builds the URL consumed by the legacy timetable detail popup.
-	 */
-	private function buildDetailUrl(array $event, $type, array $filters, $hourNumber)
-	{
-		if ($hourNumber === null || !preg_match('/^\d+$/', (string)$hourNumber))
-			return null;
-
-		$uid = isset($filters['uid']) && $filters['uid'] !== ''
-			? $filters['uid']
-			: getAuthUID();
-		$room = $type === 'ort' && isset($filters['ort_kurzbz'])
-			? $filters['ort_kurzbz']
-			: $event['detail_ort_kurzbz'];
-		$parameters = array(
-			'type' => $type,
-			'datum' => $event['date'],
-			'stunde' => (string)$hourNumber,
-			'pers_uid' => $uid,
-			'stg_kz' => isset($filters['stg_kz']) ? $filters['stg_kz'] : '',
-			'sem' => isset($filters['sem']) ? $filters['sem'] : '',
-			'ver' => isset($filters['ver']) && $filters['ver'] !== null
-				? $filters['ver']
-				: '',
-			'grp' => isset($filters['grp']) && $filters['grp'] !== null
-				? $filters['grp']
-				: '',
-			'ort_kurzbz' => $room
-		);
-
-		return $this->getAppRoot().'index.ci.php/lvplan/html/detail?'
-			.http_build_query($parameters, '', '&', PHP_QUERY_RFC3986);
-	}
-
-	/**
-	 * Returns the hour whose configured start is closest to the event start.
-	 */
-	private function getNearestHourNumber(array $event, array $raster)
-	{
-		if (empty($raster))
-			return null;
-
-		$eventStart = $this->timeToSeconds($event['start']->format('H:i:s'));
-		if ($eventStart === null)
-			return null;
-
-		$nearestNumber = null;
-		$nearestDistance = null;
-		foreach ($raster as $hour)
-		{
-			$distance = abs($eventStart - $hour['begin']);
-			if ($nearestDistance === null || $distance < $nearestDistance)
-			{
-				$nearestDistance = $distance;
-				$nearestNumber = $hour['number'];
-			}
-		}
-
-		return $nearestNumber;
-	}
-
-	private function getDocumentTitle($type, array $filters)
-	{
-		//return 'Kalender';
-		if ($type === 'ort')
-		{
-			$title = 'Ort: '.$filters['ort_kurzbz'];
-			if (isset($filters['bezeichnung']) && $filters['bezeichnung'] !== '')
-				$title .= ' - '.$filters['bezeichnung'];
-			return $title;
-		}
-
-		if ($type === 'verband')
-		{
-			$studiengang = isset($filters['stg_kurzbz'])
-				&& $filters['stg_kurzbz'] !== ''
-				? $filters['stg_kurzbz']
-				: $filters['stg_kz'];
-			$title = 'Lehrverband: '.$studiengang.'-'.$filters['sem'];
-
-			if (isset($filters['ver']) && $filters['ver'] !== null)
-				$title .= $filters['ver'];
-			else 
-				$title .= 0;
-			
-			if (isset($filters['grp']) && $filters['grp'] !== null)
-				$title .= $filters['grp'];
-			else 
-				$title .= 0;
-			
-			return $title;
-		}
-
-		if ($type === 'lektor')
-		{
-			$name = isset($filters['full_name']) && $filters['full_name'] !== ''
-				? $filters['full_name']
-				: $filters['uid'];
-			return 'Lektor: '.$name;
-		}
-
-		return 'Student: '.$filters['uid'];
-	}
-
-	private function getEventDateTime($event, $isoProperty, $dateProperty, $timeProperty)
-	{
-		$value = isset($event->{$isoProperty}) ? $event->{$isoProperty} : null;
-		if (($value === null || $value === '')
-			&& isset($event->{$dateProperty})
-			&& isset($event->{$timeProperty}))
-		{
-			$value = $event->{$dateProperty}.' '.$event->{$timeProperty};
-		}
-
-		if ($value === null || $value === '')
-			return null;
-
-		try
-		{
-			$date = is_numeric($value) ? new DateTime('@'.(int)$value) : new DateTime($value);
-			$date->setTimezone(new DateTimeZone(self::TIMEZONE));
-			return $date;
-		}
-		catch (Exception $e)
-		{
-			return null;
-		}
-	}
-
-	private function getLecturers($event)
-	{
-		$values = array();
-		if (!isset($event->lektor) || !is_array($event->lektor))
-			return '';
-
-		foreach ($event->lektor as $lecturer)
-		{
-			$value = $this->getNestedValue($lecturer, array('kurzbz', 'mitarbeiter_uid'));
-			if ($value !== '')
-				$values[] = $value;
-		}
-
-		sort($values, SORT_STRING | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($values));
-	}
-
-	private function getParticipants($event)
-	{
-		$values = array();
-		if (!isset($event->teilnehmer_person) || !is_array($event->teilnehmer_person))
-			return '';
-
-		foreach ($event->teilnehmer_person as $participant)
-		{
-			$value = $this->getNestedValue($participant, array('kurzbz', 'student_uid'));
-			if ($value !== '')
-				$values[] = $value;
-		}
-
-		sort($values, SORT_STRING | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($values));
-	}
-
-	private function getGroups($event)
-	{
-		$values = array();
-		foreach (array('teilnehmer_gruppe', 'gruppe') as $property)
-		{
-			if (!isset($event->{$property}) || !is_array($event->{$property}))
-				continue;
-
-			foreach ($event->{$property} as $group)
-			{
-				$value = $this->getNestedValue(
-					$group,
-					array('bezeichnung', 'kuerzel', 'gruppe_kurzbz')
-				);
-				if ($value !== '')
-					$values[] = $value;
-			}
-		}
-
-		sort($values, SORT_STRING | SORT_FLAG_CASE);
-		
-		return implode(', ', array_unique($values));
-	}
-
-	private function getEventNote($event, $isReservation)
-	{
-		$note = $this->getScalar($event, 'beschreibung');
-		if ($note === '')
-			$note = $this->getScalar($event, 'anmerkung');
-		if ($note === '' && !$isReservation)
-			$note = $this->getScalar($event, 'titel');
-		return $note;
-	}
-
-	private function getColor($event)
-	{
-		$color = ltrim($this->getScalar($event, 'farbe'), '#');
-		return preg_match('/^[0-9a-fA-F]{6}$/', $color) ? strtoupper($color) : '';
-	}
-
-	private function getNestedValue($value, array $properties)
-	{
-		foreach ($properties as $property)
-		{
-			if (is_array($value) && isset($value[$property]))
-				return (string)$value[$property];
-			if (is_object($value) && isset($value->{$property}))
-				return (string)$value->{$property};
-		}
-
-		return is_scalar($value) ? (string)$value : '';
-	}
-
-	private function getScalar($event, $property)
-	{
-		return isset($event->{$property}) && is_scalar($event->{$property})
-			? (string)$event->{$property}
-			: '';
-	}
-
-	private function getFirstScalarValue($value)
-	{
-		if (is_scalar($value))
-			return (string)$value;
-		if (!is_array($value))
-			return '';
-
-		foreach ($value as $item)
-		{
-			if (is_scalar($item) && (string)$item !== '')
-				return (string)$item;
-		}
-
-		return '';
-	}
-
-	private function joinValue($value, $separator = ', ')
-	{
-		if (!is_array($value))
-			return is_scalar($value) ? (string)$value : '';
-
-		$values = array();
-		foreach ($value as $item)
-		{
-			if (is_scalar($item) && (string)$item !== '')
-				$values[] = (string)$item;
-		}
-
-		return implode($separator, array_unique($values));
-	}
-
-	private function timeToSeconds($time)
-	{
-		if (!preg_match('/^(\d{1,2}):(\d{2})(?::(\d{2}))?$/', (string)$time, $matches))
-			return null;
-
-		$hours = (int)$matches[1];
-		$minutes = (int)$matches[2];
-		$seconds = isset($matches[3]) ? (int)$matches[3] : 0;
-
-		if ($hours > 23 || $minutes > 59 || $seconds > 59)
-			return null;
-
-		return $hours * 3600 + $minutes * 60 + $seconds;
-	}
-
-	private function formatLocalDate($timestamp)
-	{
-		$date = new DateTime('@'.(int)$timestamp);
-		$date->setTimezone(new DateTimeZone(self::TIMEZONE));
-		return $date->format('Y-m-d');
-	}
-
-	private function escape($value)
-	{
-		return htmlspecialchars((string)$value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-	}
-
-	private function encodeJavaScriptString($value)
-	{
-		return json_encode(
-			(string)$value,
-			JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT
-		);
-	}
-
-	private function renderLines($value)
-	{
-		$lines = array_map('trim', explode(', ', (string)$value));
-		$lines = array_filter($lines, function ($line) {
-			return $line !== '';
-		});
-		$lines = array_map(array($this, 'escape'), $lines);
-
-		return implode('<br>', $lines);
-	}
-
-	private function getAppRoot()
-	{
-		return defined('APP_ROOT') ? rtrim(APP_ROOT, '/').'/' : '/';
-	}
-
-	private function shouldShowNotes()
-	{
-		return !defined('LVPLAN_ANMERKUNG_ANZEIGEN') || LVPLAN_ANMERKUNG_ANZEIGEN;
-	}
-
-	private function getStyles()
-	{
-		return '@page{size:landscape;margin:10mm}'
-			.'.outside{margin-top:10px}.outside>div{display:inline-block;vertical-align:top;min-width:180px;margin:0 3px 3px 0;padding:3px}'
-			.'@media print{.outside>div{break-inside:avoid}}';
-	}
-
-	private function getOldTempusNoticeTag($event)
-	{
-		if (empty($event->tags)) return null;
-
-		$parsedTags = $event->tags;
-		if (!is_array($event->tags)) 
-			$parsedTags = json_decode($event->tags, true);
-
-		foreach ($parsedTags as $tag)
-		{
-			if (isset($tag['typ_kurzbz']) && $tag['typ_kurzbz'] === 'hinweis' && isset($tag['insertvon']) && $tag['insertvon'] === 'oldToNewTempusMigration')
-				return $tag;
-		}
-
-		return null;
-	}
-}

application/libraries/LvPlanICALLib.php

@@ -1,449 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class LvPlanICALLib
-{
-	const CATEGORY_TIMETABLE = 'Stundenplan';
-	const CATEGORY_EXAM = 'StundenplanExam';
-	const CATEGORY_REMOTE = 'StundenplanRemote';
-
-	const ICON_EXAM = '📝';
-	const ICON_REMOTE = '📍';
-	const ICON_RESERVATION = '📌';
-
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-	}
-
-	/**
-	 * Builds complete iCalendar content for a user.
-	 *
-	 * If no type is given, the user's role is inferred for subscription feeds.
-	 * Downloads pass the type explicitly so dual-role users receive the selected
-	 * timetable.
-	 *
-	 * @param string $uid User UID.
-	 * @param int $begin First included date as Unix timestamp.
-	 * @param int $ende Last included date as Unix timestamp.
-	 * @param string|null $type Timetable type (student, lektor, ort or verband).
-	 * @param int $version iCalendar major version (1 or 2).
-	 * @param string|null $ortKurzbz Room identifier for room plans.
-	 * @param array|null $verbandFilters Lehrverband filters.
-	 * @param string|null $calendarName Display name for calendar subscriptions.
-	 * @return string
-	 */
-	public function getContent(
-		$uid,
-		$begin,
-		$ende,
-		$type = null,
-		$version = 2,
-		$ortKurzbz = null,
-		$verbandFilters = null,
-		$calendarName = null
-	) {
-		if (!in_array($version, array(1, 2), true))
-			throw new InvalidArgumentException('Unsupported iCalendar version');
-		if ($type !== null && !in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
-			throw new InvalidArgumentException('Unsupported timetable type');
-		if ($type === 'ort' && (!is_string($ortKurzbz) || $ortKurzbz === ''))
-			throw new InvalidArgumentException('Missing room timetable filter');
-		if ($type === 'verband'
-			&& (!is_array($verbandFilters)
-				|| !array_key_exists('stg_kz', $verbandFilters)
-				|| !array_key_exists('sem', $verbandFilters)))
-		{
-			throw new InvalidArgumentException('Missing Lehrverband timetable filters');
-		}
-
-		$this->ci->load->library('KalenderLib', array('uid' => $uid));
-
-		if ($type === null)
-		{
-			$this->ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-			$isLecturerResult = $this->ci->MitarbeiterModel->isMitarbeiter($uid);
-			$isLecturer = isSuccess($isLecturerResult) && getData($isLecturerResult) === true;
-		}
-		else
-		{
-			$isLecturer = $type === 'lektor';
-		}
-
-		$startDate = date('Y-m-d', $begin);
-		// KalenderLib uses an exclusive end date; $ende is inclusive here.
-		$endDate = date('Y-m-d', strtotime('+1 day', $ende));
-
-		if ($type === 'verband')
-		{
-			$events = $this->ci->kalenderlib->getPlanForVerband(
-				$startDate,
-				$endDate,
-				$verbandFilters['stg_kz'],
-				$verbandFilters['sem'],
-				isset($verbandFilters['ver']) ? $verbandFilters['ver'] : null,
-				isset($verbandFilters['grp']) ? $verbandFilters['grp'] : null
-			);
-		}
-		elseif ($type === 'ort')
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForRoom($startDate, $endDate, $ortKurzbz);
-		}
-		elseif ($isLecturer)
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForLecturerByLecturer($startDate, $endDate, $uid);
-		}
-		else
-		{
-			$events = $this->ci->kalenderlib
-				->getPlanForStudentByStudent($startDate, $endDate, $uid);
-		}
-
-		if (!is_array($events))
-			$events = array();
-
-		$content = $this->buildCalendarHeader($version, $calendarName);
-
-		foreach ($events as $event)
-			$content .= $this->buildEvent($event);
-
-		return $content.$this->buildICalLine('END', 'VCALENDAR');
-	}
-
-	private function buildCalendarHeader($version, $calendarName = null)
-	{
-		$productId = defined('CAMPUS_NAME') && CAMPUS_NAME !== ''
-			? CAMPUS_NAME
-			: 'FHComplete';
-
-		$header = $this->buildICalLine('BEGIN', 'VCALENDAR')
-			.$this->buildICalLine('VERSION', $version.'.0')
-			.$this->buildICalTextLine('PRODID', $productId);
-
-		if (is_string($calendarName) && $calendarName !== '')
-		{
-			$header .= $this->buildICalTextLine('NAME', $calendarName);
-			$header .= $this->buildICalTextLine('X-WR-CALNAME', $calendarName);
-		}
-
-		return $header
-			.$this->buildICalLine('BEGIN', 'VTIMEZONE')
-			.$this->buildICalLine('TZID', 'Europe/Vienna')
-			.$this->buildICalLine('BEGIN', 'DAYLIGHT')
-			.$this->buildICalLine('TZOFFSETFROM', '+0100')
-			.$this->buildICalLine('RRULE', 'FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU')
-			.$this->buildICalLine('DTSTART', '19810329T020000')
-			.$this->buildICalLine('TZNAME', 'GMT+02:00')
-			.$this->buildICalLine('TZOFFSETTO', '+0200')
-			.$this->buildICalLine('END', 'DAYLIGHT')
-			.$this->buildICalLine('BEGIN', 'STANDARD')
-			.$this->buildICalLine('TZOFFSETFROM', '+0200')
-			.$this->buildICalLine('RRULE', 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU')
-			.$this->buildICalLine('DTSTART', '19961027T030000')
-			.$this->buildICalLine('TZNAME', 'GMT+01:00')
-			.$this->buildICalLine('TZOFFSETTO', '+0100')
-			.$this->buildICalLine('END', 'STANDARD')
-			.$this->buildICalLine('END', 'VTIMEZONE');
-	}
-
-	private function buildEvent($event)
-	{
-		$isReservation = $event->type === 'reservierung';
-
-		$summaryIcon = '';
-		$summary = $this->getSummary($event);
-		$description = $this->getDescription($event);
-
-		$category = self::CATEGORY_TIMETABLE;
-		if ($event->type === 'lehreinheit')
-		{
-			if ($event->lehrform === 'EXAM')
-			{
-				$summaryIcon = self::ICON_EXAM;
-				$category = self::CATEGORY_EXAM;
-			}
-			elseif (!isset($event->ko_ort_kurzbz) || $event->ko_ort_kurzbz === '')
-			{
-				$summaryIcon = self::ICON_REMOTE;
-				$category = self::CATEGORY_REMOTE;
-			}
-		}
-		elseif ($event->type === 'reservierung'
-			&& (!isset($event->ko_ort_kurzbz) || $event->ko_ort_kurzbz === ''))
-		{
-			$summaryIcon = self::ICON_RESERVATION;
-			$category = self::CATEGORY_REMOTE;
-		}
-
-		if ($summaryIcon !== '')
-			$summary = $summaryIcon.' '.$summary;
-
-		$startDate = $this->formatICalLocalDateTime($event->isostart);
-		$endDate = $this->formatICalLocalDateTime($event->isoend);
-		$lastModified = $this->formatICalUtcDateTime(
-			isset($event->updateamum) ? $event->updateamum : null
-		);
-		$dtStamp = $lastModified ?: $this->formatICalUtcDateTime($event->isostart);
-
-		if ($dtStamp === null)
-			$dtStamp = '19700101T000000Z';
-
-		$fragment = $this->buildICalLine('BEGIN', 'VEVENT')
-			.$this->buildICalTextLine('UID', $event->eindeutige_kalender_gruppen_id)
-			.$this->buildICalLine('SEQUENCE', (int)$event->kalender_id)
-			.$this->buildICalTextLine('SUMMARY', $summary)
-			.$this->buildICalTextLine('DESCRIPTION', $description)
-			.$this->buildICalTextLine('LOCATION', $this->joinValues($event->ort_kurzbz))
-			.$this->buildICalTextLine('CATEGORIES', $category)
-			.$this->buildICalLine('DTSTART', $startDate, array('TZID' => 'Europe/Vienna'))
-			.$this->buildICalLine('DTEND', $endDate, array('TZID' => 'Europe/Vienna'));
-
-		if ($lastModified !== null)
-			$fragment .= $this->buildICalLine('LAST-MODIFIED', $lastModified);
-
-		return $fragment
-			.$this->buildICalLine('DTSTAMP', $dtStamp)
-			.$this->buildICalLine('END', 'VEVENT');
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Event summary.
-	 */
-	private function getSummary($event)
-	{
-		if (isset($event->type) && $event->type === 'reservierung')
-		{
-			return isset($event->titel) ? $event->titel : '';
-		}
-
-		$subject = isset($event->lehrfach_bez) ? $event->lehrfach_bez : '';
-
-		if ($subject === '')
-			$subject = $this->joinValues(isset($event->topic) ? $event->topic : array());
-
-		return $subject;
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Event description.
-	 */
-	private function getDescription($event)
-	{
-		$isReservation = isset($event->type) && $event->type === 'reservierung';
-		$parts = array();
-		$subject = $isReservation && isset($event->lehrfach_bez)
-			? $event->lehrfach_bez
-			: '';
-
-		if ($subject !== '')
-			$parts[] = $this->ci->p->t('global', 'lehrfach').': '.$subject;
-
-		if ($isReservation)
-		{
-			$participants = $this->getParticipants($event);
-
-			if ($participants !== '')
-				$parts[] = $this->ci->p->t('ui', 'teilnehmende').': '.$participants;
-		}
-		else
-		{
-			$lecturers = $this->getLecturers($event);
-
-			if ($lecturers !== '')
-				$parts[] = $this->ci->p->t('lehre', 'lektorInnen').': '.$lecturers;
-		}
-
-		$groups = $this->getGroups($event);
-		if ($groups !== '')
-			$parts[] = $this->ci->p->t('global', 'gruppen').': '.$groups;
-
-		$description = isset($event->beschreibung) ? $event->beschreibung : '';
-		if ($description !== '')
-			$parts[] = $this->ci->p->t('global', 'beschreibung').': '.$description;
-
-		return implode("\r\n", $parts);
-	}
-
-	private function joinValues($value)
-	{
-		return is_array($value) ? implode(', ', $value) : (string)$value;
-	}
-
-	private function buildICalTextLine($name, $value, array $parameters = array())
-	{
-		return $this->buildICalLine($name, $this->escapeICalText($value), $parameters);
-	}
-
-	private function buildICalLine($name, $value, array $parameters = array())
-	{
-		$line = strtoupper($name);
-
-		foreach ($parameters as $parameterName => $parameterValue)
-		{
-			$parameterValues = is_array($parameterValue) ? $parameterValue : array($parameterValue);
-			$escapedValues = array();
-
-			foreach ($parameterValues as $singleParameterValue)
-				$escapedValues[] = $this->escapeICalParameterValue($singleParameterValue);
-
-			$line .= ';'.strtoupper($parameterName).'='.implode(',', $escapedValues);
-		}
-
-		return $this->foldICalLine($line.':'.(string)$value);
-	}
-
-	private function foldICalLine($line)
-	{
-		$line = (string)$line;
-		$folded = '';
-
-		while (strlen($line) > 75)
-		{
-			$part = mb_strcut($line, 0, 75, 'UTF-8');
-			$folded .= $part."\r\n";
-			$line = ' '.mb_strcut($line, strlen($part), strlen($line) - strlen($part), 'UTF-8');
-		}
-
-		return $folded.$line."\r\n";
-	}
-
-	private function escapeICalText($value)
-	{
-		$value = (string)$value;
-		$value = str_replace('\\', '\\\\', $value);
-		$value = str_replace(array("\r\n", "\r", "\n"), '\\n', $value);
-		return str_replace(array(';', ','), array('\\;', '\\,'), $value);
-	}
-
-	private function escapeICalParameterValue($value)
-	{
-		$value = (string)$value;
-		$value = str_replace(array('\\', '"', "\r", "\n"), array('\\\\', '\\"', '', ''), $value);
-
-		if (preg_match('/[;:,]/', $value))
-			return '"'.$value.'"';
-
-		return $value;
-	}
-
-	private function formatICalLocalDateTime($dateTime)
-	{
-		$dateTime = $this->createDateTime($dateTime);
-		if ($dateTime === null)
-			return null;
-
-		$dateTime->setTimezone(new DateTimeZone('Europe/Vienna'));
-		return $dateTime->format('Ymd\THis');
-	}
-
-	private function formatICalUtcDateTime($dateTime)
-	{
-		$dateTime = $this->createDateTime($dateTime);
-		if ($dateTime === null)
-			return null;
-
-		$dateTime->setTimezone(new DateTimeZone('UTC'));
-		return $dateTime->format('Ymd\THis\Z');
-	}
-
-	private function createDateTime($dateTime)
-	{
-		if ($dateTime instanceof DateTime)
-			return clone $dateTime;
-
-		if ($dateTime === null || $dateTime === '')
-			return null;
-
-		try
-		{
-			if (is_numeric($dateTime))
-				return new DateTime('@'.(int)$dateTime);
-
-			return new DateTime($dateTime);
-		}
-		catch (Exception $e)
-		{
-			return null;
-		}
-	}
-
-		/**
-	 * @param object $event Calendar event.
-	 * @return string Participant group labels.
-	 */
-	private function getGroups($event)
-	{
-		$groups = array();
-
-		if (isset($event->gruppe) && is_array($event->gruppe))
-		{
-			foreach ($event->gruppe as $group)
-			{
-				if (isset($group['bezeichnung']) && $group['bezeichnung'] !== '')
-					$groups[] = $group['bezeichnung'];
-			}
-		}
-
-		if (isset($event->teilnehmer_gruppe) && is_array($event->teilnehmer_gruppe))
-		{
-			foreach ($event->teilnehmer_gruppe as $group)
-			{
-				if (isset($group['gruppe_kurzbz']) && $group['gruppe_kurzbz'] !== '')
-					$groups[] = $group['gruppe_kurzbz'];
-			}
-		}
-
-		sort($groups, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(',', array_unique($groups));
-	}
-
-	/**
-	 * @param object $event Calendar event.
-	 * @return string Lecturer abbreviations.
-	 */
-	private function getLecturers($event)
-	{
-		$lecturers = array();
-
-		if (isset($event->lektor) && is_array($event->lektor))
-		{
-			foreach ($event->lektor as $lecturer)
-			{
-				if (isset($lecturer['kurzbz']) && $lecturer['kurzbz'] !== '')
-					$lecturers[] = $lecturer['kurzbz'];
-			}
-		}
-
-		sort($lecturers, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(' / ', array_unique($lecturers));
-	}
-
-	private function getParticipants($event)
-	{
-		$values = array();
-		if (!isset($event->teilnehmer_person) || !is_array($event->teilnehmer_person))
-			return '';
-
-		foreach ($event->teilnehmer_person as $participant)
-		{
-			$value = $participant['vorname'] . ' ' . $participant['nachname'];
-
-			if ($value !== '')
-				$values[] = $value;
-		}
-
-		sort($values, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return implode(', ', array_unique($values));
-	}
-}

application/libraries/PermissionLib.php

@@ -50,7 +50,6 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
-	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -62,8 +61,6 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
-		$this->access_rights = null;
-
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -72,10 +69,8 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj) {
+			if ($authObj)
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
-				$this->access_rights = self::$bb->berechtigungen;
-			}
 		}
 	}
 
@@ -345,16 +340,6 @@ class PermissionLib
         }
     }
 
-	/**
-	 * Returns the access rights for the current user
-	 *
-	 * @return array|null
-	 */
-	public function getAccessRights()
-	{
-		return $this->access_rights;
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

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/RaumvorschlagLib.php

@@ -1,283 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-use CI3_Events as Events;
-
-class RaumvorschlagLib
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
-		$this->_ci->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
-		$this->_ci->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
-		$this->_ci->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
-		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->_ci->load->model('education/LehreinheitMitarbeiter_model', 'LehreinheitMitarbeiterModel');
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
-		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-
-		$this->_ci->load->library('CollisionChecker', ["uid" => getAuthUID()]);
-		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-
-	public function getVorschlaege($kalender_id)
-	{
-		$event = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
-		$event = $event[0];
-
-		$lektor_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		$gruppen_kurzbz = array_values(array_filter(array_column($event->gruppe, 'gruppe_kurzbz')));
-
-		$lehrverband_gruppen = array_values(array_filter($event->gruppe, function($gruppe)
-		{
-			return empty($gruppe['gruppe_kurzbz']);
-		}));
-
-		$tages_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$event->datum,
-			$event->datum,
-			$lektor_uids,
-			$gruppen_kurzbz,
-			$lehrverband_gruppen
-		);
-
-		$lektor_davor = $this->_getEventDavor($tages_events, $event->isostart, $lektor_uids, 'lektor');
-		$gruppen_davor = $this->_getEventDavor($tages_events, $event->isostart, $gruppen_kurzbz, 'gruppe');
-
-		$lektor_davor_ort = $lektor_davor ? $this->_getOrtDetails($lektor_davor->ort_kurzbz) : null;
-		$gruppen_davor_ort = $gruppen_davor ? $this->_getOrtDetails($gruppen_davor->ort_kurzbz) : null;
-
-		$kandidaten = $this->_getRaumkandidaten($event);
-		if (empty($kandidaten)) return [];
-
-
-		$ratings = [];
-		foreach ($kandidaten as $raum)
-		{
-			$rating = ['ort_kurzbz' => $raum->ort_kurzbz, 'score' => 100, 'details' => []];
-			$this->_rateLektor($rating, $raum, $lektor_davor_ort);
-			$this->_rateGruppen($rating, $raum, $gruppen_davor_ort);
-
-			Events::trigger('room_rating',
-				function & () use (&$rating) {
-					return $rating;
-				},
-				$raum,
-				$event
-			);
-			$ratings[] = $rating;
-		}
-
-		usort($ratings, function($a, $b)
-		{
-			return $b['score'] - $a['score'];
-		});
-
-		return $ratings;
-
-	}
-
-	private function _getOrtDetails($ort_kurzbz_array)
-	{
-		$ort_kurzbz_array = (array) $ort_kurzbz_array;
-		if (empty($ort_kurzbz_array)) return [];
-		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
-		$this->_ci->OrtModel->db->where_in('ort_kurzbz', $ort_kurzbz_array);
-		$result = $this->_ci->OrtModel->load();
-
-		return hasData($result) ? getData($result) : [];
-	}
-
-	private function _rateLektor(&$rating, $raum, $lektor_davor_orte)
-	{
-		if (empty($lektor_davor_orte)) return;
-
-		foreach ($lektor_davor_orte as $ort)
-		{
-			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
-			{
-				$rating['score'] += 20;
-				$rating['details'][] = '+20 ' . $this->_ci->phraseslib->t('ui', 'lecturer_already_here');
-				return;
-			}
-		}
-
-		$gleiches_gebaeude = array_filter($lektor_davor_orte, function($ort) use ($raum)
-		{
-			return $ort->standort_id === $raum->standort_id;
-		});
-
-		if (empty($gleiches_gebaeude))
-		{
-			$rating['score'] -= 20;
-			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'lecturer_building_change');
-			return;
-		}
-
-		$diffs = array_map(function($ort) use ($raum)
-		{
-			return abs($ort->stockwerk - $raum->stockwerk);
-		}, $gleiches_gebaeude);
-
-		$diff = min($diffs);
-
-		if ($diff > 0)
-		{
-			$rating['score'] -= $diff * 5;
-			$rating['details'][] = '-' . ($diff * 5) . ' ' . $this->_ci->phraseslib->t('ui', 'lecturer_floor_change');
-		}
-	}
-
-	private function _rateGruppen(&$rating, $raum, $gruppen_davor_orte)
-	{
-		if (empty($gruppen_davor_orte)) return;
-
-		foreach ($gruppen_davor_orte as $ort)
-		{
-			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
-			{
-				$rating['score'] += 10;
-				$rating['details'][] = '+10 ' . $this->_ci->phraseslib->t('ui', 'student_already_here');
-				return;
-			}
-		}
-
-		$gleiches_gebaeude = array_filter($gruppen_davor_orte, function($ort) use ($raum)
-		{
-			return $ort->standort_id === $raum->standort_id;
-		});
-
-		if (empty($gleiches_gebaeude))
-		{
-			$rating['score'] -= 20;
-			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'student_building_change');
-			return;
-		}
-
-		$diffs = array_map(function($ort) use ($raum)
-		{
-			return abs($ort->stockwerk - $raum->stockwerk);
-		}, $gleiches_gebaeude);
-
-		$diff = min($diffs);
-
-		if ($diff > 0)
-		{
-			$rating['score'] -= $diff * 5;
-			$rating['details'][] = '-' . ($diff * 5) . ' '. $this->_ci->phraseslib->t('ui', 'student_floor_change');
-		}
-	}
-
-	private function _getEventDavor($events, $von, $uids, $type)
-	{
-		$kandidat = null;
-
-		foreach ($events as $event)
-		{
-			if ($event->isoend > $von)
-				continue;
-
-			//Wenn zwischen zwei Events eine 30+ Minuten Pause liegt, wird das Event davor nicht berücksichtigt
-			if ((strtotime($von) - strtotime($event->isoend)) > 30 * 60)
-				continue;
-
-			if (empty($event->ort_kurzbz))
-				continue;
-
-			if ($type === 'lektor')
-				$event_uids = array_column($event->lektor, 'mitarbeiter_uid');
-			else
-				$event_uids = array_column($event->gruppe, 'gruppe_kurzbz');
-
-			if (empty(array_intersect($event_uids, $uids)))
-				continue;
-
-			if ($kandidat === null || $event->isoend > $kandidat->isoend)
-				$kandidat = $event;
-		}
-
-		return $kandidat;
-	}
-
-	private function _getRaumkandidaten($event)
-	{
-		$lehreinheit = $this->_ci->LehreinheitModel->load($event->lehreinheit_id[0]);
-		if (!hasData($lehreinheit)) return [];
-		$lehreinheit = getData($lehreinheit)[0];
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender_ort.ort_kurzbz');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id');
-		$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $event->isoend);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.bis >', $event->isostart);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['deleted']);
-		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz IS NOT NULL', null, false);
-		$belegte = $this->_ci->KalenderModel->load();
-
-		$belegte_orte = hasData($belegte) ? array_column(getData($belegte), 'ort_kurzbz') : [];
-
-		if (empty($lehreinheit->raumtyp))
-		{
-			$raeume = $this->_getFreieRaeume(null, $belegte_orte);
-			return hasData($raeume) ? getData($raeume) : [];
-		}
-
-		$vorschlaege = [];
-
-		$raeume = $this->_getFreieRaeume($lehreinheit->raumtyp, $belegte_orte);
-		if (hasData($raeume))
-			$vorschlaege = getData($raeume);
-
-		if (count($vorschlaege) < 5 && !empty($lehreinheit->raumtypalternativ))
-		{
-			$bereits_gefunden = array_merge($belegte_orte, array_column($vorschlaege, 'ort_kurzbz'));
-			$alternativ = $this->_getFreieRaeume($lehreinheit->raumtypalternativ, $bereits_gefunden);
-
-			if (!isError($alternativ) && hasData($alternativ))
-				$vorschlaege = array_merge($vorschlaege, getData($alternativ));
-		}
-
-		return $vorschlaege;
-	}
-
-	private function _getFreieRaeume($raumtyp, $belegte_orte)
-	{
-		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
-		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
-		$this->_ci->OrtModel->db->where('raumtyp_kurzbz', $raumtyp);
-		$this->_ci->OrtModel->db->where('aktiv', true);
-		$this->_ci->OrtModel->db->where("ort_kurzbz NOT LIKE '\_%'", null, false);
-
-		if (!empty($belegte_orte))
-			$this->_ci->OrtModel->db->where_not_in('ort_kurzbz', $belegte_orte);
-		$this->_ci->OrtModel->addOrder('hierarchie, ort_kurzbz');
-
-		return $this->_ci->OrtModel->load();
-	}
-
-
-
-
-
-
-
-}

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");
 		
@@ -220,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();
 
@@ -231,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -360,10 +357,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -451,24 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

application/libraries/VariableLib.php

@@ -14,9 +14,9 @@ class VariableLib
 	/**
 	 * VariableLib constructor.
 	 * Loads variable of logged in user.
-	 * @param $params
+	 * @param $loggeduid
 	 */
-	public function __construct($params)
+	public function __construct($loggeduid)
 	{
 		$this->_ci =& get_instance();
 
@@ -25,8 +25,8 @@ class VariableLib
 		$this->_ci->load->model('system/Variable_model', 'VariableModel');
 		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 
-		if (isset($params['uid']) && !isEmptyString($params['uid']))
-			$this->_setVariables($params['uid']);
+		if (isset($loggeduid['uid']) && !isEmptyString($loggeduid['uid']))
+			$this->_setVariables($loggeduid['uid']);
 		else
 		{
 			show_error('uid of logged user not passed!');

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -1,266 +0,0 @@
-<?php
-
-class LectureCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-		
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'lecture';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$uids = $this->_getUids($data->kalender_id);
-
-		if (empty($uids)) return [];
-
-		$collisions = [];
-
-		$collisions = array_merge($collisions, $this->_checkLehreinheit($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkReservierung($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkZeitsperre($uids, $data));
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$grouped = [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter other_lehreinheithreinheit_ma', 'other_lehreinheithreinheit_ma.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit other_lehreinheit', 'other_lehreinheit.lehreinheit_id = other_lehreinheithreinheit_ma.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit other_kalender_le', 'other_kalender_le.lehreinheit_id = other_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_kalender_le.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-		{
-			foreach (getData($result) as $row)
-			{
-				$grouped[$row->kalender_id][] = true;
-			}
-		}
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer other_t', 'other_t.uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event other_e', 'other_e.kalender_id = other_t.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_e.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-		{
-			foreach (getData($result) as $row)
-			{
-				$grouped[$row->kalender_id][] = true;
-			}
-		}
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('campus.tbl_zeitsperre z',
-			"z.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid 
-			AND z.zeitsperretyp_kurzbz != 'ZVerfueg'");
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = z.vonstunde', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = z.bisstunde', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where('(z.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('(z.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$result = $this->_ci->KalenderModel->load();
-
-
-		if (!isError($result) && hasData($result))
-		{
-			foreach (getData($result) as $row)
-			{
-				$grouped[$row->kalender_id][] = true;
-			}
-		}
-
-		return $grouped;
-	}
-
-	private function _getUids($kalender_id)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->group_start();
-			$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-			$this->_ci->KalenderModel->db->or_where('mitarbeiter_uid IS NULL', null, false);
-		$this->_ci->KalenderModel->db->group_end();
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'tbl_kalender.kalender_id' => $kalender_id
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$data = getData($result);
-		$mitarbeiter_uids = array_filter(array_column($data, 'mitarbeiter_uid'));
-		$event_teilnehmer = array_filter(array_column($data, 'uid'));
-
-		return array_unique(array_merge($mitarbeiter_uids, $event_teilnehmer));
-	}
-
-	private function _checkLehreinheit($uids, $data)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('mitarbeiter_uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'message' => $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')',
-				'errorCode' => 'lector_collision',
-			];
-		}, getData($result));
-	}
-
-	private function _checkReservierung($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_reservierung') === 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender_event_teilnehmer.uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'message' => $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')',
-				'errorCode' => 'reservation_collision',
-			];
-		}, getData($result));
-	}
-
-	private function _checkZeitsperre($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
-
-		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum, vonstunde_z.beginn as von_beginn, bisdatum, bisstunde_z.ende as bis_ende');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = tbl_zeitsperre.vonstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = tbl_zeitsperre.bisstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp <', $data->bis);
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $data->von);
-
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-		$result = $this->_ci->ZeitsperreModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'message' => $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->vondatum . ' ' . $row->von_beginn)) . ' - ' . date('d.m.Y H:i', strtotime($row->bisdatum . ' ' . $row->bis_ende)) . ')',
-				'errorCode' => 'absences_collision',
-			];
-		}, getData($result));
-	}
-
-}

application/libraries/collision/checks/ResourcesCollisionCheck.php

@@ -1,93 +0,0 @@
-<?php
-
-class ResourcesCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-		
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'resources';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->betriebsmittel_ids, $data->von, $data->bis, $data->kalender_id)) return [];
-
-		if (empty($data->betriebsmittel_ids)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-		if ($this->_ci->variablelib->getVar('ignore_resources_collisions') === 'true') return [];
-
-		$this->_ci->KalenderModel->addSelect('kalender_id, von, bis, bm.beschreibung AS betriebsmittel_beschreibung');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender bk', 'bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
-		$this->_ci->KalenderModel->addJoin('wawi.tbl_betriebsmittel bm', 'bm.betriebsmittel_id = bk.betriebsmittel_id');
-
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_in('bk.betriebsmittel_id', $data->betriebsmittel_ids);
-
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result)) return [];
-		if (!hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'errorCode' => 'resource_collision',
-				'message' => $this->_ci->phraseslib->t('ui', 'resource_collision') . ': ' . $row->betriebsmittel_beschreibung . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')'
-			];
-		}, getData($result));
-	}
-
-	public function checkAll($kalender_ids) 
-	{
-		if (empty($kalender_ids)) return [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender current_bk', 'current_bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender other_bk', 'other_bk.betriebsmittel_id = current_bk.betriebsmittel_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.eindeutige_kalender_gruppen_id = other_bk.eindeutige_kalender_gruppen_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-		{
-			$grouped[$row->kalender_id][] = true;
-		}
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -1,89 +0,0 @@
-<?php
-
-class RoomCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-		
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'room';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id) || isEmptyArray($data->ort_kurzbz)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$this->_ci->KalenderModel->addSelect('kalender_id, ort_kurzbz, von, bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'kalender_id');
-
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-
-		$this->_ci->KalenderModel->db->where_in('ort_kurzbz', $data->ort_kurzbz);
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result)) return [];
-		if (!hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'errorCode' => 'room_collision',
-				'message' => $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')'
-			];
-		}, getData($result));
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort current_ort', 'current_ort.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort other_ort', 'other_ort.ort_kurzbz = current_ort.ort_kurzbz');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_ort.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-
-		$result = $this->_ci->KalenderModel->load();
-
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-		{
-			$grouped[$row->kalender_id][] = true;
-		}
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -1,255 +0,0 @@
-<?php
-
-class StudentCollisionCheck implements ICollisionCheck
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-		
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'student';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$placeholders = implode(',', array_fill(0, count($kollisionsfreie_user), '?'));
-
-
-		$dbModel = new DB_Model();
-
-		$qry1 = "
-			SELECT DISTINCT tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-			UNION ALL
-
-			SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-
-		";
-
-		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
-			[$data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result1) || !hasData($result1)) return [];
-
-		$curUids = array_flip(array_column(getData($result1), 'uid'));
-
-		$qry2 = "
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-
-			UNION ALL
-			
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-		";
-
-		$result2 = $dbModel->execReadOnlyQuery($qry2, array_merge(
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result2) || !hasData($result2)) return [];
-
-		$conflicts = [];
-		foreach (getData($result2) as $row)
-		{
-			if (isset($curUids[$row->uid]))
-			{
-				$conflicts[] = [
-					'message' =>
-						$this->_ci->phraseslib->t('ui', 'student_kollision')
-						. ': ' . $row->uid
-						. ' (' . date('d.m.Y H:i', strtotime($row->von))
-						. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')',
-					'errorCode' => 'student_collision'
-				];
-
-			}
-		}
-
-		return $conflicts;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-
-		if (empty($kalender_ids)) return [];
-
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$dbModel = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT current_kalender.kalender_id, current_benutzergruppe.uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_gruppe.semester = current_lehreinheitgruppe.semester
-				AND current_gruppe.gruppe_kurzbz = current_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe current_benutzergruppe ON current_benutzergruppe.gruppe_kurzbz = current_gruppe.gruppe_kurzbz
-					AND current_benutzergruppe.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_gruppe.semester = other_lehreinheitgruppe.semester
-				AND other_gruppe.gruppe_kurzbz = other_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe other_benutzergruppe
-				ON other_benutzergruppe.gruppe_kurzbz = other_gruppe.gruppe_kurzbz
-				AND other_benutzergruppe.uid = current_benutzergruppe.uid
-				AND other_benutzergruppe.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-
-			UNION ALL
-
-			SELECT DISTINCT current_kalender.kalender_id, current_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband current_studentlehrverband
-				ON current_studentlehrverband.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_studentlehrverband.semester = current_lehreinheitgruppe.semester
-				AND current_studentlehrverband.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-				AND (current_lehreinheitgruppe.verband = current_studentlehrverband.verband OR current_lehreinheitgruppe.verband IS NULL OR btrim(current_lehreinheitgruppe.verband::text) = '' OR current_studentlehrverband.verband IS NULL)
-				AND (current_lehreinheitgruppe.gruppe = current_studentlehrverband.gruppe OR current_lehreinheitgruppe.gruppe IS NULL OR btrim(current_lehreinheitgruppe.gruppe::text) = '' OR current_studentlehrverband.gruppe IS NULL)
-
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband other_slv
-				ON other_slv.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_slv.semester = other_lehreinheitgruppe.semester
-				AND other_slv.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-				AND other_slv.student_uid = current_studentlehrverband.student_uid
-				AND (other_lehreinheitgruppe.verband = other_slv.verband OR other_lehreinheitgruppe.verband IS NULL OR btrim(other_lehreinheitgruppe.verband::text) = '' OR other_slv.verband IS NULL)
-				AND (other_lehreinheitgruppe.gruppe = other_slv.gruppe OR other_lehreinheitgruppe.gruppe IS NULL OR btrim(other_lehreinheitgruppe.gruppe::text) = '' OR other_slv.gruppe IS NULL)
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, array_merge($kalender_ids, $kalender_ids));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-		{
-			$grouped[$row->kalender_id][] = true;
-		}
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -1,370 +0,0 @@
-<?php
-
-class VerbandCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-	private $_uid;
-
-	public function __construct($params)
-	{
-		$this->_ci =& get_instance();
-		
-		if (isset($params['uid']) && !isEmptyString($params['uid'])){
-			$this->_uid = $params['uid'];
-		} else {
-			show_error('uid of logged user not passed!');
-		}
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'verband';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$kollision_student = $this->_ci->variablelib->getVar('kollision_student') === 'false';
-		$kollision_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung') === 'false';
-
-		if (!$kollision_student && !$kollision_reservierung) return [];
-
-		$dbModel = new DB_Model();
-		$collisions = [];
-
-		if ($kollision_student)
-		{
-			$union_event = "";
-
-			if ($kollision_reservierung)
-			{
-				$union_event = "
-					UNION
-					SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe, tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-					FROM lehre.tbl_kalender_event_teilnehmer
-					WHERE tbl_kalender_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				";
-			}
-
-			$sql_gruppen = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_lehreinheitguppe.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_lehreinheitguppe.semester ||
-						COALESCE(other_lehreinheitguppe.verband::text, '') ||
-						COALESCE(other_lehreinheitguppe.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender current_kalender
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != current_kalender.kalender_id
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-
-				WHERE current_kalender.kalender_id = ?
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-				AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-				AND (
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND (
-							current_lehreinheitguppe.verband IS NULL
-							OR (
-								current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-								AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_gruppen, [
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-				{
-					$collisions[] = [
-						'message' => $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')',
-						'errorCode' => 'verband_collision',
-					];
-				}
-			}
-		}
-
-		if ($kollision_reservierung && !$kollision_student)
-		{
-			$sql_reservierung = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_event_teilnehmer.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_event_teilnehmer.semester ||
-						COALESCE(other_event_teilnehmer.verband::text, '') ||
-						COALESCE(other_event_teilnehmer.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender_event_teilnehmer current_event_teilnehmer
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_event_teilnehmer.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != ?
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN lehre.tbl_kalender_event_teilnehmer other_event_teilnehmer
-					ON other_event_teilnehmer.kalender_id = other_kalender.kalender_id
-					AND other_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_event_teilnehmer.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_event_teilnehmer.studiengang_kz
-
-				WHERE current_event_teilnehmer.kalender_id = ?
-				AND current_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_event_teilnehmer.studiengang_kz = other_event_teilnehmer.studiengang_kz
-				AND current_event_teilnehmer.semester = other_event_teilnehmer.semester
-				AND (
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND (
-							current_event_teilnehmer.verband IS NULL
-							OR (
-								current_event_teilnehmer.verband = other_event_teilnehmer.verband
-								AND (current_event_teilnehmer.gruppe IS NULL OR other_event_teilnehmer.gruppe IS NULL OR current_event_teilnehmer.gruppe = other_event_teilnehmer.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_reservierung, [
-				$data->kalender_id,
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-				{
-					$collisions[] = [
-						'errorCode' => 'reservation_collision',
-						'message' => $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')'
-					];
-				}
-			}
-		}
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$dbModel = new DB_Model();
-
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT ON (current_kalender.kalender_id) current_kalender.kalender_id
-			FROM lehre.tbl_kalender current_kalender
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-	
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-	
-			WHERE current_kalender.kalender_id IN ({$placeholders})
-			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-			AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-			AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-			AND (
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND (
-						current_lehreinheitguppe.verband IS NULL
-						OR (
-							current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-							AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-						)
-					)
-				)
-				OR
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND current_gruppe.direktinskription IS NOT TRUE
-					AND other_gruppe.direktinskription IS NOT TRUE
-				)
-				OR
-				(
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-					)
-				)
-			)
-			AND other_kalender.kalender_id NOT IN (
-				SELECT vorgaenger_kalender_id
-				FROM lehre.tbl_kalender
-				WHERE vorgaenger_kalender_id IS NOT NULL
-			)
-			
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, $kalender_ids);
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-		{
-			$grouped[$row->kalender_id][] = true;
-		}
-
-		return $grouped;
-	}
-
-}

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,55 +47,30 @@ 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, $uid);
+		$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, $uid)
 	{
-		$funktion_kurzbzs = [];
-		$rights = $this->_ci->permissionlib->getAccessRights();
-		if ($rights)
-			$funktion_kurzbzs = array_unique(array_map(function ($right) {
-				return $right->funktion_kurzbz;
-			}, $rights));
-		
-		$this->_ci->DashboardPresetModel->db
-			->group_start()
-				->where_in('funktion_kurzbz', $funktion_kurzbzs)
-				->or_where('funktion_kurzbz IS NULL')
-			->group_end();
-
-		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
-		
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard_id
-		]);
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
 		$defaultconfig = array();
 		
-		if (hasData($result))
+		if (hasData($res_presets))
 		{
-			$presets = getData($result);
+			$presets = getData($res_presets);
 			foreach ($presets as $presetobj)
 			{
 				$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 +78,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 +107,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 +126,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;
 	}
@@ -163,10 +137,8 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard->dashboard_id,
-			'funktion_kurzbz' => $funktion_kurzbz
-		]);
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
 		if (hasData($result))
 		{
@@ -218,4 +190,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;
+		}
+	}
 }

application/libraries/sabredav/SabreDAVAuthLib.php

@@ -1,38 +0,0 @@
-<?php
-
-class SabreDAVAuthLib extends \Sabre\DAV\Auth\Backend\AbstractBasic
-{
-	private $_ci;
-	protected $currentUser = null;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		
-		$this->_ci->load->library('AuthLib', array(false));
-		$this->_ci->load->helper('hlp_authentication');
-	}
-
-	public function getCurrentUser()
-	{
-		if ($this->currentUser)
-			return $this->currentUser;
-
-		if (isLogged())
-			return getAuthUID();
-
-		return null;
-	}
-
-	protected function validateUserPass($username, $password)
-	{
-		if (isSuccess($this->_ci->authlib->checkUserAuthByUsernamePassword($username, $password)))
-		{
-			$this->currentUser = $username;
-			return true;
-		}
-
-		$this->currentUser = null;
-		return false;
-	}
-}

application/libraries/sabredav/SabreDAVCalDAVLib.php

@@ -1,11 +0,0 @@
-<?php
-
-require_once __DIR__.'/caldav/SabreDAVACLPrincipalBackend.php';
-require_once __DIR__.'/caldav/SabreDAVCalDAVBackend.php';
-
-/**
- * Loads the SabreDAV CalDAV classes for the LVPlan calendar endpoint.
- */
-class SabreDAVCalDAVLib
-{
-}

application/libraries/sabredav/caldav/SabreDAVACLPrincipalBackend.php

@@ -1,179 +0,0 @@
-<?php
-
-/**
- * PDO principal backend
- *
- * This is a simple principal backend that maps exactly to the users table, as
- * used by Sabre_DAV_Auth_Backend_PDO.
- *
- * It assumes all principals are in a single collection. The default collection
- * is 'principals/', but this can be overriden.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class SabreDAVACLPrincipalBackend implements \Sabre\DAVACL\PrincipalBackend\BackendInterface
-{
-    /**
-     * PDO table name for 'principals'
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * PDO table name for 'group members'
-     *
-     * @var string
-     */
-    protected $groupMembersTableName;
-
-	protected $result_ma;
-	protected $auth;
-    /**
-     * Sets up the backend.
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     */
-    public function __construct($auth)
-	{
-		$this->auth = $auth;
-
-		/*
-		$ma = new mitarbeiter();
-		$this->result_ma = $ma->getMitarbeiter(null,null,null);
-		*/
-    }
-
-	/**
-	 * Liefert den eingeloggten User
-	 */
-	function getUser()
-	{
-		return $this->auth->getCurrentUser();
-	}
-
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    public function getPrincipalsByPrefix($prefixPath)
-	{
-		//$prefixPath = principals
-		//error_log('Principal.php/getPrincipalsByPrefix('.$prefixPath.')');
-        $principals = array();
-		$user = $this->getUser();
-
-		if($prefixPath=='principals')
-		{
-
-		    $principals[] = array(
-					'id' => $user,
-		            'uri' => 'principals/'.$user,
-		            '{DAV:}displayname' => $user,
-		            '{http://sabredav.org/ns}email-address' => $user.'@example.com',
-		        );
-		}
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getPrincipalByPath($path)
-	{
-		$user = mb_substr($path,11);
-
-        $result = array(
-            'id'  => $user,
-            'uri' => 'principals/'.$user,
-            '{DAV:}displayname' => $user,
-            '{http://sabredav.org/ns}email-address' => $user.'@example.com',
-        );
-
-		return $result;
-    }
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMemberSet($principal)
-	{
-        $result = array();
-
-		return $result;
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMembership($principal)
-	{
-		$result = array();
-		if(preg_match('/^principals\/[0-9A-Za-z\-]*$/',$principal))
-		{
-			$user = mb_substr($principal,11);
-		}
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members)
-	{
-		throw new \Sabre\DAV\Exception('Not implemented');
-    }
-
-   public function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch)
-   {
-	$propPatch->setRemainingResultCode(403);
-   }
-
-	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof')
-	{
-		return array();
-	}
-
-	public function findByUri($uri, $principalPrefix)
-	{
-		return null;
-	}
-}

application/libraries/sabredav/caldav/SabreDAVCalDAVBackend.php

@@ -1,574 +0,0 @@
-<?php
-
-/**
- * CalDAV backend
- */
-class SabreDAVCalDAVBackend extends \Sabre\CalDAV\Backend\AbstractBackend
-{
-	protected $auth;
-
-	protected $CI;
-
-	CONST CALENDAR_NAME = 'LVPlan';
-	CONST CAL_CATEGORY_STUNDENPLAN = 'Stundenplan';
-	CONST CAL_CATEGORY_STUNDENPLAN_EXAM = 'StundenplanExam';
-	CONST CAL_CATEGORY_STUNDENPLAN_REMOTE = 'StundenplanRemote';
-
-	CONST CAL_CATEGORY_STUNDENPLAN_EXAM_ICON = '📝';
-	CONST CAL_CATEGORY_STUNDENPLAN_REMOTE_ICON = '📍';
-	CONST CAL_CATEGORY_RESERVATION_ICON = '📌';
-	/**
-     * Creates the backend
-     *
-     * @param AuthBackend $auth
-     */
-    public function __construct($auth)
-	{
-		$this->auth = $auth;
-
-		$this->CI =& get_instance();
-    }
-
-	/**
-	 * Liefert den eingeloggten User
-	 */
-	function getUser()
-	{
-		return $this->auth->getCurrentUser();
-	}
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principalUri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri)
-	{
-		$user = mb_substr($principalUri,11);
-        $calendars = array();
-		$calendar = array(
-			'id' => $user,
-			'uri' => self::CALENDAR_NAME.'-'.$user,
-			'principaluri' => 'principals/'.$user,
-			'{' . \Sabre\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $this->buildCalendarCtag($user),
-			'{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet(array('VEVENT')),
-			'{DAV:}displayname'                          => self::CALENDAR_NAME,
-			'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description comes here',
-			'{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'Europe/Vienna',
-			'{http://apple.com/ns/ical/}calendar-order'  => '1',
-			'{http://apple.com/ns/ical/}calendar-color'  => '#FF0000',
-			'{http://sabredav.org/ns}read-only' => 1
-        );
-		$calendars[] = $calendar;
-
-        return $calendars;
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     */
-    public function createCalendar($principalUri,$calendarUri, array $properties)
-	{
-		return $calendarUri;
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existant property is always succesful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
-	{
-        $propPatch->setRemainingResultCode(200);
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId)
-	{
-		return null;
-    }
-
-
-	public function getCalendarData($userUID, $objectUri=null)
-	{
-		$this->CI->load->model("ressource/Mitarbeiter_model", "MitarbeiterModel");
-		$this->CI->load->model("person/Benutzer_model", "BenutzerModel");
-
-		$user = $this->CI->BenutzerModel->loadWhere(array("uid" => $userUID));
-		if(!$user)
-			die('User invalid');
-
-		$this->CI->load->library('KalenderLib', ['uid' => $userUID]);
-
-		$isUserEmployeeResult = $this->CI->MitarbeiterModel->isMitarbeiter($userUID);
-		if (isError($isUserEmployeeResult)) {
-			return;
-		}
-		$isUserEmployee = getData($isUserEmployeeResult);
-
-		$startDate = date('Y-m-d', mktime(0,0,0,date('m'),date('d')-14,date('Y')));
-		$endDate = date('Y-m-d', mktime(0,0,0,date('m')+6,date('d'),date('Y')));
-
-		$data = [];
-
-		if ($isUserEmployee) {
-			$data = $this->CI->kalenderlib->getPlanForLecturerByLecturer($startDate, $endDate, $userUID);
-		} else {
-			$data = $this->CI->kalenderlib->getPlanForStudentByStudent($startDate, $endDate, $userUID);
-		}
-
-		if(!is_array($data))
-			$data = array();
-
-		foreach($data as $item)
-		{
-			$item->calendarDataFragment = $this->buildCalendarDataFragment($item);
-		}
-
-		if (is_null($objectUri))
-		{
-			return $data;
-		}
-
-		$normalizedObjectUri = $this->normalizeObjectUri($objectUri);
-		foreach($data as $row)
-		{
-			if(md5($row->eindeutige_kalender_gruppen_id) == $normalizedObjectUri)
-			{
-				return $row;
-			}
-		}
-
-		return null;
-	}
-
-	public function makeCal($event)
-	{
-		return $this->buildICalLine('BEGIN', 'VCALENDAR')
-			.$this->buildICalLine('VERSION', '2.0')
-			.$this->buildICalTextLine('PRODID', 'FH Technikum Wien')
-			.$this->buildICalLine('BEGIN', 'VTIMEZONE')
-			.$this->buildICalLine('TZID', 'Europe/Vienna')
-			.$this->buildICalLine('BEGIN', 'DAYLIGHT')
-			.$this->buildICalLine('TZOFFSETFROM', '+0100')
-			.$this->buildICalLine('RRULE', 'FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU')
-			.$this->buildICalLine('DTSTART', '19810329T020000')
-			.$this->buildICalLine('TZNAME', 'GMT+02:00')
-			.$this->buildICalLine('TZOFFSETTO', '+0200')
-			.$this->buildICalLine('END', 'DAYLIGHT')
-			.$this->buildICalLine('BEGIN', 'STANDARD')
-			.$this->buildICalLine('TZOFFSETFROM', '+0200')
-			.$this->buildICalLine('RRULE', 'FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU')
-			.$this->buildICalLine('DTSTART', '19961027T030000')
-			.$this->buildICalLine('TZNAME', 'GMT+01:00')
-			.$this->buildICalLine('TZOFFSETTO', '+0100')
-			.$this->buildICalLine('END', 'STANDARD')
-			.$this->buildICalLine('END', 'VTIMEZONE')
-			.$event
-			.$this->buildICalLine('END', 'VCALENDAR');
-	}
-
-	protected function buildCalendarDataFragment($item)
-	{
-		$summaryIcon = '';
-		$summary = $item->type == 'reservierung' ? $item->titel : $item->topic;
-
-		$description = "";
-		if ($item->type == 'reservierung') {
-			$description = $item->beschreibung;
-		} else {
-			$description = $item->lehrfach_bez . "\r\n";
-
-			if (isset($item->lektor) && is_array($item->lektor) && count($item->lektor) > 0) {
-				$description .= "Lektor*in: " . join(", ", array_map(function($teacher) { return $teacher["kurzbz"]; }, $item->lektor)) . "\r\n";
-			}
-		}
-
-
-		$category = self::CAL_CATEGORY_STUNDENPLAN;
-		if ($item->type === 'lehreinheit') {
-			if ($item->lehrform === 'EXAM') {
-				$summaryIcon = self::CAL_CATEGORY_STUNDENPLAN_EXAM_ICON;
-				$category = self::CAL_CATEGORY_STUNDENPLAN_EXAM;
-			} else if (!isset($item->ko_ort_kurzbz) || $item->ko_ort_kurzbz === '') {
-				$summaryIcon = self::CAL_CATEGORY_STUNDENPLAN_REMOTE_ICON;
-				$category = self::CAL_CATEGORY_STUNDENPLAN_REMOTE;
-			}
-		} else if ($item->type === 'reservierung' && (!isset($item->ko_ort_kurzbz) || $item->ko_ort_kurzbz === '')) {
-			$summaryIcon = self::CAL_CATEGORY_RESERVATION_ICON;
-			$category = self::CAL_CATEGORY_STUNDENPLAN_REMOTE;
-		}
-		
-		if ($summaryIcon !== '') {
-			$summary = $summaryIcon . ' ' . $summary;
-		}
-
-		$parsedStartDate = $this->formatICalLocalDateTime($item->isostart);
-		$parsedEndDate = $this->formatICalLocalDateTime($item->isoend);
-		$lastModified = $this->formatICalUtcDateTime(isset($item->updateamum) ? $item->updateamum : null);
-		$dtStamp = $lastModified ?: $this->formatICalUtcDateTime($item->isostart);
-
-		if($dtStamp === null)
-			$dtStamp = '19700101T000000Z';
-
-		$fragment = $this->buildICalLine('BEGIN', 'VEVENT')
-			.$this->buildICalTextLine('UID', $item->eindeutige_kalender_gruppen_id)
-			.$this->buildICalLine('SEQUENCE', (int)$item->kalender_id)
-			.$this->buildICalTextLine('SUMMARY', $summary)
-			.$this->buildICalTextLine('DESCRIPTION', $description)
-			.$this->buildICalTextLine('LOCATION', isset($item->ort_kurzbz) ? $item->ort_kurzbz : '')
-			.$this->buildICalTextLine('CATEGORIES', $category)
-			.$this->buildICalLine('DTSTART', $parsedStartDate, array('TZID' => 'Europe/Vienna'))
-			.$this->buildICalLine('DTEND', $parsedEndDate, array('TZID' => 'Europe/Vienna'));
-
-		if($lastModified !== null)
-			$fragment .= $this->buildICalLine('LAST-MODIFIED', $lastModified);
-
-		return $fragment
-			.$this->buildICalLine('DTSTAMP', $dtStamp)
-			.$this->buildICalLine('END', 'VEVENT');
-	}
-
-	protected function buildCalendarCtag($userUID)
-	{
-		$data = $this->getCalendarData($userUID);
-		if(!is_array($data))
-			$data = array();
-
-		$fragments = array();
-		foreach($data as $row)
-		{
-			$lastModified = isset($row->updateamum) ? $this->getLastModifiedTimestamp($row->updateamum) : null;
-			$calendarData = isset($row->calendarDataFragment) ? $this->makeCal($row->calendarDataFragment) : '';
-			$fragments[] = $this->getObjectUri($row).':'.$lastModified.':'.md5($calendarData);
-		}
-
-		sort($fragments, SORT_STRING);
-		return self::CALENDAR_NAME.'-'.$userUID.'-'.md5(implode('|', $fragments));
-	}
-
-	protected function buildICalTextLine($name, $value, array $parameters = array())
-	{
-		return $this->buildICalLine($name, $this->escapeICalText($value), $parameters);
-	}
-
-	protected function buildICalLine($name, $value, array $parameters = array())
-	{
-		$line = strtoupper($name);
-
-		foreach($parameters as $parameterName => $parameterValue)
-		{
-			$parameterValues = is_array($parameterValue) ? $parameterValue : array($parameterValue);
-			$escapedValues = array();
-
-			foreach($parameterValues as $singleParameterValue)
-				$escapedValues[] = $this->escapeICalParameterValue($singleParameterValue);
-
-			$line .= ';'.strtoupper($parameterName).'='.implode(',', $escapedValues);
-		}
-
-		return $this->foldICalLine($line.':'.(string)$value);
-	}
-
-	protected function foldICalLine($line)
-	{
-		$line = (string)$line;
-		$folded = '';
-
-		while(strlen($line) > 75)
-		{
-			$part = mb_strcut($line, 0, 75, 'UTF-8');
-			$folded .= $part."\r\n";
-			$line = ' '.mb_strcut($line, strlen($part), strlen($line) - strlen($part), 'UTF-8');
-		}
-
-		return $folded.$line."\r\n";
-	}
-
-	protected function escapeICalText($value)
-	{
-		$value = (string)$value;
-		$value = str_replace('\\', '\\\\', $value);
-		$value = str_replace(array("\r\n", "\r", "\n"), '\n', $value);
-		return str_replace(array(';', ','), array('\;', '\,'), $value);
-	}
-
-	protected function escapeICalParameterValue($value)
-	{
-		$value = (string)$value;
-		$value = str_replace(array('\\', '"', "\r", "\n"), array('\\\\', '\"', '', ''), $value);
-
-		if(preg_match('/[;:,]/', $value))
-			return '"'.$value.'"';
-
-		return $value;
-	}
-
-	protected function formatICalLocalDateTime($dateTime)
-	{
-		$dateTime = $this->createDateTime($dateTime);
-		if($dateTime === null)
-			return null;
-
-		$dateTime->setTimezone(new DateTimeZone('Europe/Vienna'));
-		return $dateTime->format('Ymd\THis');
-	}
-
-	protected function formatICalUtcDateTime($dateTime)
-	{
-		$dateTime = $this->createDateTime($dateTime);
-		if($dateTime === null)
-			return null;
-
-		$dateTime->setTimezone(new DateTimeZone('UTC'));
-		return $dateTime->format('Ymd\THis\Z');
-	}
-
-	protected function createDateTime($dateTime)
-	{
-		if($dateTime instanceof DateTime)
-			return clone $dateTime;
-
-		if($dateTime === null || $dateTime === '')
-			return null;
-
-		try
-		{
-			if(is_numeric($dateTime))
-				return new DateTime('@'.(int)$dateTime);
-
-			return new DateTime($dateTime);
-		}
-		catch(Exception $e)
-		{
-			return null;
-		}
-	}
-
-	protected function getObjectUri($row)
-	{
-		return md5($row->eindeutige_kalender_gruppen_id).'.ics';
-	}
-
-	protected function normalizeObjectUri($objectUri)
-	{
-		$normalizedObjectUri = (string)$objectUri;
-
-		if(substr($normalizedObjectUri, -4) === '.ics')
-			$normalizedObjectUri = substr($normalizedObjectUri, 0, -4);
-
-		if(mb_strpos($normalizedObjectUri, '@') !== false)
-			$normalizedObjectUri = mb_substr($normalizedObjectUri, mb_strpos($normalizedObjectUri, '@') + 1);
-
-		if($this->hasObjectUriDatePrefix($normalizedObjectUri))
-			return mb_substr($normalizedObjectUri, mb_strpos($normalizedObjectUri, '-') + 1);
-
-		return $normalizedObjectUri;
-	}
-
-	protected function hasObjectUriDatePrefix($objectUri)
-	{
-		$hyphenPosition = mb_strpos($objectUri, '-');
-		if($hyphenPosition !== 15)
-			return false;
-
-		return preg_match('/^\d{8}T\d{6}$/', mb_substr($objectUri, 0, 15)) === 1;
-	}
-
-	protected function buildCalendarObject($row, $calendarId)
-	{
-		$calendarData = $this->makeCal($row->calendarDataFragment);
-
-		return array(
-			"id"=>$row->eindeutige_kalender_gruppen_id,
-			"calendardata"=>$calendarData,
-			"uri"=>$this->getObjectUri($row),
-			"lastmodified"=>$this->getLastModifiedTimestamp($row->updateamum),
-			"etag"=>'"'.md5($calendarData).'"',
-			"calendarid"=>$calendarId,
-			"size"=>strlen($calendarData),
-			"component"=>'vevent'
-		);
-	}
-
-	protected function getLastModifiedTimestamp($lastModified)
-	{
-		if($lastModified === null || $lastModified === '')
-			return null;
-
-		if(is_numeric($lastModified))
-			return (int)$lastModified;
-
-		$timestamp = strtotime($lastModified);
-		if($timestamp === false)
-			return null;
-
-		return $timestamp;
-	}
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calnedar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId)
-	{
-		//$user = $this->getUser();
-		$user = $calendarId;
-		$data = $this->getCalendarData($user);
-
-		//error_log("Caldav_Backend.php/getCalendarObjects($calendarId) ");
-		$return  = array();
-
-		if(!is_array($data))
-			return $return;
-
-		foreach($data as $row)
-		{
-			$return[] = $this->buildCalendarObject($row, $calendarId);
-		}
-		return $return;
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array
-     */
-    public function getCalendarObject($calendarId,$objectUri)
-	{
-		$user = $calendarId;
-		$data = $this->getCalendarData($user,$objectUri);
-
-		if(empty($data))
-		{
-			return null;
-		}
-		elseif(is_object($data))
-		{
-			$ret = $this->buildCalendarObject($data, $calendarId);
-		}
-
-		return isset($ret) ? $ret : null;
-    }
-
-    /**
-     * Creates a new calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData)
-	{
-		return null;
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return void
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData)
-	{
-		if(is_resource($calendarData))
-			$calendarData = stream_get_contents($calendarData);
-
-		return '"'.md5((string)$calendarData).'"';
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri)
-	{
-		return null;
-    }
-}