Merge branch 'master' into feature-61599/DocumentExportLib_erweitern

# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php

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

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

application/config/routes.php

@@ -140,8 +140,6 @@ $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(
 // 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/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/config/treemenu.php

@@ -27,8 +27,3 @@ $config['lvv'] = [
 	"library" => "treemenu/LvVwLib",
 	"permissions" => ["admin:r", "assistenz:r"]
 ];
-
-$config['tempus'] = [
-	"library" => "treemenu/TempusLib",
-	"permissions" => ["admin:r", "assistenz:r", "lehre/lvplan:r"]
-];

application/config/treemenu/custom/tempus.php

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

application/controllers/Cis/Compat.php

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

application/controllers/Cis/Documents.php

@@ -20,8 +20,12 @@ class Documents extends Auth_Controller
 			'download' => [self::PERM_LOGGED]
 		]);
 
+		// Load models
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
+		// Load libraries
+		$this->load->library('AkteLib');
+
 		$this->loadPhrases([
 			'global',
 			'tools'
@@ -112,10 +116,12 @@ class Documents extends Auth_Controller
 
 		$selfservice = null;
 		if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
-			$this->load->model('crm/Akte_model', 'AkteModel');
 			$selfservice = [];
 			foreach ($person_ids as $person_id) {
-				$result = $this->AkteModel->getArchiv($person_id, null, true);
+				$result = $this->aktelib->getByPersonId(
+					$person_id,
+					true
+				);
 				if (isError($result))
 					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
@@ -147,14 +153,13 @@ class Documents extends Auth_Controller
 		if (!is_numeric($akte_id))
 			return show_404();
 
-		$this->load->model('crm/Akte_model', 'AkteModel');
-		$result = $this->AkteModel->load($akte_id);
+		$result = $this->aktelib->getByAkteId($akte_id);
 		if (isError($result))
 			return show_error(getError($result));
 		$akte = getData($result);
 		if (!$akte)
 			return show_404();
-		$akte = current($akte);
+		$akte = reset($akte);
 
 		$admin_access = false;
 		if ($uid !== null && $this->permissionlib->isBerechtigt('admin')) {

application/controllers/Cis/ProfilUpdate.php

@@ -64,7 +64,7 @@ class ProfilUpdate extends Auth_Controller
 			{
 				// Get file to be downloaded from DMS
 				$newFilename = $this->uid . "/document_" . $dms_id;
-				$download = $this->dmslib->download($dms_id);
+				$download = $this->dmslib->getOutputFileInfo($dms_id);
 				if (isError($download))
 					return $download;
 
@@ -84,3 +84,4 @@ class ProfilUpdate extends Auth_Controller
 		}
 	}
 }
+

application/controllers/Cis/Pub.php

@@ -29,10 +29,14 @@ class Pub extends Auth_Controller
 	 */
 	public function bild($source, $id)
 	{
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$person_id_user = '';
+		$person_id_user = getAuthPersonId();
 		$serverzugriff = false;
+		// Default Bild (Dummy Profilbild)
+		$outputFileName = FHCPATH . 'skin/images/profilbild_dummy.jpg';
+		$outputFileContent = '';
+		$mimetype = 'application/jpeg';
+
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		// Wenn das Bild direkt aufgerufen wird, ist eine Authentifizierung erforderlich
 		// Wenn es vom Server selbst aufgerufen wird, ist keine Auth. notwendig
@@ -45,31 +49,27 @@ class Pub extends Auth_Controller
 					'zugangscode' => $_SESSION['incoming/user']
 				]);
 				if (hasData($result))
-					$person_id_user = current(getData($result))->person_id;
+					$person_id_user = getData($result)[0]->person_id;
 			} elseif (isset($_SESSION['prestudent/user'])) { // Von Prestudententool
 				$result = $this->PersonModel->loadWhere([
 					'zugangscode' => $_SESSION['prestudent/user']
 				]);
 				if (hasData($result))
-					$person_id_user = current(getData($result))->person_id;
+					$person_id_user = getData($result)[0]->person_id;
 			} elseif (isset($_SESSION['bewerbung/personId'])) { // Von Bewerbungstool
 				$person_id_user = $_SESSION['bewerbung/personId'];
-			} else {
-				$person_id_user = getAuthPersonId();
 			}
 		} else {
 			$serverzugriff = true;
 		}
 
-		// Default Bild (Dummy Profilbild)
-		$cTmpHEX = base64_encode(file_get_contents(FHCPATH . 'skin/images/profilbild_dummy.jpg'));
-
-		if ($source == 'person' && $id) {
+		// If the picture is from the person table
+		if ($source == 'person' && is_numeric($id)) {
 			$foto_gesperrt = false;
 			// Person laden und Fotosperre überprüfen
 			$result = $this->PersonModel->load($id);
 			if (hasData($result)) {
-				$person = current(getData($result));
+				$person = getData($result)[0];
 				if ($person->foto_sperre) {
 					// Wenn der User selbst darauf zugreift darf er das Bild sehen
 					$foto_gesperrt = ($person_id_user != $id);
@@ -77,91 +77,57 @@ class Pub extends Auth_Controller
 					$foto_gesperrt = true;
 				}
 
-				if ($person->foto && !$foto_gesperrt) {
-					$cTmpHEX = base64_decode($person->foto);
+				if (!isEmptyString($person->foto) && !$foto_gesperrt) {
+					$outputFileContent = base64_decode($person->foto);
 				}
 			}
 		}
-		if($source == 'akte' && $id != '')
+
+		// If the picture is from the akte/dms
+		if($source == 'akte' && is_numeric($id))
 		{
-			$this->load->model('crm/Akte_model', 'AkteModel');
+			$mimetype = '';
+			$this->load->library('AkteLib');
 
-			$this->AkteModel->addJoin('public.tbl_person', 'person_id');
-			$result = $this->AkteModel->loadWhere([
-				'person_id' => $id,
-				'dokument_kurzbz' => 'Lichtbil'
-			]);
+			$akteResult = $this->aktelib->getByAkteId($id, 'Lichtbil');
 
-			if (hasData($result)) {
+			if (hasData($akteResult)) {
 				$foto_gesperrt = false;
+				$akte = getData($akteResult)[0];
 
-				$akte = current(getData($result));
-				if ($akte->foto_sperre) {
-					// Wenn der User selbst darauf zugreift darf er das Bild sehen
-					$foto_gesperrt = ($person_id_user != $id);
-				} elseif (!$person_id_user && !$serverzugriff) {
-					$foto_gesperrt = true;
-				}
-
-				// Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
-				if (!$akte->inhalt && $akte->dms_id) {
-					$this->load->model('content/Dms_model', 'DmsModel');
-					$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
-
-					$this->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
-					$this->DmsModel->addOrder('version', 'DESC');
-					$this->DmsModel->addLimit(1);
-					$result = $this->DmsModel->load($akte->dms_id);
-
-					if (!hasData($result))
-						die('Kein Dokument vorhanden');
-
-					$dms = current(getData($result));
-
-					$filename = DMS_PATH . $dms->filename;
-
-					$this->DmsVersionModel->update([
-						'dms_id' => $dms->dms_id,
-						'version' => $dms->version
-					], [
-						'letzterzugriff' => date('c')
-					]);
-
-					if (file_exists($filename)) {
-						$handle = fopen($filename, "r");
-						if ($handle) {
-							while (!feof($handle)) {
-								$akte->inhalt .= fread($handle, 8192);
-							}
-							fclose($handle);
-						} else {
-							echo 'Fehler: Datei konnte nicht geoeffnet werden';
-						}
-					} else {
-						echo 'Die Datei existiert nicht';
+				$personResult = $this->PersonModel->load($akte->person_id);
+				if (hasData($personResult)) {
+					$person = getData($personResult)[0];
+					if ($person->foto_sperre) {
+						$foto_gesperrt = ($person_id_user != $id);
+					} elseif (!$person_id_user && !$serverzugriff) {
+						$foto_gesperrt = true;
 					}
 				}
 
-				if ($akte->inhalt && !$foto_gesperrt) {
-					$cTmpHEX = $akte->inhalt;
+				// Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
+				if (!isEmptyString($akte->inhalt)) {
+					$outputFileContent = base64_decode($akte->inhalt);
+					$mimetype = $akte->mimetype;
 				}
 			}
 		}
 
-		// die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
-		// von pdfs kommen kann.
-
-		$im = @imagecreatefromstring(base64_decode($cTmpHEX));
-		if ($im) {
-			@ob_clean();
-			header("Content-type: image/jpeg");
-			exit(imagejpeg($im));
-		} else {
-			// bei manchen Bildern funktioniert die konvertierung nicht
-			// diese werden dann einfach so angezeigt.
-			@ob_clean();
-			header("Content-type: image/gif");
-			exit($cTmpHEX);
+		// If file content is provided
+		if (!isEmptyString($outputFileContent))
+		{
+			// If a mimetype is still not found
+			if (isEmptyString($mimetype))
+			{
+				$fo = finfo_open();
+				$mimetype = finfo_buffer($fo, $outputFileContent, FILEINFO_MIME_TYPE);
+			}
+			$this->outputImageByContent($mimetype, $outputFileContent);
+		}
+		else // otherwise use the file
+		{
+			$this->outputImageByFile($mimetype, $outputFileName);
 		}
 	}
 }
+

application/controllers/Documents.php

@@ -143,7 +143,7 @@ class Documents extends Auth_Controller
 
 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			if (isError($result))
-				return show_error(getError($result));
+				show_error(getError($result));
 			if (!hasData($result))
 				return show_404();
 			
@@ -226,13 +226,13 @@ class Documents extends Auth_Controller
 
 		$result = $this->VorlageModel->load($xsl);
 		if (isError($result))
-			return show_error(getError($result));
+			show_error(getError($result));
 		if (!hasData($result))
 			show_404();
 		
 		$vorlage = current(getData($result));
 		if ($sign_user && !$vorlage->signierbar)
-			return show_error($this->p->t("stv", "grades_error_sign"));
+			show_error($this->p->t("stv", "grades_error_sign"));
 
 		
 		// Filename
@@ -284,11 +284,23 @@ class Documents extends Auth_Controller
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		if (isError($result))
-			return show_error(getError($result));
+			show_error(getError($result));
 
 		$data = getData($result);
 
-		// Output
-		$this->documentexportlib->showContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+		// Get the content
+		$contentResult = $this->documentexportlib->getContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+
+		// If an error occurred
+		if (isError($contentResult)) show_error(getError($contentResult));
+
+		$fileObj = new stdClass();
+		$fileObj->file_content = getData($contentResult);
+		$fileObj->name = $filename;
+		$fileObj->mimetype = isEmptyString($vorlage->mimetype) ? 'application/pdf' : $vorlage->mimetype;
+		$fileObj->disposition = 'attachment';
+
+		// Download
+		$this->outputFile($fileObj);
 	}
 }

application/controllers/Tempus.php

@@ -1,69 +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');
-	}
-
-	public function index()
-	{
-		$this->_loadView();
-	}
-
-	public function sync()
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-
-		$this->OrganisationseinheitModel->addJoin('tbl_studiengang', 'oe_kurzbz', 'LEFT');
-
-		$this->OrganisationseinheitModel->addSelect('public.tbl_organisationseinheit.organisationseinheittyp_kurzbz,
-															public.tbl_organisationseinheit.bezeichnung,
-															public.tbl_studiengang.studiengang_kz,
-															public.tbl_organisationseinheit.oe_kurzbz,
-															tbl_studiengang.typ,
-															COALESCE(public.tbl_studiengang.bezeichnung, \'\') as stgbezeichnung');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.aktiv', 'DESC');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.organisationseinheittyp_kurzbz');
-		$organisationen = getData($this->OrganisationseinheitModel->loadWhere(array("tbl_organisationseinheit.aktiv" => true)));
-
-
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemestern = getData($this->StudiensemesterModel->load());
-
-		$this->_loadView(array('organisationen' => $organisationen, 'studiensemestern' => $studiensemestern));
-	}
-
-	private function _loadView($extraVariables = [])
-	{
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'stundenraster' => $this->permissionlib->isBerechtigt('basis/tempus_stundenraster'),
-			],
-			'variables' => array_merge([
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			], $extraVariables)
-		]);
-	}
-}

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

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 
@@ -91,6 +94,8 @@ class CisMenu extends FHCAPI_Controller
 		$doc->loadXML($menuItem->content);
 		$urlElem = $doc->getElementsByTagName('url')->item(0);
 
+		$this->menuItemUrlTargetHelper($menuItem, $doc);
+
 		if (!$urlElem) {
 			return '';
 		}
@@ -122,5 +127,18 @@ class CisMenu extends FHCAPI_Controller
 		return $url;
 	}
 
+	private function menuItemUrlTargetHelper($menuItem, $xmldoc)
+	{
+		if($menuItem->template_kurzbz === 'redirect')
+		{
+			$targetElem = $xmldoc->getElementsByTagName('target')->item(0);
+			$target = ($targetElem) ? $targetElem->textContent : '';
+			if(!in_array($target, array('_self', '_top', '_blank')))
+			{
+				$target = '_self';
+			}
+			$menuItem->target = $target;
+		}
+	}
 }
 

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

@@ -51,6 +51,8 @@ class Documents extends FHCAPI_Controller
 		$this->loadPhrases([
 			'stv'
 		]);
+
+		$this->load->library('DocumentExportLib');
 	}
 
 	/**
@@ -100,23 +102,11 @@ class Documents extends FHCAPI_Controller
 	{
 		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
 
-		$akteData = $akteData['akteData'];
-		$exportData = $akteData['exportData'];
-
-		/**
-		 *				[
-					'vorlage' => $vorlage,
-					'xml_data' => $data,
-					'oe_kurzbz' => $xsl_oe_kurzbz,
-					'version' => $version,
-					'outputformat' => $outputformat,
-					'sign_user' => $sign_user
-				]
-		 */
+		$akteData = $akteExportData['akteData'];
+		$exportData = $akteExportData['exportData'];
 
 		// Output
-		$result = $this->documentexportlib->showContent(
-			$akteData['akteData']['inhalt'],
+		$contentResult = $this->documentexportlib->getContent(
 			$exportData['vorlage'],
 			$exportData['xml_data'],
 			$exportData['oe_kurzbz'],
@@ -125,7 +115,9 @@ class Documents extends FHCAPI_Controller
 			$exportData['sign_user']
 		);
 
-		$this->terminateWithSuccess(true);
+		$content = $this->getDataOrTerminateWithError($contentResult);
+
+		$this->terminateWithFileOutput($akteData['mimetype'], $content, $akteData['titel'] . '.pdf');
 	}
 
 	/**
@@ -161,12 +153,10 @@ class Documents extends FHCAPI_Controller
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
-				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
-				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}
 
@@ -465,18 +455,13 @@ class Documents extends FHCAPI_Controller
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));
 
-
-		$this->load->library('DocumentExportLib');
-
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->documentexportlib->addArchiveToData($data);
+		$contentResult = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
 
-		// Output
-		$result = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
-
-		$content = $this->getDataOrTerminateWithError($result);
+		$content = $this->getDataOrTerminateWithError($contentResult);
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);
 
@@ -494,3 +479,4 @@ class Documents extends FHCAPI_Controller
 		];
 	}
 }
+

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

@@ -81,7 +81,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	{
 		$studiengang_kz = $this->getStudiengangKz($stg_kz);
 
-		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
+		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$verband = null;

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

@@ -136,7 +136,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->uid == $profil_update->uid
 			) {
 				// Get file to be downloaded from DMS
-				$download = $this->dmslib->download($dms_id);
+				$download = $this->dmslib->getOutputFileInfo($dms_id);
 				$download = $this->getDataOrTerminateWithError($download);
 				// Download file
 				$this->outputFile($download);
@@ -456,24 +456,28 @@ class ProfilUpdate extends FHCAPI_Controller
 			$_FILES['files']['error'] = $files['error'][$i];
 			$_FILES['files']['size'] = $files['size'][$i];
 
-			$dms = [
-				"kategorie_kurzbz" => "profil_aenderung",
-				"version" => 0,
-				"name" => $_FILES['files']['name'],
-				"mimetype" => $_FILES['files']['type'],
-				"beschreibung" => $this->uid . " Profil Änderung",
-				"insertvon" => $this->uid,
-				"insertamum" => "NOW()",
-			];
+			// File upload
+			$uploadDataResult = $this->uploadFile('files', array('jpg', 'png', 'pdf'));
+			if (isError($uploadDataResult)) $this->addError(getError($uploadDataResult));
+			if (!hasData($uploadDataResult)) $this->addError('Upload failed');
 
-			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
-			
-			if(isError($tmp_res)){
-				$this->addError(getError($tmp_res));
+			if (hasData($uploadDataResult))
+			{
+				// Add file to the DMS (DB + file system)
+				$dms_res = $this->dmslib->add(
+					getData($uploadDataResult)['file_name'],
+                        	        getData($uploadDataResult)['file_type'],
+                        	        fopen(getData($uploadDataResult)['full_path'], 'r'),
+                        	        'profil_aenderung', // kategorie_kurzbz
+                        	        null, // dokument_kurzbz
+                        	        null, // beschreibung
+                        	        false, // cis_suche
+                        	        null, // schlagworte
+                        	        getAuthUID() // insertvon
+				);
+				$dms_res = $this->getDataOrTerminateWithError($dms_res);
+				array_push($res, $dms_res);
 			}
-
-			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
-			array_push($res, $tmp_res);
 		}
 
 		$this->terminateWithSuccess($res);

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

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

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

@@ -101,6 +101,9 @@ class Widget extends FHCAPI_Controller
 			$tmpsetup = json_decode($widget->setup);
 			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
 			$widget->setup = $tmpsetup;
+			$widget->permitted = empty($widget->berechtigung_kurzbz) 
+				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
+
 			return $widget;
 		}, $widgets);
 

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

@@ -184,17 +184,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/organisation/Studiensemester.php

@@ -28,7 +28,8 @@ class Studiensemester extends FHCAPI_Controller
 				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
 				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
 				'current' => self::PERM_LOGGED,
-				'set' => self::PERM_LOGGED
+				'set' => self::PERM_LOGGED,
+				'getContainingOrNearestByDateRange' => self::PERM_LOGGED,
 			)
 		);
 		// Load model StudiensemesterModel
@@ -203,4 +204,15 @@ class Studiensemester extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(true);
 	}
+
+	public function getContainingOrNearestByDateRange()
+	{
+		$from = $this->input->get("from");
+		$to = $this->input->get("to");
+
+		$result = $this->StudiensemesterModel->getContainingOrNearestByDateRange($from, $to);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }

application/controllers/api/frontend/v1/studstatus/Unterbrechung.php

@@ -158,19 +158,27 @@ class Unterbrechung extends FHCAPI_Controller
 		if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
 			$this->load->library('DmsLib');
 
-			$dms = $this->config->item('unterbrechung_dms');
-			if (!count(array_filter($dms, function ($v) {
-				return $v !== null;
-			})))
-				$dms = ['kategorie_kurzbz' => 'Akte'];
-			$dms['version'] = 0;
 
-			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
-			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
+			$uploadDataResult = $this->uploadFile('attachment', $this->config->item('unterbrechung_dms_filetypes') ?: array('*'));
 
-			$data = $this->getDataOrTerminateWithError($result);
-			
-			$dms_id = $data['dms_id'];
+			$data = $this->getDataOrTerminateWithError($uploadDataResult);
+
+			// Add file to the DMS (DB + file system)
+			$dms_res = $this->dmslib->add(
+				getData($uploadDataResult)['file_name'],
+				getData($uploadDataResult)['file_type'],
+				fopen(getData($uploadDataResult)['full_path'], 'r'),
+				'studierendenantrag',
+				null, // dokument_kurzbz
+				null, // beschreibung
+				false, // cis_suche
+				null, // schlagworte
+				getAuthUID() // insertvon
+			);
+
+			$dms_data = $this->getDataOrTerminateWithError($dms_res);
+
+			$dms_id = $dms_data->dms_id;
 		}
 
 		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);

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

@@ -32,8 +32,8 @@ class Akte extends Auth_Controller
 			'download' => ['admin:w', 'assistenz:w'],
 		]);
 
-		// Load models
-		$this->load->model('crm/Akte_model', 'AkteModel');
+		// Load libraries
+		$this->load->library('AkteLib');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -49,22 +49,22 @@ class Akte extends Auth_Controller
 
 		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
 
-		$result = $this->AkteModel->load($akte_id);
+		$akteResult = $this->aktelib->getByAkteId($akte_id);
 
-		if (!hasData($result)) $this->terminateWithError('Akte not found');
+		if (!hasData($akteResult)) $this->terminateWithError('Akte not found');
 
-		$data = getData($result)[0];
+		$data = getData($akteResult)[0];
 
-		if (isset($data->inhalt) && $data->inhalt != '')
+		if (!isEmptyString($data->inhalt))
 		{
-			header('Content-Description: File Transfer');
-			header('Content-Type: '. $data->mimetype);
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate');
-			header('Pragma: public');
-			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
-			echo base64_decode($data->inhalt);
-			die();
+			$fileObj = new stdClass();
+			$fileObj->file_content = base64_decode($data->inhalt);
+			$fileObj->name = $data->filename;
+			$fileObj->mimetype = $data->mimetype;
+			$fileObj->disposition = 'attachment';
+
+			$this->outputFile($fileObj);
 		}
 	}
 }
+

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

@@ -46,6 +46,9 @@ class Archiv extends FHCAPI_Controller
 		$this->load->model('crm/Akte_model', 'AkteModel');
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
+		// Load libraries
+		$this->load->library('AkteLib');
+
 		// Load language phrases
 		$this->loadPhrases([
 			'archiv'
@@ -57,7 +60,7 @@ class Archiv extends FHCAPI_Controller
 
 	/**
 	 * Get archive documents for a person
-	 
+
 	 * @return void
 	 */
 	public function getArchiv()
@@ -74,7 +77,11 @@ class Archiv extends FHCAPI_Controller
 				$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$result = $this->AkteModel->getArchiv($person_id);
+		$result = $this->aktelib->getByPersonId(
+			$person_id,
+			null, // dokument_kurzbz
+			true // archiv
+		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -94,51 +101,6 @@ class Archiv extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * 
-	 * @param
-	 * @return object success or error
-	 */
-	public function download()
-	{
-		$akte_id = $this->input->get('akte_id');
-
-		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
-
-		$result = $this->AkteModel->load($akte_id);
-
-		if (!hasData($result)) $this->terminateWithError('Akte not found');
-
-		$data = getData($result)[0];
-
-		$fileObj = new stdClass();
-		if (isset($data->inhalt) && $data->inhalt != '')
-		{
-			// Define handle to output stream
-			$tmpFilePointer   = fopen("php://output", 'w');
-			$meta_data = stream_get_meta_data($tmpFilePointer);
-			$filename = $meta_data["uri"];
-			fwrite($tmpFilePointer, $data->inhalt);
-
-			header('Content-Description: File Transfer');
-			header('Content-Type: '. $data->mimetype);
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate');
-			header('Pragma: public');
-			//header('Content-Length: ' . filesize($fileObj->file));
-			//header("Content-type: $data->mimetype");
-			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
-			readfile($filename);
-			die();
-		}
-		else
-		{
-			$this->load->library('AkteLib');
-
-			$result = $this->aktelib->get($akte_id);
-		}
-	}
-
 	/**
 	 * Updating an Akte
 	 * @return void
@@ -193,7 +155,7 @@ class Archiv extends FHCAPI_Controller
 			$this->addMeta('content', base64_encode($content));
 		}
 
-		
+
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
@@ -248,7 +210,7 @@ class Archiv extends FHCAPI_Controller
 				'akte_id' => $akte_id
 			]));
 		}
-		
+
 		$result = $this->AkteModel->delete($akte_id);
 		if (isError($result)) $this->terminateWithError(getError($result));
 

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

@@ -27,7 +27,8 @@ class Dokumente extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
-		$this->load->library('DmsLib', array('who' => getAuthUID()));
+		$this->load->library('AkteLib');
+		$this->load->library('DmsLib');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -184,7 +185,7 @@ class Dokumente extends FHCAPI_Controller
 				'titel_intern' => $this->input->post('titel_intern'),
 				'nachgereicht_am' => $nachgereicht_am,
 				'updateamum' => date('c'),
-				'updatevon' => $uid,
+				'updatevon' => getAuthUID(),
 			]
 		);
 
@@ -201,8 +202,6 @@ class Dokumente extends FHCAPI_Controller
 		if(!$dokument_kurzbz)
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
 
-		$uid = getAuthUid();
-
 		//check if more than 1 dokumentkurzbz
 		//if()
 
@@ -210,10 +209,10 @@ class Dokumente extends FHCAPI_Controller
 			[
 				'prestudent_id' => $prestudent_id,
 				'dokument_kurzbz' => $dokument_kurzbz,
-				'mitarbeiter_uid' => $uid,
+				'mitarbeiter_uid' => getAuthUID(),
 				'datum' => date('c'),
 				'insertamum' => date('c'),
-				'insertvon' =>  $uid,
+				'insertvon' =>  getAuthUID(),
 			]
 		);
 
@@ -236,7 +235,6 @@ class Dokumente extends FHCAPI_Controller
 		$nachgereicht = current($dataAkte)->nachgereicht;
 		$inhalt = current($dataAkte)->inhalt;
 		$inhaltVorhanden = $inhalt != '';
-		$uid = getAuthUid();
 
 		$this->db->trans_start();
 
@@ -250,16 +248,15 @@ class Dokumente extends FHCAPI_Controller
 			$logdata_dms = "Logdata: " . var_export($logdata_dms, true);
 
 			//delete from dmsLib
-			$this->load->library('DmsLib');
 			$person_id = current($dataAkte)->person_id;
-			$result = $this->dmslib->delete($person_id, $dms_id);
+			$result = $this->aktelib->removeByPersonIdAndDmsId($person_id, $dms_id);
 			$this->getDataOrTerminateWithError($result);
 
 			//LOGGING Dms ID
 			$this->load->model('system/Log_model', 'LogModel');
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => $uid,
+				'mitarbeiter_uid' => getAuthUID(),
 				'beschreibung' => "Löschen der DMS_ID ". $dms_id,
 				'sql' => $logdata_dms
 			]);
@@ -276,7 +273,7 @@ class Dokumente extends FHCAPI_Controller
 			//Logging Deletion Akte
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => $uid,
+				'mitarbeiter_uid' => getAuthUID(),
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -295,7 +292,7 @@ class Dokumente extends FHCAPI_Controller
 
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => $uid,
+				'mitarbeiter_uid' => getAuthUID(),
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -310,7 +307,6 @@ class Dokumente extends FHCAPI_Controller
 
 	public function uploadDokument()
 	{
-		$this->load->library('DmsLib');
 		$prestudent_id = $this->input->post('prestudent_id');
 		$anmerkung_intern = $this->input->post('anmerkung_intern');
 		$titel_intern = $this->input->post('titel_intern');
@@ -333,34 +329,44 @@ class Dokumente extends FHCAPI_Controller
 		}
 
 		$this->db->trans_start();
-		$uid = getAuthUID();
 
-		$dms = array(
-			'kategorie_kurzbz'  => 'Akte',
-			'version'           => 0,
-			'name'              => $_FILES['anhang']['name'],
-			'mimetype'          => $_FILES['anhang']['type'],
-			'insertamum'        => date('c'),
-			'insertvon'         => $uid
-		);
-
-		$result = $this->dmslib->upload($dms, 'anhang', array("jpg", "png", "pdf"));
-
-		if (isError($result))
+		$uploadDataResult = $this->uploadFile('anhang', array('jpg', 'png', 'pdf'));
+		if (isError($uploadDataResult))
 		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
 		}
-		$dms_id = $result->retval['dms_id'];
+
+		// If data exists
+		if (hasData($uploadDataResult))
+		{
+			// Add file to the DMS (DB + file system)
+			$dms_res = $this->dmslib->add(
+				getData($uploadDataResult)['file_name'],
+				getData($uploadDataResult)['file_type'],
+				fopen(getData($uploadDataResult)['full_path'], 'r'),
+				'Akte', // kategorie_kurzbz
+				null, // dokument_kurzbz
+				null, // beschreibung
+				false, // cis_suche
+				null, // schlagworte
+				getAuthUID() // insertvon
+			);
+		}
+
+		// Error occurred or data not found
+		if (isError($dms_res) || !hasData($dms_res)) $this->terminateWithError(getError($dms_res), self::ERROR_TYPE_GENERAL);
+
+		$dms_id = getData($dms_res)->dms_id;
 
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$result = $this->DokumentModel->load($dokument_kurzbz);
-		$data = $this->getDataOrTerminateWithError($result);
+		$dokumentResult = $this->DokumentModel->load($dokument_kurzbz);
+		$data = $this->getDataOrTerminateWithError($dokumentResult);
 
 		$bezeichnung = current($data)->bezeichnung;
 
-		//save entry in akte
-		if($dms_id)
+		// Save entry in akte
+		if ($dms_id)
 		{
 			$result = $this->AkteModel->insert([
 				'person_id' => $person_id,
@@ -369,7 +375,7 @@ class Dokumente extends FHCAPI_Controller
 				'mimetype' => $_FILES['anhang']['type'],
 				'insertamum' => date('c'),
 				'erstelltam' => date('c'),
-				'insertvon' => $uid,
+				'insertvon' => getAuthUID(),
 				'anmerkung_intern' => $anmerkung_intern,
 				'titel_intern' => $titel_intern,
 				'bezeichnung' => $bezeichnung,
@@ -416,28 +422,26 @@ class Dokumente extends FHCAPI_Controller
 		$filecontentbase64 = $data->inhalt;
 		$filename = $data->titel;
 
-		if(intval($data->dms_id) > 0)
+		if (intval($data->dms_id) > 0)
 		{
-			$dmsdokres = $this->dmslib->read($data->dms_id);
-			if (!hasData($dmsdokres)) $this->terminateWithError('DMS File not found');
-			$dmsdok = getData($dmsdokres)[0];
+			$file = $this->dmslib->getOutputFileInfo($data->dms_id, $filename);
 
-			$mimetype = $dmsdok->mimetype;
-			$filecontentbase64 = $dmsdok->file_content;
-			$filename = $dmsdok->name;
+			$this->terminateWithFileOutput(getData($file)->mimetype, file_get_contents(getData($file)->file), $filename);
 		}
+		else
+		{
+			$filecontent = '';
 
-		$filecontent = '';
+			if (!empty($filecontentbase64)) {
+				$filecontent = base64_decode($filecontentbase64, true);
 
-		if (!empty($filecontentbase64)) {
-			$filecontent = base64_decode($filecontentbase64, true);
-
-			if ($filecontent === false) {
-				$this->terminateWithError('Base64-Dekodierung failed.');
+				if ($filecontent === false) {
+					$this->terminateWithError('Base64-Dekodierung failed.');
+				}
 			}
-		}
 
-		$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
+			$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
+		}
 	}
 
 	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
@@ -753,10 +757,7 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$student = current($data);
-
-
-		return $student->prestudent_id;
+		return hasData($data) ? getData($data)[0]->prestudent_id : null;
 	}
 
 	/**

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

@@ -370,6 +370,7 @@ class LvTermine extends FHCAPI_Controller
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
+						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result));

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

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

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

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

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

@@ -108,6 +108,7 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -153,7 +154,8 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-		
+
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);		
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -213,6 +215,7 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(

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

@@ -1,157 +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:rw', 'lehre/lvplan:rw'],
-			'getHeader' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'set' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'updateCollision' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-		]);
-
-		// 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 = [];
-
-		$var_array = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-			'priority_room_planning',
-			'dialog_room_planning'
-		);
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), $var_array);
-
-		$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'
-		];
-
-		$config['roomless_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'roomless_planning'),
-			"value" => ($data['roomless_planning'] ?? 'false') === 'true'
-		];
-
-		$config['priority_room_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'priority_room_planning'),
-			"value" => ($data['priority_room_planning'] ?? 'false') === 'true'
-		];
-
-		$config['dialog_room_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'dialog_room_planning'),
-			"value" => ($data['dialog_room_planning'] ?? '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()
-	{
-		$configs = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-			'priority_room_planning',
-			'dialog_room_planning'
-		);
-
-		foreach ($configs as $config)
-		{
-			$this->_ci->VariableModel->setVariable(
-				getAuthUID(),
-				$config,
-				$this->input->post($config) === 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,276 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_COURSE_FILTER = ['uid', 'stg'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getCourses' => 'lehre/lvplan:rw',
-		]);
-
-		$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 getCourses()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$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());
-
-		$studiensemester_kurzbz = $this->_ci->input->post('studiensemester_kurzbz', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_COURSE_FILTER);
-
-		$this->_getBasePlan($studiensemester_kurzbz);
-
-		$this->_ci->LehreinheitModel->db->group_start();
-		if (isset($filter->stg))
-			$this->_addStgWhere($filter->stg);
-
-		if (isset($filter->uid))
-		{
-			$uid_array = (array) $filter->uid;
-			$this->_ci->LehreinheitModel->db->or_where_in('tbl_benutzer.uid', $uid_array);
-		}
-
-		$this->_ci->LehreinheitModel->db->group_end();
-
-		$this->_ci->LehreinheitModel->addOrder('lehreinheit_id');
-		$result = $this->_ci->LehreinheitModel->load();
-		$result = hasData($result) ? getData($result) : array();
-		$this->terminateWithSuccess($this->_mapEvents($result));
-	}
-
-	private function _getBasePlan($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();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehrform.verplanen', true);
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
-		$this->_ci->LehreinheitModel->db->group_end();
-
-	}
-
-	private function _addStgWhere($studiengaenge)
-	{
-		$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['stg_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();
-	}
-
-	private function _mapEvents($result)
-	{
-		$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);
-		}
-		return array_values($grouped);
-	}
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($values) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = false;
-		$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;
-	}
-
-
-}

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' => 'lehre/lvplan:rw',
-			'set' => 'lehre/lvplan:rw'
-		]);
-
-		// 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' => 'lehre/lvplan:rw',
-		]);
-
-		$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,514 +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', 'orte'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => 'lehre/lvplan:rw',
-			'getCalendarHours' => 'lehre/lvplan:rw',
-			'getPlan' => 'lehre/lvplan:rw',
-			'getPlanByOrt' => 'lehre/lvplan:rw',
-			'getRaumvorschlag' => 'lehre/lvplan:rw',
-			'getRaumvorschlagSlots' => 'lehre/lvplan:rw',
-			'getLehreinheiten' => 'lehre/lvplan:rw',
-			'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' => 'lehre/lvplan:rw',
-			'getZeitsperren' => 'lehre/lvplan:rw',
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'deleteOrtEntry' => 'lehre/lvplan:rw',
-			'deleteFromKalenderEvent' => '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');
-		$this->_ci->load->library('KalenderSyncLib');
-		$this->_ci->load->library('RaumvorschlagLib');
-		$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);
-
-		$isCollisionCheckEnabled = $this->_ci->input->post('collisionCheck', TRUE) ?? false;
-		$maxDailyEventLimit = $this->_ci->input->post('maxDailyEventLimit', TRUE) ?? false;
-
-		$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,
-			$isCollisionCheckEnabled,
-			$maxDailyEventLimit
-		);
-
-		$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->orte ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null, $updateFields->location ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result),  $result->code);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteOrtEntry()
-	{
-		$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->updateOrt($kalender_id, []);
-
-		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 getRaumvorschlagSlots()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$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->get('lehreinheit_id', TRUE);
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$this->terminateWithSuccess(getData($this->_ci->raumvorschlaglib->getVorschlaegeSlots($lehreinheit_id, $start_date, $end_date)));
-	}
-
-	public function getLehreinheiten()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-		$result = $this->_ci->kalenderlib->getLehreinheiten($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	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->kalendersynclib->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));
-	}
-
-	public function deleteFromKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_ids[]',"lehreinheit_ids","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);
-		$lehreinheit_ids = $this->_ci->input->post('lehreinheit_ids', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteFromKalenderEvent($kalender_id, $lehreinheit_ids);
-
-		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/KalenderSync.php

@@ -1,304 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class KalenderSync extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_STATUS = ['preview', 'live'];
-	public function __construct()
-	{
-		parent::__construct([
-			'getSyncs' => ['admin:r', 'assistenz:r'],
-			'loadSync' => ['admin:r', 'assistenz:r'],
-			'add' => ['admin:r', 'assistenz:r'],
-			'start' => ['admin:r', 'assistenz:r'],
-			'delete' => ['admin:r', 'assistenz:r'],
-			'updateSync' => ['admin:r', 'assistenz:r'],
-			'getStudienplan' => ['admin:r', 'assistenz:r'],
-			'getSyncStatus' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->loadPhrases([
-			'lehre',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-		$this->_ci->load->library('KalenderSyncLib');
-	}
-
-	public function getSyncs()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$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());
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('tbl_kalender_syncstatus.*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS sync_status, tbl_organisationseinheit.bezeichnung as oebezeichnung, tbl_studienplan.bezeichnung as studienplanbezeichnung');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_kalender_status', 'tbl_kalender_syncstatus.sync_status_kurzbz = tbl_kalender_status.status_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_organisationseinheit', 'tbl_kalender_syncstatus.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_studienplan', 'tbl_kalender_syncstatus.studienplan_id = tbl_studienplan.studienplan_id', 'LEFT');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_studiensemester', 'tbl_kalender_syncstatus.studiensemester_kurzbz = tbl_studiensemester.studiensemester_kurzbz');
-		$this->_ci->KalenderStatusModel->addOrder('public.tbl_studiensemester.start', 'DESC');
-
-
-		if ($studiensemester_kurzbz === 'all')
-			$data = $this->_ci->KalendersyncstatusModel->load();
-		else
-			$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('tbl_kalender_syncstatus.studiensemester_kurzbz' => $studiensemester_kurzbz));
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('kalender_syncstatus_id', 'kalender_syncstatus_id', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$kalender_syncstatus_id = $this->input->post('kalender_syncstatus_id');
-
-		$result = $this->_ci->KalendersyncstatusModel->load($kalender_syncstatus_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		if (!hasData($result))
-			$this->terminateWithError($this->p->t('lehre', 'errorDeleting'));
-
-		$del_result = $this->_ci->KalendersyncstatusModel->delete(getData($result)[0]->kalender_syncstatus_id);
-
-		if (isError($del_result))
-			$this->terminateWithError(getError($del_result));
-		$this->terminateWithSuccess($del_result);
-	}
-
-	public function loadSync()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-		$kalender_syncstatus_id = $this->_ci->input->get('kalender_syncstatus_id', TRUE);
-		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('kalender_syncstatus_id' => $kalender_syncstatus_id));
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data)[0]);
-	}
-
-	public function getSyncStatus()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS bezeichnung, status_kurzbz');
-		$this->_ci->KalenderStatusModel->db->where_in('status_kurzbz', self::ALLOWED_STATUS);
-		$data = $this->_ci->KalenderStatusModel->load();
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-
-	public function add()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$result = $this->_ci->KalendersyncstatusModel->insert(
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'insertvon' => getAuthUID()
-			)
-		);
-
-		$this->terminateWithSuccess($result);
-	}
-
-
-	public function start()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$result = $this->_ci->kalendersynclib->runManual($formData['oe_kurzbz'], $formData['studiensemester_kurzbz'], $formData['ausbildungssemester'], $formData['studienplan_id'], $formData['mail'], $formData['datum_bis'], $formData['sync_status_kurzbz']);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function updateSync()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id,
-			$formData['kalender_syncstatus_id']
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$this->_ci->KalendersyncstatusModel->update(
-			array('kalender_syncstatus_id' => $formData['kalender_syncstatus_id']),
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'updatevon' => getAuthUID(),
-				'updateamum' => date('c'),
-			)
-		);
-	}
-	public function getStudienplan()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$oe_kurzbz = $this->_ci->input->get('oe_kurzbz', TRUE);
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-		$ausbildungssemester = $this->_ci->input->get('ausbildungssemester', TRUE);
-
-		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
-		$is_studiengang = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
-
-		if (hasData($is_studiengang) && !isEmptyString($studiensemester_kurzbz))
-		{
-			$studiengang = getData($is_studiengang)[0];
-
-			$studienplaene = $this->_ci->StudienplanModel->getStudienplaeneBySemester(
-				$studiengang->studiengang_kz,
-				$studiensemester_kurzbz,
-				isEmptyString($ausbildungssemester) ? null : $ausbildungssemester
-			);
-
-
-			$data = $this->getDataOrTerminateWithError($studienplaene);
-
-			$unique = array();
-			foreach ($data as $row)
-			{
-				$unique[$row->studienplan_id] = (object) array(
-					'studienplan_id' => $row->studienplan_id,
-					'studienordnung_id' => $row->studienordnung_id,
-					'bezeichnung' => $row->bezeichnung,
-					'orgform_kurzbz' => $row->orgform_kurzbz
-				);
-			}
-
-			$this->terminateWithSuccess(array_values($unique));
-		}
-		$this->terminateWithSuccess();
-	}
-
-	private function _checkIfExist($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $studienplan_id, $kalender_syncstatus_id = null)
-	{
-		$this->_ci->KalendersyncstatusModel->db->where('oe_kurzbz', $oe_kurzbz);
-		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
-
-		if (is_null($ausbildungssemester))
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester', $ausbildungssemester);
-
-		if (is_null($studienplan_id))
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id', $studienplan_id);
-
-		if (!is_null($kalender_syncstatus_id))
-			$this->_ci->KalendersyncstatusModel->db->where('kalender_syncstatus_id !=', $kalender_syncstatus_id);
-		return $this->_ci->KalendersyncstatusModel->load();
-	}
-
-}

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', 'lehre/lvplan:rw'],
-			'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w', 'lehre/lvplan:rw'],
-			'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r', 'lehre/lvplan:rw'],
-		]);
-
-		$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');
-		$this->load->library('KalenderLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// 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,233 +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');
-
-		$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_rules('titel', "titel", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('beschreibung', "beschreibung", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('start_date', "start_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('end_date', "end_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-
-		if ($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$orte = $this->_ci->input->post('orte', TRUE);
-
-		if (empty($orte) || (empty($orte['ort_kurzbz']) && empty($orte['location'])))
-		{
-			$this->terminateWithValidationErrors(['ort_kurzbz' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Raum'])]);
-		}
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', 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, $orte, $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/jobs/ReihungstestJob.php

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

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');
-	}
-
-
-	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/Antrag/Attachment.php

@@ -73,7 +73,7 @@ class Attachment extends FHC_Controller
 			}
 		}
 
-		$result = $this->dmslib->download($dms_id);
+		$result = $this->dmslib->getOutputFileInfo($dms_id);
 		if (isError($result))
 			return show_error(getError($result));
 

application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php

@@ -393,7 +393,7 @@ class approveAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->download($dms_id, $filename);
+		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php

@@ -282,7 +282,7 @@ class approveAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->download($dms_id, $filename);
+		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/CreateAnrechnung.php

@@ -150,15 +150,12 @@ class CreateAnrechnung extends Auth_Controller
 		}
 	
 		// Upload document
-		$result = self::_uploadFile();
+		$result = $this->_uploadFile();
 		
-		if (isError($result))
-		{
-			$this->terminateWithJsonError($result->retval);
-		}
+		if (isError($result)) $this->terminateWithJsonError(getError($result));
 		
 		// Hold just inserted DMS ID
-		$lastInsert_dms_id = $result->retval['dms_id'];
+		$lastInsert_dms_id = getData($result)->dms_id;
 		
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
@@ -227,17 +224,25 @@ class CreateAnrechnung extends Auth_Controller
 	 */
 	private function _uploadFile()
 	{
-		$dms = array(
-			'kategorie_kurzbz'  => 'anrechnung',
-			'version'           => 0,
-			'name'              => $_FILES['uploadfile']['name'],
-			'mimetype'          => $_FILES['uploadfile']['type'],
-			'insertamum'        => (new DateTime())->format('Y-m-d H:i:s'),
-			'insertvon'         => $this->_uid
-		);
-		
 		// Upload document
-		return $this->dmslib->upload($dms, 'uploadfile', array('pdf'));
+		$uploadDataResult = $this->uploadFile('uploadfile', array('pdf'));
+
+		// If an error occurred while uploading the file
+		if (isError($uploadDataResult)) return $uploadDataResult;
+		if (!hasData($uploadDataResult)) return error('Upload failed');
+
+		// Add file to the DMS (DB + file system)
+		return $this->_ci->dmslib->add(
+			getData($uploadDataResult)['file_name'],
+			getData($uploadDataResult)['file_type'],
+			fopen(getData($uploadDataResult)['full_path'], 'r'),
+			'anrechnung', // kategorie_kurzbz
+			null, // dokument_kurzbz
+			null, // beschreibung
+			false, // cis_suche
+			null, // schlagworte
+			getAuthUID() // insertvon
+		);
 	}
 	
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id, $prestudent_id)
@@ -268,4 +273,4 @@ class CreateAnrechnung extends Auth_Controller
 		return false;
 	}
 	
-}
+}

application/controllers/lehre/anrechnung/RequestAnrechnung.php

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

application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php

@@ -237,7 +237,7 @@ class reviewAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->download($dms_id, $filename);
+		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php

@@ -196,7 +196,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->download($dms_id, $filename);
+		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/system/MigrateKalender.php

@@ -1,610 +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 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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncModel->db->or_where_in('stundenplandev_id', $where_ids);
-				}
-				$this->SyncModel->db->group_end();
-
-				$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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncReservierungModel->db->or_where_in('reservierung_id', $where_ids);
-				}
-				$this->SyncReservierungModel->db->group_end();
-
-				$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);
-					}
-				}
-			}
-		}
-	}
-
-	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);
-	}
-
-	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')
-				)
-			);
-		}
-	}
-}

application/controllers/system/infocenter/InfoCenter.php

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

application/controllers/system/infocenter/Rueckstellung.php

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

application/core/FHC_Controller.php

@@ -136,37 +136,77 @@ abstract class FHC_Controller extends CI_Controller
 	/**
 	 * To download the given file represented by the fileObj parameter.
 	 * fileObj has the following structure:
-	 * 	$fileObj->filename
-	 * 	$fileObj->file
+	 * 	$fileObj->file OR $fileObj->file_content
 	 * 	$fileObj->name
 	 * 	$fileObj->mimetype
-	 * 	$fileObj->disposition
+	 * 	$fileObj->disposition (inline OR attachment)
 	 */
 	protected function outputFile($fileObj)
 	{
 		// If the file exists
-		if (isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
+		if ((isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
+		|| (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content)))
 		{
-			header('Content-Description: File Transfer');
-			header('Content-Type: '. $fileObj->mimetype);
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate');
-			header('Pragma: public');
-			header('Content-Length: ' . filesize($fileObj->file));
+			$content_length = 0;
 
-			if (isset($fileObj->disposition)
-				&& ($fileObj->disposition == 'inline' || $fileObj->disposition == 'attachment'))
+			// If file content has been provided
+			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
 			{
-				header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
+				$content_length = strlen($fileObj->file_content);
+			}
+			else // otherwise the path + name of the file
+			{
+				$content_length = filesize($fileObj->file);
 			}
 
-			readfile($fileObj->file); // reads the file content to the output buffer
-		}
-		else
-		{
-			// Otherwise print an error
-			show_error('The provided file does not exist: '.(isset($fileObj->file) ? $fileObj->file : 'file not given'));
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $fileObj->mimetype);
+			header('Content-Length: ' . $content_length);
+			header('Content-Transfer-Encoding: binary');
+			header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
+			header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
+			header('Expires: ' . date("D, d M Y H:i:s", time()));
+			header('Pragma: public');
+
+			// Clean the output buffer
+			flush();
+
+			// If file content has been provided
+			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
+			{
+				echo $fileObj->file_content;
+			}
+			else // otherwise get the content from file system
+			{
+				readfile($fileObj->file);
+			}
+
+			// Terminate the execution
+			exit();
 		}
+
+		// Otherwise return an error
+		show_error('The provided file does not exist or file content is empty');
+	}
+
+	/**
+	 *
+	 */
+	protected function outputImageByContent($mimetype, $file_content)
+	{
+		if (isEmptyString($file_content)) show_error('The provided file content is not valid');
+
+		$this->_outputImage($mimetype, $file_content);
+	}
+
+	/**
+	 *
+	 */
+	protected function outputImageByFile($mimetype, $file_name)
+	{
+		if (!file_exists($file_name)) show_error('The provided file does not exist');
+
+		$this->_outputImage($mimetype, null, $file_name);
 	}
 
 	/**
@@ -178,6 +218,29 @@ abstract class FHC_Controller extends CI_Controller
 		return json_decode($this->input->raw_input_stream);
 	}
 
+	/**
+	 * Utility function to upload a file
+	 * - post_field_name: the name of the field in the HTTP POST payload, this is also the index in the super global $_FILES array
+	 * - allowed_types: a list of file extensions that are allowed to be uploaded (ex. array('pdf', 'odt') or array('jpg', 'jpeg', 'gif')
+	 */
+	protected function uploadFile($post_field_name, $allowed_types = array('*'))
+	{
+		$this->load->library(
+			'upload',
+			array(
+				'upload_path' => sys_get_temp_dir(),
+				'allowed_types' => $allowed_types,
+				'overwrite' => true
+			)
+		);
+
+		// If the upload was a success then return the uploaded file info
+		if ($this->upload->do_upload($post_field_name)) return success($this->upload->data());
+
+		// If an error occurred then return it without tags
+		return error($this->upload->display_errors('', ''));
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -193,5 +256,44 @@ abstract class FHC_Controller extends CI_Controller
 			show_error('This web site cannot work correctly without the HTTPS protocol enabled');
 		}
 	}
+
+	/**
+	 *
+	 */
+	private function _outputImage($mimetype, $file_content = null, $file_name = null)
+	{
+		$content_length = 0;
+
+		// If file content has been provided
+		if ($file_content != null)
+		{
+			$content_length = strlen($file_content);
+		}
+		else // otherwise the path + name of the file
+		{
+			$content_length = filesize($file_name);
+		}
+
+		header('Content-Type: '. $mimetype);
+		header('Content-Length: ' . $content_length);
+		header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
+		header('Expires: ' . date("D, d M Y H:i:s", time()));
+
+		// Clean the output buffer
+		flush();
+
+		// If file content has been provided
+		if ($file_content != null)
+		{
+			echo $file_content;
+		}
+		else // otherwise get the content from file system
+		{
+			readfile($file_name);
+		}
+
+		// Terminate the execution
+		exit();
+	}
 }
 

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

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

application/core/Tag_Controller.php

@@ -44,6 +44,7 @@ class Tag_Controller extends FHCAPI_Controller
 	{
 		$language = $this->_getLanguageIndex();
 		$index_bezeichnung_mehrsprachig = $language - 1;
+
 		$id = $this->input->get('id');
 
 		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
@@ -122,36 +123,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();
@@ -171,7 +143,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();
@@ -180,7 +152,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

@@ -418,10 +418,10 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 if (!function_exists('array_is_list')) {
     function array_is_list(array $arr)
     {
-        if ($arr === []) {
-            return true;
-        }
-        return array_keys($arr) === range(0, count($arr) - 1);
+	if ($arr === []) {
+	    return true;
+	}
+	return array_keys($arr) === range(0, count($arr) - 1);
     }
 }
 
@@ -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/libraries/AkteLib.php

@@ -1,12 +1,21 @@
 <?php
 
-/**
- * FH-Complete
+/* Copyright (C) 2025 fhcomplete.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- * @package             FHC-Helper
- * @author              FHC-Team
- * @copyright           Copyright (c) 2022 fhcomplete.net
- * @license             GPLv3
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -121,90 +130,32 @@ class AkteLib
 	 * Gets akte data and associated dms data by akte Id
 	 * Returns success with akte and dms data or error
 	 */
-	public function get($akte_id)
+	public function getByAkteId($akte_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
 	{
-		// get Akte data
-		$this->_ci->AkteModel->addSelect('person_id, dokument_kurzbz, mimetype, erstelltam, titel, bezeichnung,
-											gedruckt, uid, dms_id, nachgereicht, nachgereicht_am, anmerkung,
-											ausstellungsnation, formal_geprueft_amum, archiv, signiert,
-											stud_selfservice, akzeptiertamum, insertvon, insertamum, updatevon, updateamum');
-		$this->_ci->AkteModel->load($akte_id);
-		$akteResult = $this->_ci->AkteModel->load($akte_id);
-
-		if (isError($akteResult)) return $akteResult;
-
-		if (!hasData($akteResult)) return error("Akte not found");
-
-		$resultObject = getData($akteResult)[0];
-
-		// set properties with same name in Akte and Dms table
-		$resultObject->akte_mimetype = $resultObject->mimetype;
-
-		// get dms data
-		$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
-
-		if (isError($dmsResult)) return $dmsResult;
-
-		// properties to retrieve from dms
-		$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte', DmsLib::FILE_CONTENT_PROPERTY);
-
-		// set dms properties
-		if (hasData($dmsResult))
-		{
-			$dmsData = getData($dmsResult);
-
-			foreach ($dmsProperties as $dmsProperty)
-			{
-				$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
-			}
-		}
-		else
-		{
-			// set null if no dms result found
-			foreach ($dmsProperties as $dmsProperty)
-			{
-				$resultObject->{$dmsProperty} = null;
-			}
-		}
-
-		// return the object containing akte and dms data
-		return success($resultObject);
+		return $this->_get(
+			$akte_id,
+			null, // person_id
+			$dokument_kurzbz,
+			$archiv,
+			$signiert,
+			$stud_selfservice
+		);
 	}
 
 	/**
 	 * Gets Akte data and associated dms data by person Id and dokument_kurzbz
 	 * Returns success with result array with akte and dms data or error
 	 */
-	public function getByPersonIdAndDocumentType($person_id, $dokument_kurzbz)
+	public function getByPersonId($person_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
 	{
-		// load all Akte entries for given person and dokument_kurzbz
-		$this->_ci->AkteModel->addSelect('akte_id');
-		$akteResult = $this->_ci->AkteModel->loadWhere(
-			array(
-				'person_id' => $person_id,
-				'dokument_kurzbz' => $dokument_kurzbz
-			)
+		return $this->_get(
+			null, // akte_id
+			$person_id,
+			$dokument_kurzbz,
+			$archiv,
+			$signiert,
+			$stud_selfservice
 		);
-
-		if (!hasData($akteResult)) return error("Akte not found");
-
-		$akteData = getData($akteResult);
-
-		$resultArr = array();
-
-		// for each found akte entry
-		foreach ($akteData as $akte)
-		{
-			// get dms and akte data from akte Id
-			$getAkteDmsResult = $this->get($akte->akte_id);
-
-			if (isError($getAkteDmsResult)) return $getAkteDmsResult;
-
-			$resultArr[] = getData($getAkteDmsResult);
-		}
-
-		// return all found entries
-		return success($resultArr);
 	}
 
 	/**
@@ -213,56 +164,184 @@ class AkteLib
 	 */
 	public function remove($akte_id)
 	{
-		// get dms_id for akte
+		return $this->_remove($akte_id, null, null);
+	}
+
+	/**
+	 * Removes Akte by $person_id and $dms_id, removes all associated dms entries and versions, and deletes all associated files
+	 * Returns success with removed version numbers or error
+	 */
+	public function removeByPersonIdAndDmsId($person_id, $dms_id)
+	{
+		return $this->_remove(null, $person_id, $dms_id);
+	}
+
+	/**
+	 *
+	 */
+	private function _get($akte_id = null, $person_id = null, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
+	{
+		$dbModel = new DB_Model();
+
+		$query = 'SELECT akte_id,
+				person_id,
+				dokument_kurzbz,
+				inhalt,
+				CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden,
+				mimetype,
+				erstelltam,
+				gedruckt,
+				titel,
+				bezeichnung,
+				updateamum,
+				updatevon,
+				insertamum,
+				insertvon,
+				uid,
+				dms_id,
+				nachgereicht,
+				anmerkung,
+				titel_intern,
+				anmerkung_intern,
+				nachgereicht_am,
+				ausstellungsnation,
+				formal_geprueft_amum,
+				archiv,
+				signiert,
+				stud_selfservice,
+				akzeptiertamum
+			FROM public.tbl_akte
+			WHERE TRUE';
+
+		// Query parameters
+		$paramArray = array();
+
+		// akte_id
+		if (is_numeric($akte_id) || is_array($akte_id))
+		{
+			$paramArray[] = $akte_id;
+			if (is_numeric($akte_id)) $query .= ' AND akte_id = ?';
+			if (is_array($akte_id)) $query .= ' AND akte_id IN ?';
+		}
+
+		// person_id
+		if (is_numeric($person_id) || is_array($person_id))
+		{
+			$paramArray[] = $person_id;
+			if (is_numeric($person_id)) $query .= ' AND person_id = ?';
+			if (is_array($person_id)) $query .= ' AND person_id IN ?';
+		}
+
+		// dokument_kurzbz
+		if (!isEmptyString($dokument_kurzbz))
+		{
+			$paramArray[] = $dokument_kurzbz;
+			$query .= ' AND dokument_kurzbz = ?';
+		}
+
+		// archiv
+		if (is_bool($archiv))
+		{
+			$paramArray[] = $archiv;
+			$query .= ' AND archiv = ?';
+		}
+
+		// signiert
+		if (is_bool($signiert))
+		{
+			$paramArray[] = $signiert;
+			$query .= ' AND signiert = ?';
+		}
+
+		// stud_selfservice
+		if (is_bool($stud_selfservice))
+		{
+			$paramArray[] = $stud_selfservice;
+			$query .= ' AND stud_selfservice = ?';
+		}
+
+		// If no parameters has been provided exit
+		if (isEmptyArray($paramArray)) return error('Called without giving any parameter');
+
+		// Loads data from DB
+		$akteResult = $dbModel->execReadOnlyQuery($query, $paramArray);
+
+		// If error or data not found then exit
+		if (isError($akteResult)) return $akteResult;
+		if (!hasData($akteResult)) return error('Akte not found');
+
+		// For each record from the akte
+		foreach (getData($akteResult) as $resultObject)
+		{
+			// get dms data
+			$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
+
+			if (isError($dmsResult)) return $dmsResult;
+
+			// properties to retrieve from dms
+			$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte');
+
+			// set dms properties
+			if (hasData($dmsResult))
+			{
+				$dmsData = getData($dmsResult)[0];
+
+				foreach ($dmsProperties as $dmsProperty)
+				{
+					// If the property is _not_ 'mimetype' _or_
+					// If the mimetype from the akte table is null then overwrite it with the one from the DMS
+					if ($dmsProperty != 'mimetype' || ($dmsProperty == 'mimetype' && $resultObject->{$dmsProperty} == null))
+					{
+						$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
+					}
+				}
+			}
+			else
+			{
+				// Set null if no dms result found
+				foreach ($dmsProperties as $dmsProperty)
+				{
+					if ($dmsProperty != 'mimetype') $resultObject->{$dmsProperty} = null;
+				}
+			}
+		}
+
+		// return the object containing akte and dms data
+		return success(getData($akteResult));
+	}
+
+	/**
+	 * Removes Akte by akte Id, person id and/or dms id
+	 * Removes all associated dms entries and versions, and deletes all associated files
+	 * Returns success with removed version numbers or error
+	 */
+	private function _remove($akte_id = null, $person_id = null, $dms_id = null)
+	{
+		// Get dms_id for akte
+		$this->_ci->AkteModel->addSelect('akte_id');
 		$this->_ci->AkteModel->addSelect('dms_id');
-		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		$paramArray = array();
+
+		if (is_numeric($akte_id)) $paramArray['akte_id'] = $akte_id;
+		if (is_numeric($person_id)) $paramArray['person_id'] = $person_id;
+		if (is_numeric($dms_id)) $paramArray['dms_id'] = $dms_id;
+
+		$akteResult = $this->_ci->AkteModel->loadWhere($paramArray);
 
 		if (isError($akteResult)) return $akteResult;
 
-		if (!hasData($akteResult)) return error("Akte not found");
+		if (!hasData($akteResult)) return error('Akte not found');
 
-		$dms_id = getData($akteResult)[0]->dms_id;
-		$error = null;
+		// Delete Akte
+		$deleteResult = $this->_ci->AkteModel->delete(getData($akteResult)[0]->akte_id);
 
-		// Start DB transaction to avoid deleting only part of the data
-		$this->_ci->db->trans_begin();
+		if (isError($deleteResult)) return $deleteResult;
 
-		// delete Akte
-		$deleteResult = $this->_ci->AkteModel->delete($akte_id);
+		// Remove all dms entry for dms of the akte
+		$removeAllResult = $this->_ci->dmslib->removeAll(getData($akteResult)[0]->dms_id);
 
-		if (isError($deleteResult))
-		{
-			$error = $deleteResult;
-		}
-		else
-		{
-			// remove all dms entry for dms of the akte
-			$removeAllResult = $this->_ci->dmslib->removeAll($dms_id);
-
-			if (isError($removeAllResult))
-				$error = $removeAllResult;
-		}
-
-		// Transaction complete!
-		$this->_ci->db->trans_complete();
-
-		// Check if everything went ok during the transaction
-		if ($this->_ci->db->trans_status() === false || isset($error))
-		{
-			$this->_ci->db->trans_rollback();
-
-			// return occured error
-			if (isset($error))
-				return $error;
-			else
-				return error("Error occured when deleting, rolled back");
-		}
-		else
-		{
-			$this->_ci->db->trans_commit();
-
-			// return removed dms entry data
-			return $removeAllResult;
-		}
+		return $removeAllResult;
 	}
 }
+

application/libraries/AnrechnungLib.php

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

application/libraries/CollisionChecker.php

@@ -1,67 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class CollisionChecker
-{
-	private $_checks = [];
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('collision/checks/RoomCollisionCheck');
-		$this->_ci->load->library('collision/checks/LectureCollisionCheck');
-		$this->_ci->load->library('collision/checks/VerbandCollisionCheck');
-		$this->_ci->load->library('collision/checks/StudentCollisionCheck');
-		$this->_ci->load->library('collision/checks/ResourcesCollisionCheck');
-		$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/DmsLib.php

@@ -1,12 +1,21 @@
 <?php
 
-/**
- * FH-Complete
+/* Copyright (C) 2025 fhcomplete.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- * @package		FHC-Helper
- * @author		FHC-Team
- * @copyright		Copyright (c) 2022 fhcomplete.net
- * @license		GPLv3
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -15,24 +24,17 @@ use \stdClass as stdClass;
 
 class DmsLib
 {
-	const FILE_CONTENT_PROPERTY = 'file_content'; // property name for file content
+	const DMS_SYS_NAME = 'DMS System';
 
 	private $_ci; // code igniter instance
-	private $_who; // who added this document
 
 	/**
 	 * Object initialization
 	 */
-	public function __construct($params = null)
+	public function __construct()
 	{
 		$this->_ci =& get_instance();
 
-		// Set the the _who property
-		$this->_who = 'DMS system'; // default
-		// It is possible to set it using the who parameter
-		if (!isEmptyArray($params) && isset($params['who']) && !isEmptyString($params['who'])) $this->_who = $params['who'];
-
-		$this->_ci->load->model('crm/Akte_model', 'AkteModel'); // deprecated, should not be used here!
 		$this->_ci->load->model('content/Dms_model', 'DmsModel');
 		$this->_ci->load->model('content/DmsVersion_model', 'DmsVersionModel');
 		$this->_ci->load->model('content/DmsFS_model', 'DmsFSModel');
@@ -46,69 +48,85 @@ class DmsLib
 	 * Returns success info of added dms entry (dms_id, version, filename) or error
 	 */
 	public function add(
-		$name, $mimetype, $fileHandle, // Required parameters
-		$kategorie_kurzbz = null, $dokument_kurzbz = null, $beschreibung = null, $cis_suche = false, $schlagworte = null
+		// Required parameters
+		$name, $mimetype, $fileHandle,
+		// Optional parameters
+		$kategorie_kurzbz = null, $dokument_kurzbz = null, $beschreibung = null, $cis_suche = false, $schlagworte = null, $insertvon = self::DMS_SYS_NAME
 	)
 	{
-			// create unique filename, using original document name to detect file extension
-			$filename = $this->_getUniqueFilename($name);
+		// If the file handle is not valid
+		if ($fileHandle === false) return error('Was not possible to open the given file');
 
-			// copy file from fileHandle to dms folder
-			$copyFileResult = $this->_copyFile($fileHandle, $filename);
+		// Create unique filename, using original document name to detect file extension
+		$filename = $this->_getUniqueFilename($name);
 
-			if (isError($copyFileResult)) return $copyFileResult;
+		// Copy file from fileHandle to dms folder
+		$copyFileResult = $this->_copyFile($fileHandle, $filename);
 
-			// if file written successful, insert dms
-			$dmsResult = $this->_ci->DmsModel->insert(
-				array(
-					'kategorie_kurzbz' => $kategorie_kurzbz,
-					'dokument_kurzbz' => $dokument_kurzbz
-				)
+		// If an error occrured while copying the file
+		if (isError($copyFileResult)) return $copyFileResult;
+
+		// Insert the new DMS
+		$dmsResult = $this->_ci->DmsModel->insert(
+			array(
+				'kategorie_kurzbz' => $kategorie_kurzbz,
+				'dokument_kurzbz' => $dokument_kurzbz
+			)
+		);
+
+		// If an error occurred
+		if (isError($dmsResult)) return $dmsResult;
+
+		// If a DMS in the previous insert returned the new PK value
+		if (hasData($dmsResult))
+		{
+			$dms_id = getData($dmsResult);
+
+			// Insert the DMS version
+			$dmsVersion = array(
+				'dms_id' => $dms_id,
+				'version' => 0,
+				'filename' => $filename,
+				'mimetype' => $mimetype,
+				'name' => $name,
+				'beschreibung' => $beschreibung,
+				'cis_suche' => $cis_suche,
+				'schlagworte' => $schlagworte,
+				'insertvon' => $insertvon,
+				'insertamum' => date('Y-m-d H:i:s')
 			);
 
-			if (isError($dmsResult)) return $dmsResult;
+			$dmsVersionResult = $this->_ci->DmsVersionModel->insert($dmsVersion);
 
-			if (hasData($dmsResult))
-			{
-				$dms_id = getData($dmsResult);
-				$version = 0;
+			// If an error occured
+			if (isError($dmsVersionResult)) return $dmsVersionResult;
 
-				// insert dms version
-				$dmsVersion = array(
-					'dms_id' => $dms_id,
-					'version' => $version,
-					'filename' => $filename,
-					'mimetype' => $mimetype,
-					'name' => $name,
-					'beschreibung' => $beschreibung,
-					'cis_suche' => $cis_suche,
-					'schlagworte' => $schlagworte,
-					'insertvon' => $this->_who,
-					'insertamum' => date('Y-m-d H:i:s')
-				);
+			// Return dms info
+			$resObj = new stdClass();
+			$resObj->dms_id = $dms_id;
+			$resObj->version = 0;
+			$resObj->filename = $filename;
 
-				$dmsVersionResult = $this->_ci->DmsVersionModel->insert($dmsVersion);
-
-				if (isError($dmsVersionResult)) return $dmsVersionResult;
-
-				// return dms info
-				$resObj = new stdClass();
-				$resObj->dms_id = $dms_id;
-				$resObj->version = $version;
-				$resObj->filename = $filename;
-
-				return success($resObj);
-			}
-			else
-				return error("error when inserting DMS");
+			return success($resObj);
+		}
+		else
+			return success();
 	}
 
 	/**
 	 * Writes a new file with content of fileHandle, adds a new dms version (max version number + 1) for the written file
 	 * Returns success with info of added dms version (version, filename) or error
 	 */
-	public function addNewVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
+	public function addNewVersion(
+		// Required parameters
+		$dms_id, $fileHandle,
+		// Optional parameters
+		$name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null, $insertvon = self::DMS_SYS_NAME
+	)
 	{
+		// If the file handle is not valid
+		if ($fileHandle === false) return error('Was not possible to open the given file');
+
 		// get the latest version
 		$lastVersionResult = $this->getLastVersion($dms_id);
 
@@ -141,7 +159,7 @@ class DmsLib
 				'beschreibung' => isset($beschreibung) ? $beschreibung : $lastVersion->beschreibung,
 				'cis_suche' => isset($cis_suche) ? $cis_suche : $lastVersion->cis_suche,
 				'schlagworte' => isset($schlagworte) ? $schlagworte : $lastVersion->schlagworte,
-				'insertvon' => $this->_who,
+				'insertvon' => $insertvon,
 				'insertamum' => date('Y-m-d H:i:s')
 			);
 
@@ -157,7 +175,7 @@ class DmsLib
 			return success($resObj);
 		}
 		else
-			return error("last version not found");
+			return success();
 	}
 
 	/**
@@ -167,6 +185,9 @@ class DmsLib
 	 */
 	public function updateLastVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
 	{
+		// If the file handle is not valid
+		if ($fileHandle === false) return error('Was not possible to open the given file');
+
 		// get the latest version
 		$lastVersionResult = $this->getLastVersion($dms_id);
 
@@ -208,12 +229,12 @@ class DmsLib
 			return success($resObj);
 		}
 		else
-			return error("last version not found");
+			return success();
 	}
 
 	/**
 	 * Gets dms version with highest number
-	 * Returns success with dms data and fileHandle with file content or error
+	 * Returns success with dms data or error
 	 */
 	public function getLastVersion($dms_id)
 	{
@@ -237,12 +258,12 @@ class DmsLib
 			return $this->getVersion($dms_id, $lastDmsVersion);
 		}
 		else
-			return error("Dms last version not found");
+			return success();
 	}
 
 	/**
 	 * Gets specified dms version
-	 * Returns success with dms data and fileHandle with file content or error
+	 * Returns success with dms data or error
 	 */
 	public function getVersion($dms_id, $version)
 	{
@@ -254,34 +275,7 @@ class DmsLib
 			)
 		);
 
-		if (isError($dmsVersionResult)) return $dmsVersionResult;
-
-		if (hasData($dmsVersionResult))
-		{
-			$dmsVersion = getData($dmsVersionResult)[0];
-
-			// get file content as file pointer
-			$fileHandleResult = $this->_ci->DmsFSModel->openRead($dmsVersion->filename);
-
-			if (isError($fileHandleResult)) return $fileHandleResult;
-
-			if (hasData($fileHandleResult))
-			{
-				$fileHandle = getData($fileHandleResult);
-				$dmsVersion->{self::FILE_CONTENT_PROPERTY} = $fileHandle;
-
-				// close file pointer
-				$closeResult = $this->_ci->DmsFSModel->close($fileHandle);
-
-				if (isError($closeResult)) return $closeResult;
-
-				return success($dmsVersion);
-			}
-			else
-				return error("File could not be opened");
-		}
-		else
-			return error("Dms version not found");
+		return $dmsVersionResult;
 	}
 
 	/**
@@ -420,6 +414,34 @@ class DmsLib
 		return success($removeVersionResultObj);
 	}
 
+	/**
+	 * Get info from the DMS to be provided to the FHC_Controller->outputFile
+	 */
+	public function getOutputFileInfo($dms_id, $file_name = '', $disposition = 'attachment')
+	{
+		// Loads the last DMS version from database
+		$lastVersionResult = $this->getLastVersion($dms_id);
+
+		// If an error occurred then return it
+		if (isError($lastVersionResult)) return $lastVersionResult;
+
+		// If has been found
+		if (hasData($lastVersionResult))
+		{
+			$lastVersion = getData($lastVersionResult)[0];
+
+			$fileObj = new stdClass();
+			$fileObj->file = DMS_PATH.$lastVersion->filename;
+			$fileObj->name = isEmptyString($file_name) ? $lastVersion->name : $file_name;
+			$fileObj->mimetype = $lastVersion->mimetype;
+			$fileObj->disposition = $disposition;
+
+			return success($fileObj);
+		}
+
+		return success();
+	}
+
 	// -----------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -474,432 +496,5 @@ class DmsLib
 
 		return $uniqueFilename;
 	}
-
-	// -----------------------------------------------------------------------------------------------------------
-	// Deprecated methods, not to be used
-
-	/**
-	 * Load a DMS Document.
-	 * If no version is particularly given, the latest version is loaded.
-	 *
-	 * @param $dms_id
-	 * @param integer $version
-	 * @return array
-	 */
-	public function load($dms_id, $version = null)
-	{
-		if (is_numeric($dms_id))
-		{
-			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$this->_ci->DmsModel->addOrder('version', 'DESC');
-			$this->_ci->DmsModel->addLimit(1);
-
-			if (!is_numeric($version))
-			{
-				return $this->_ci->DmsModel->load($dms_id);
-			}
-			else
-			{
-				return $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
-			}
-		}
-
-		return error('The parameter DMS ID must be a number');
-	}
-
-	/**
-	 * Read a DMS Document from the Filesystem
-	 * @param int $dms_id ID of the Document.
-	 * @param int $version The version of the Document (latest if null).
-	 * @return object success or error
-	 */
-	public function read($dms_id, $version = null)
-	{
-		$result = error('Wrong dms_id parameter');
-
-		if (isset($dms_id))
-		{
-			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$this->_ci->DmsModel->addOrder('version', 'DESC');
-			$this->_ci->DmsModel->addLimit(1);
-
-			if (!isset($version))
-			{
-				$result = $this->_ci->DmsModel->load($dms_id);
-			}
-			else
-			{
-				$result = $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
-			}
-
-			// If a dms has been found
-			if (hasData($result))
-			{
-				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[0]->filename);
-				if (isError($resultFS)) return $resultFS; // if an error occurred return it
-
-				$result->retval[0]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get all accepted Documents of a Person
-	 *
-	 * @param int $person_id ID of the person.
-	 * @param string $dokument_kurzbz Type of document.
-	 * @param bool $no_file If null then loads also the content.
-	 * @return object success or error
-	 */
-	public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null, $no_file = null)
-	{
-		$result = $this->_ci->AkteModel->getAktenAcceptedDms($person_id, $dokument_kurzbz);
-
-		if (hasData($result) && $no_file == null)
-		{
-			for ($i = 0; $i < count(getData($result)); $i++)
-			{
-				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[$i]->filename);
-				if (isError($resultFS)) return $resultFS; // if an error occurred return it
-
-				$result->retval[$i]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Uploads a document and saves it to DMS
-	 * @param $dms DMS assoc array
-	 * @param $field_name  Name of the HTML uploadfile input name attribute
-	 * @param array $allowed_types Default: all. Param example: array(jpg, pdf)
-	 * @return array
-	 */
-	public function upload($dms, $field_name, $allowed_types = array('*'))
-	{
-		// Init upload configs
-		$this->_loadUploadLibrary($allowed_types);
-
-		if (!$this->_ci->upload->do_upload($field_name))
-		{
-			return error($this->_ci->upload->display_errors());
-		}
-
-		$upload_data = $this->_ci->upload->data();  // data about the uploaded file
-
-		// Insert to DMS table
-		$insDmsResult = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
-		if (isError($insDmsResult)) return $insDmsResult;
-
-		$upload_data['dms_id'] = getData($insDmsResult);
-		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
-			$dms['mimetype'] = $upload_data['file_type'];
-
-		// Insert DMS version
-		$insVersionResult = $this->_ci->DmsVersionModel->insert(
-			$this->_ci->DmsVersionModel->filterFields(
-				$dms,
-				$upload_data['dms_id'],
-				$upload_data['file_name']
-			)
-		);
-		if (isError($insVersionResult)) return $insVersionResult;
-
-		// Return result of uploaded data
-		return success($upload_data);
-	}
-
-	/**
-	 * Download a document.
-	 *
-	 * @param $dms_id
-	 * @param string $filename $filename If String is given, it will be used as filename on download
-	 * @param string $disposition [inline | attachment]
-	 *        Inline opens doc in new tab. Attachment displays download dialog box.
-	 */
-	public function download($dms_id, $filename = null, $disposition = 'inline')
-	{
-		// Retrieves info about the given dms
-		$fileInfoResult = $this->getFileInfo($dms_id);
-		if (isError($fileInfoResult)) return error(getError($fileInfoResult));
-
-		// If data have been found
-		if (hasData($fileInfoResult))
-		{
-			$fileObj = getData($fileInfoResult);
-
-			// Change filename, if filename is provided
-			if (!isEmptyString($filename)) $fileObj->name = $filename;
-
-			// Add file disposition if disposition has a valid value
-			if ($disposition == 'attachment' || $disposition == 'inline')
-			{
-				$fileObj->disposition = $disposition;
-			}
-
-			return success($fileObj);
-		}
-
-		// If no data have been found then return an empty success
-		return success();
-	}
-
-	/**
-	 * Get file information.
-	 *
-	 * @param $dms_id
-	 * @param integer $version
-	 * @return array with File Object.
-	 */
-	public function getFileInfo($dms_id, $version = null)
-	{
-		// Checks the dms_id parameter
-		if (!is_numeric($dms_id)) return error('Wrong parameter');
-
-		// Load DMS from database
-		$result = $this->load($dms_id, $version);
-		if (isError($result)) return error(getError($result));
-
-		// If data have been found
-		if (hasData($result))
-		{
-			// Store file information in fileObj
-			$fileObj = new stdClass();
-			$fileObj->filename = getData($result)[0]->filename;
-			$fileObj->file = DMS_PATH.getData($result)[0]->filename;
-			$fileObj->name = getData($result)[0]->name;   // original user filename
-			$fileObj->mimetype = getData($result)[0]->mimetype;
-
-			return success($fileObj);
-		}
-
-		// If no data have been found return an empty success
-		return success();
-	}
-
-	/**
-	 * Saves a Document
-	 * @param object $dms DMS Object ot be saved.
-	 * @return object
-	 */
-	public function save($dms)
-	{
-		$result = null;
-
-		if (isset($dms['new']) && $dms['new'] == true)
-		{
-			// Remove new parameter to avoid DB insert errors
-			unset($dms['new']);
-
-			$result = $this->_saveFileOnInsert($dms);
-			if (isSuccess($result))
-			{
-				$filename = getData($result);
-				if (isset($dms['dms_id']) && $dms['dms_id'] != '')
-				{
-					$result = $this->_ci->DmsVersionModel->insert(
-						$this->_ci->DmsVersionModel->filterFields($dms, $dms['dms_id'], $filename)
-					);
-				}
-				else
-				{
-					$result = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
-					if (isSuccess($result))
-					{
-						$result = $this->_ci->DmsVersionModel->insert(
-							$this->_ci->DmsVersionModel->filterFields($dms, getData($result), $filename)
-						);
-					}
-				}
-			}
-		}
-		else
-		{
-			$result = $this->_saveFileOnUpdate($dms);
-			if (isSuccess($result))
-			{
-				$result = $this->_ci->DmsModel->update($dms['dms_id'], $this->_ci->DmsModel->filterFields($dms));
-				if (isSuccess($result))
-				{
-					$result = $this->_ci->DmsVersionModel->update(
-						array(
-							$dms['dms_id'],
-							$dms['version']
-						),
-						$this->_ci->DmsVersionModel->filterFields($dms)
-					);
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Deletes a Akte of a Person
-	 * @param int $person_id ID of the person.
-	 * @param int $dms_id Id of the Document.
-	 * @return object
-	 */
-	public function delete($person_id, $dms_id)
-	{
-		$result = null;
-
-		// If the parameters are valid
-		if (is_numeric($person_id) && is_numeric($dms_id))
-		{
-			// Start DB transaction
-			$this->_ci->db->trans_start(false);
-
-			// Get akte_id from table tbl_akte
-			$result = $this->_ci->AkteModel->loadWhere(array('person_id' => $person_id, 'dms_id' => $dms_id));
-			if (isSuccess($result))
-			{
-				// Delete all entries in tbl_akte
-				for ($i = 0; $i < count(getData($result)); $i++)
-				{
-					$this->_ci->AkteModel->delete(getData($result)[$i]->akte_id);
-				}
-
-				// Get all filenames related to this dms
-				$resultFileNames = $this->_ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id));
-				if (isSuccess($resultFileNames))
-				{
-					// Delete from tbl_dms_version
-					$result = $this->_ci->DmsVersionModel->delete(array('dms_id' => $dms_id));
-					if (isSuccess($result))
-					{
-						// Delete from tbl_dms
-						$result = $this->_ci->DmsModel->delete($dms_id);
-					}
-				}
-			}
-
-			// Transaction complete!
-			$this->_ci->db->trans_complete();
-
-			// Check if everything went ok during the transaction
-			if ($this->_ci->db->trans_status() === false || isError($result))
-			{
-				$this->_ci->db->trans_rollback();
-				$result = error('An error occurred while performing a delete operation', EXIT_ERROR);
-			}
-			else
-			{
-				$this->_ci->db->trans_commit();
-				$result = success('Dms successfully removed from DB');
-			}
-
-			// If everything is ok
-			if (isSuccess($result))
-			{
-				// Remove all files related to this person and dms
-				for ($i = 0; $i < count(getData($resultFileNames)); $i++)
-				{
-					$this->_ci->DmsFSModel->removeBase64(getData($resultFileNames)[$i]->filename);
-				}
-			}
-		}
-		else
-		{
-			$result = error('Invalid parameters');
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Loads the Content of an akte
-	 * @param int $akte_id Id of the akte.
-	 * @return object with document content or error
-	 */
-	public function getAkteContent($akte_id)
-	{
-		$akte = $this->_ci->AkteModel->load($akte_id);
-		if (hasData($akte))
-		{
-			if (getData($akte)[0]->inhalt != '')
-			{
-				return success(base64_decode(getData($akte)[0]->inhalt));
-			}
-			elseif (getData($akte)[0]->dms_id != '')
-			{
-				$dmscontent = $this->read(getData($akte)[0]->dms_id);
-				if (isSuccess($dmscontent))
-				{
-					return success(base64_decode(getData($dmscontent)[0]->file_content));
-				}
-				else
-				{
-					return error(getError($dmscontent));
-				}
-			}
-			else
-			{
-				return error('No Content available');
-			}
-		}
-		else
-		{
-			return error(getError($akte));
-		}
-	}
-
-	/**
-	 * Saves the Content of a DMS in the Filesystem
-	 * @param object $dms DMS object to be saved.
-	 * @return object
-	 */
-	private function _saveFileOnInsert($dms)
-	{
-		$filename = uniqid().'.'.pathinfo($dms['name'], PATHINFO_EXTENSION);
-
-		$result = $this->_ci->DmsFSModel->writeBase64($filename, $dms['file_content']);
-		if (isSuccess($result))
-		{
-			$result = success($filename);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Updates the File in the Filesystem
-	 * @param object $dms DMS object to update.
-	 * @return object
-	 */
-	private function _saveFileOnUpdate($dms)
-	{
-		$result = null;
-
-		if (isset($dms['version']))
-		{
-			$result = $this->read($dms['dms_id'], $dms['version']);
-
-			if (hasData($result))
-			{
-				$result = $this->_ci->DmsFSModel->writeBase64(getData($result)[0]->filename, $dms['file_content']);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Loads the upload library of CI
-	 */
-	private function _loadUploadLibrary($allowed_types)
-	{
-		$config = array();
-		$config['upload_path'] = DMS_PATH;
-		$config['allowed_types'] = implode('|', $allowed_types);
-		$config['overwrite'] = true;
-		$config['file_name'] = uniqid().'.pdf';
-
-		$this->_ci->load->library('upload', $config);
-		$this->_ci->upload->initialize($config);
-	}
 }
+

application/libraries/DocumentExportLib.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024 fhcomplete.net
+/* Copyright (C) 2025 fhcomplete.net
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -34,15 +34,11 @@ use SimpleXMLElement as SimpleXMLElement;
  * modifiing said data (sign()/setXMLTag_archivierbar()) or adding
  * images (addImage()) and then call output() and close().
  * Now the create, output and close functions are combined into one function and adding data and images is done via parameters.
- * There are now two functions getContent() and showContent() where showContent() equals to output(false) and getContent equals to output(true)
  * Instead of calling addDataArray, addDataXML or addDataURL just call
  * getDataArray, getDataXML or getDataURL respectevily and use the return
- * value as $xml_data parameter in the showContent and getContent calls.
+ * value as $xml_data parameter in the getContent call.
  * Instead of calling addImages just create an array and pass it as $images
- * parameter to the showContent/getContent function.
- * The old setFilename() function is now a parameter in showContent(). It is
- * not needed in getContent() since that function does not do anything that
- * requires a filename.
+ * parameter to the getContent function.
  * To get/show a signed document just pass a valid uid as $sign_user
  * parameter.
  *
@@ -63,21 +59,10 @@ use SimpleXMLElement as SimpleXMLElement;
  * 	'name' => $imagename,
  * 	'contenttype' => $imagecontenttype
  * ]];
- * $this->documentexportlib->showContent(
- * 	$filename,
- * 	$vorlage,
- * 	$xml_data,
- * 	$oe_kurzbz,
- * 	$version,
- * 	$outputformat,
- * 	null,
- * 	null,
- * 	$images
- * );
  */
 class DocumentExportLib
 {
-	private $unoconv_version;
+	private $_ci;
 
 	/**
 	 * Constructor
@@ -85,33 +70,14 @@ class DocumentExportLib
 	public function __construct()
 	{
 		// Gets CI instance
-		$this->ci =& get_instance();
+		$this->_ci =& get_instance();
 
-		// Load Phrases
-		$this->ci->load->library('PhrasesLib', ['document_export', null], 'documentExportPhrases');
+		// Load phrases
+		$this->_ci->load->library('PhrasesLib', ['document_export', null], 'DocumentExportPhrases');
 
-		// Which document converter has to be used
-		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
-		{
-			// Use docsbox!!
-		}
-		else
-		{
-			exec('unoconv --version', $ret_arr);
-
-			if(isset($ret_arr[0]))
-			{
-				$hlp = explode(' ', $ret_arr[0]);
-				if(isset($hlp[1]))
-				{
-					$this->unoconv_version = $hlp[1];
-				}
-				else
-					show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv_version"));
-			}
-			else
-				show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv"));
-		}
+		// Load libraries
+		$this->_ci->load->library('DocumentLib');
+		$this->_ci->load->library('SignatureLib');
 	}
 
 	/**
@@ -172,7 +138,7 @@ class DocumentExportLib
 		$xml_data = new DOMDocument;
 
 		if (!$xml_data->load($xml_url))
-			return error($this->ci->documentExportPhrases->t("document_export", "error_xml_load", [
+			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_xml_load", [
 				"url" => $xml_url,
 				"xml" => $xml,
 				"params" => $params
@@ -236,7 +202,7 @@ class DocumentExportLib
 
 		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
 
-		$result = $this->createAndSignContent(
+		$createResult = $this->createAndSignContent(
 			$temp_folder,
 			$outputformat,
 			$vorlage,
@@ -247,118 +213,26 @@ class DocumentExportLib
 			$sign_user,
 			$sign_profile
 		);
-		if (isError($result)) {
+		if (isError($createResult)) {
 			$this->close($temp_folder, $source_folder);
-			return $result;
+			return $createResult;
 		}
-		$temp_filename = getData($result);
+		$temp_filename = getData($createResult);
 
 		$fsize = filesize($temp_filename);
 		$handle = fopen($temp_filename, 'r');
 		if (!$handle)
-			return error($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
-		$result = fread($handle, $fsize);
+			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_file_load"));
+		$fileContentResult = fread($handle, $fsize);
 		fclose($handle);
 
 		$this->close($temp_folder, $source_folder);
 
-		return success($result);
+		return success($fileContentResult);
 	}
 
 	/**
-	 * Sets the headers and displays the Document.
-	 * On failure the exit() function will be called
-	 *
-	 * @param string				$filename
-	 * @param stdClass				$vorlage A db entry from tbl_vorlage
-	 * @param DomDocument			$xml_data
-	 * @param string				$oe_kurzbz
-	 * @param integer|null			$version (optional)
-	 * @param string				$outputformat (optional)
-	 * @param string				$sign_user (optional) Must be a valid uid
-	 * @param string				$sign_profile (optional) Signatureprofile for signing
-	 * @param array					$images (optional) Each element should have a property path, name & contenttype which are all strings
-	 *
-	 * @return void
-	 */
-	public function showContent(
-		$filename,
-		$vorlage,
-		$xml_data,
-		$oe_kurzbz,
-		$version = null,
-		$outputformat = null,
-		$sign_user = null,
-		$sign_profile = null,
-		$images = []
-	) {
-		$source_folder = getcwd();
-		$temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
-
-		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
-
-		$result = $this->createAndSignContent(
-			$temp_folder,
-			$outputformat,
-			$vorlage,
-			$oe_kurzbz,
-			$version,
-			$xml_data,
-			$images,
-			$sign_user,
-			$sign_profile
-		);
-		if (isError($result)) {
-			$this->close($temp_folder, $source_folder);
-			exit(getError($result));
-		}
-		$temp_filename = getData($result);
-
-		$fsize = filesize($temp_filename);
-		$handle = fopen($temp_filename, 'r');
-		if (!$handle) {
-			$this->close($temp_folder, $source_folder);
-			exit($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
-		}
-
-		if (headers_sent()) {
-			$this->close($temp_folder, $source_folder);
-			exit($this->ci->documentExportPhrases->t("document_export", "error_headers"));
-		}
-
-		switch ($outputformat) {
-			case 'pdf':
-				header('Content-type: application/pdf');
-				header('Content-Disposition: attachment; filename="' . $filename . '.pdf"');
-				header('Content-Length: ' . $fsize);
-				break;
-
-			case 'doc':
-				header('Content-type: application/vnd.ms-word');
-				header('Content-Disposition: attachment; filename="' . $filename . '.doc"');
-				header('Content-Length: ' . $fsize);
-				break;
-
-			case 'odt':
-				header('Content-type: application/vnd.oasis.opendocument.text');
-				header('Content-Disposition: attachment; filename="' . $filename . '.odt"');
-				header('Content-Length: ' . $fsize);
-				break;
-			default:
-				$this->close($temp_folder, $source_folder);
-				exit($this->ci->documentExportPhrases->t("document_export", "error_outputformat_missing"));
-		}
-
-		while (!feof($handle)) {
-			echo fread($handle, 8192);
-		}
-		fclose($handle);
-
-		$this->close($temp_folder, $source_folder);
-	}
-
-	/**
-	 * Helper function for getContent and showContent.
+	 * Helper function for getContent
 	 * Creates the temp folder and calls create and sign functions.
 	 *
 	 * @param string				$temp_folder
@@ -387,13 +261,13 @@ class DocumentExportLib
 		mkdir($temp_folder);
 		chdir($temp_folder);
 
-		$this->ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+		$this->_ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 
-		$result = $this->ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
+		$result = $this->_ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error($this->ci->documentExportPhrases->t("document_export", "error_template_missing"));
+			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_template_missing"));
 		$vorlage_stg = current(getData($result));
 		foreach ($vorlage_stg as $k => $v)
 			$vorlage->$k = $v;
@@ -437,7 +311,7 @@ class DocumentExportLib
 	{
 		$content_xsl = new DOMDocument();
 		if (!$content_xsl->loadXML($vorlage->text))
-			return error($this->ci->documentExportPhrases->t("document_export", "error_xsl_load"));
+			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_xsl_load"));
 
 		$proc = new XSLTProcessor();
 		$proc->importStyleSheet($content_xsl);
@@ -454,7 +328,7 @@ class DocumentExportLib
 		if ($vorlage->style) {
 			$styles_xsl = new DOMDocument();
 			if (!$styles_xsl->loadXML($vorlage->style))
-				return error($this->ci->documentExportPhrases->t("document_export", "error_styles_load"));
+				return error($this->_ci->DocumentExportPhrases->t("document_export", "error_styles_load"));
 			$style_proc = new XSLTProcessor();
 			$style_proc->importStyleSheet($styles_xsl);
 
@@ -482,7 +356,7 @@ class DocumentExportLib
 		$tempname_zip = $temp_folder . '/out.zip';
 
 		if (!copy($zipfile, $tempname_zip))
-			return error($this->ci->documentExportPhrases->t("document_export", "error_file_copy"));
+			return error($this->_ci->DocumentExportPhrases->t("document_export", "error_file_copy"));
 
 		exec("zip $tempname_zip content.xml");
 		if (!is_null($styles_xsl))
@@ -502,7 +376,7 @@ class DocumentExportLib
 
 			$manifest_xml = new DOMDocument;
 			if (!$manifest_xml->loadXML($manifest))
-				return error($this->ci->documentExportPhrases->t("document_export", "error_manifest"));
+				return error($this->_ci->DocumentExportPhrases->t("document_export", "error_manifest"));
 
 			//root-node holen
 			$root = $manifest_xml->getElementsByTagName('manifest')->item(0);
@@ -529,42 +403,16 @@ class DocumentExportLib
 
 		clearstatcache();
 
+		$temp_filename = $temp_folder . '/out.' . $outputformat;
 		switch ($outputformat) {
 			case 'pdf':
 			case 'doc':
-				$ret = 0;
-				$temp_filename = $temp_folder . '/out.' . $outputformat;
+				$converResult = $this->_ci->documentlib->convert($tempname_zip, $temp_filename, $outputformat);
 
-				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true) {
-					// Use docsbox
-
-					$this->ci->load->library("DocsboxLib");
-
-					$docboxlib = get_class($this->ci->docboxlib);
-
-					$ret = $docboxlib::convert($tempname_zip, $temp_filename, $outputformat);
-				} else {
-					// Use unoconv
-
-					// Unoconv Version 0.6 hat eine Bug wodurch die Berechtigungen des PDF/Doc nicht korrekt gesetzt
-					// werden. Deshalb wird dies hier speziell behandelt.
-					// Die 2. Variante hat den Vorteil dass hier eine bessere Fehlerbehandlung moeglich ist
-					if ($this->unoconv_version == '0.6')
-						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . '  %2$s > %1$s';
-					else
-						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . ' --output %s %s 2>&1';
-
-					$command = sprintf($command, $temp_filename, $tempname_zip);
-
-					exec($command, $out, $ret);
-				}
-
-				if ($ret)
-					return error($this->ci->documentExportPhrases->t("document_export", "error_conv_timeout"));
+				if (isError($converResult))
+					return error($this->_ci->DocumentExportPhrases->t('document_export', 'error_conv_timeout'));
 				break;
 			case 'odt':
-			default:
-				$temp_filename = $tempname_zip;
 		}
 
 		return success($temp_filename);
@@ -584,63 +432,15 @@ class DocumentExportLib
 	 */
 	protected function sign($temp_folder, $temp_filename, $outputformat, $user, $profile)
 	{
-		if ($outputformat != 'pdf')
-			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_pdf"));
+		if ($outputformat != 'pdf') return error($this->_ci->DocumentExportPhrases->t('document_export', 'error_sign_pdf'));
 
-		// Load the File
-		$file_data = file_get_contents($temp_filename);
+		$signed_filename = $this->_ci->signaturelib->sign($temp_folder, $temp_filename, $user, $profile);
 
-		$data = new stdClass();
-		$data->document = base64_encode($file_data);
+		// If fine then return it
+		if (isSuccess($signed_filename)) return $signed_filename;
 
-		// Signatur Profil
-		if (!is_null($profile))
-			$data->profile = $profile;
-		else
-			$data->profile = SIGNATUR_DEFAULT_PROFILE;
-
-		// Username des Endusers der die Signatur angefordert hat
-		$data->user = $user;
-
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_URL, SIGNATUR_URL . '/' . SIGNATUR_SIGN_API);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 7);
-		curl_setopt($ch, CURLOPT_USERAGENT, "FH-Complete");
-
-		// SSL Zertifikatsprüfung deaktivieren
-		// Besser ist es das Zertifikat am Server zu installieren!
-		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-		$data_string = json_encode($data, JSON_FORCE_OBJECT);
-
-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, [
-			'Content-Type: application/json',
-			'Content-Length:' . mb_strlen($data_string),
-			'Authorization: Basic ' . base64_encode(SIGNATUR_USER . ":" . SIGNATUR_PASSWORD)
-		]);
-
-		$result = curl_exec($ch);
-		if (curl_errno($ch)) {
-			curl_close($ch);
-			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_timeout"));
-		}
-		curl_close($ch);
-		$resultdata = json_decode($result);
-
-		// If it is success
-		if (isset($resultdata->error) && $resultdata->error == 0) {
-			$signed_filename = $temp_folder . '/signed.pdf';
-			file_put_contents($signed_filename, base64_decode($resultdata->retval));
-			return success($signed_filename);
-		}
-
-		// otherwise if it is an error
-		return error($resultdata->retval ?? $this->ci->documentExportPhrases->t("global", "unknown_error", ["error" => $result]));
+		// Otherwise it is an error
+		return error($this->_ci->DocumentExportPhrases->t('global', 'unknown_error', ['error' => getError($signed_filename)]));
 	}
 
 	/**
@@ -717,3 +517,4 @@ class DocumentExportLib
 		return 'pdf';
 	}
 }
+

application/libraries/DocumentLib.php

@@ -4,7 +4,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class DocumentLib
 {
-	private $unoconv_version;
+	private $_ci;
+	private $_unoconv_version;
 
 	/**
 	 * Constructor
@@ -12,7 +13,10 @@ class DocumentLib
 	public function __construct()
 	{
 		// Gets CI instance
-		$this->ci =& get_instance();
+		$this->_ci =& get_instance();
+
+		// Load phrases
+		$this->_ci->load->library('PhrasesLib', ['document_export', null], 'DocumentExportPhrases');
 
 		// Which document converter has to be used
 		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
@@ -28,13 +32,13 @@ class DocumentLib
 				$hlp = explode(' ', $ret_arr[0]);
 				if(isset($hlp[1]))
 				{
-					$this->unoconv_version = $hlp[1];
+					$this->_unoconv_version = $hlp[1];
 				}
 				else
-					show_error('Could not get Unoconv Version');
+					show_error($this->_ci->DocumentExportPhrases->t('document_export', 'error_unoconv_version'));
 			}
 			else
-				show_error('Unoconv not found - Please install Unoconv');
+				show_error($this->_ci->DocumentExportPhrases->t('document_export', 'error_unoconv'));
 		}
 	}
 
@@ -56,7 +60,7 @@ class DocumentLib
 			case 'image/jpeg':
 			case 'image/jpg':
 			case 'image/pjpeg':
-				$this->_jpegtopdf($filename, $outFile);
+				$this->_jpegToPdf($filename, $outFile);
 				return success($outFile);
 			case 'application/vnd.oasis.opendocument.spreadsheet':
 			case 'application/msword':
@@ -72,23 +76,19 @@ class DocumentLib
 				else
 				{
 					// Unoconv Version 0.6 seems to fail on converting TXT Files
-					if ($this->unoconv_version == '0.6')
-						return error();
+					if ($this->_unoconv_version == '0.6') return error('Unoconv Version 0.6 does not convert TXT Files correctly');
 				}
 
+				// Convertion
 				$ret = $this->convert($filename, $outFile, 'pdf');
-				if(isSuccess($ret))
-				{
-					return success($outFile);
-				}
-				else
-				{
-					return error(getError($ret));
-				}
+				if(isSuccess($ret)) return success($outFile);
+
+				// Error
+				return $ret;
 			case 'application/pdf':
 				return success($filename);
 			default:
-				return error('Unknown Mimetype:'.$mimetype);
+				return error('Unknown Mimetype:' . $mimetype);
 		}
 	}
 
@@ -101,20 +101,20 @@ class DocumentLib
 	 */
 	public function mergePDF($files, $outFile)
 	{
-		$cmd = "gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$outFile ";
+		$cmd = 'gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$outFile ';
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 
 		// add all pdf files to the command
 		foreach ($files as $f)
 		{
-			$cmd .= $f." ";
+			$cmd .= $f.' ';
 			if (!file_exists($f))
 			{
 				return error("File not found: '$f'");
 			}
-			if (finfo_file($finfo, $f) != "application/pdf")
+			if (finfo_file($finfo, $f) != 'application/pdf')
 			{
-				return error("Wrong format(".finfo_file($finfo, $f)."): '$f'");
+				return error('Wrong format('.finfo_file($finfo, $f)."): '$f'");
 			}
 		}
 
@@ -144,13 +144,13 @@ class DocumentLib
 		// If it is set to use docsbox
 		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
 		{
-			require_once(dirname(__FILE__).'/../application/libraries/DocsboxLib.php');
+			require_once(dirname(__FILE__).'/DocsboxLib.php');
 
 			$ret = DocsboxLib::convert($inFile, $outFile, $format);
 		}
 		else // otherwise use unoconv
 		{
-			if ($this->unoconv_version == '0.6')
+			if ($this->_unoconv_version == '0.6')
 				$command = 'unoconv -f %1$s  %3$s > %2$s';
 			else
 				$command = 'unoconv -f %s --output %s %s 2>&1';
@@ -175,7 +175,7 @@ class DocumentLib
 	 * @param string $outfile Path to Output (pdf) File.
 	 * @return success or error object
 	 */
-	private function _jpegtopdf($filename, $outfile)
+	private function _jpegToPdf($filename, $outfile)
 	{
 		if (!file_exists($filename))
 			return error('File does not exists');
@@ -230,3 +230,4 @@ class DocumentLib
 		return true;
 	}
 }
+

application/libraries/KalenderNotificationLib.php

@@ -1,171 +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');
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-	}
-
-	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/>';
-
-		//TODO (david) richtigen Empfänger
-		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/KalenderSyncLib.php

@@ -1,429 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-class KalenderSyncLib
-{
-	private $_ci;
-
-	private $status_map = array(
-		'preview' => array('planning', 'sync_preview'),
-		'live' => array('planning', 'sync_preview', 'preview', 'sync_live')
-	);
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->_ci->load->library('KalenderLib');
-	}
-
-	public function run($studiensemester_kurzbz)
-	{
-		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
-
-		$configs = $this->_ci->KalendersyncstatusModel->load();
-
-		if (isError($configs))
-			return $configs;
-
-		if (!hasData($configs))
-			return success([]);
-
-		$results = [];
-		$mail_infos_gesamt = [];
-
-		foreach (getData($configs) as $config)
-		{
-
-			$ziel_status = isEmptyString($config->sync_status_kurzbz) ? 'live' : $config->sync_status_kurzbz;
-
-			$relevante_stati = array_merge($this->status_map[$ziel_status], array('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-			$kalender_ids_result = $this->getKalenderIds(
-				$config->oe_kurzbz,
-				$config->studiensemester_kurzbz,
-				$relevante_stati,
-				$config->ausbildungssemester,
-				$config->studienplan_id,
-				$config->datum_bis
-			);
-
-			if (isError($kalender_ids_result))
-				return $kalender_ids_result;
-
-			$kalender_ids = getData($kalender_ids_result);
-
-			$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
-
-			if (isError($sync_result))
-				return $sync_result;
-
-			$sync_data = getData($sync_result);
-
-			if ((bool) $config->mail)
-				$mail_infos_gesamt = array_merge($mail_infos_gesamt, $sync_data['mail_infos']);
-
-			$results[] = [
-				'kalender_syncstatus_id' => $config->kalender_syncstatus_id,
-				'oe_kurzbz' => $config->oe_kurzbz,
-				'ausbildungssemester' => $config->ausbildungssemester,
-				'studienplan_id' => $config->studienplan_id,
-				'ziel_status' => $ziel_status,
-				'mail' => (bool) $config->mail,
-				'synced' => $sync_data['synced']
-			];
-		}
-
-		if (!empty($mail_infos_gesamt))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($mail_infos_gesamt);
-		}
-
-		return success($results);
-	}
-
-	public function runManual($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester = null, $studienplan_id = null, $mail = true, $datum_bis = null, $ziel_status = 'live')
-	{
-		$relevante_stati = array_merge($this->status_map[$ziel_status], array('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$kalender_ids_result = $this->getKalenderIds(
-			$oe_kurzbz,
-			$studiensemester_kurzbz,
-			$relevante_stati,
-			$ausbildungssemester,
-			$studienplan_id,
-			$datum_bis
-		);
-
-		if (isError($kalender_ids_result))
-			return $kalender_ids_result;
-
-		$kalender_ids = getData($kalender_ids_result);
-
-		$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
-
-		if (isError($sync_result))
-			return $sync_result;
-
-		$sync_data = getData($sync_result);
-
-		if ($mail && !empty($sync_data['mail_infos']))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($sync_data['mail_infos']);
-		}
-
-		return success(['synced' => $sync_data['synced']]);
-	}
-
-	public function sync()
-	{
-		$mail_infos_gesamt = [];
-		$synced_gesamt = 0;
-
-		$todelete_ids_result = $this->_getManuallySetStatus(array('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		if (isError($todelete_ids_result))
-			return $todelete_ids_result;
-
-		$todelete_result = $this->_syncKalenderIds(getData($todelete_ids_result), null);
-
-		if (isError($todelete_result))
-			return $todelete_result;
-
-		$todelete_data = getData($todelete_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $todelete_data['mail_infos']);
-		$synced_gesamt += $todelete_data['synced'];
-
-		$preview_ids_result = $this->_getManuallySetStatus(array('sync_preview'));
-
-		if (isError($preview_ids_result))
-			return $preview_ids_result;
-
-		$preview_result = $this->_syncKalenderIds(getData($preview_ids_result), 'preview');
-
-		if (isError($preview_result))
-			return $preview_result;
-
-		$preview_data = getData($preview_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $preview_data['mail_infos']);
-		$synced_gesamt += $preview_data['synced'];
-
-		$live_ids_result = $this->_getManuallySetStatus(array('sync_live'));
-
-		if (isError($live_ids_result))
-			return $live_ids_result;
-
-		$live_result = $this->_syncKalenderIds(getData($live_ids_result), 'live');
-
-		if (isError($live_result))
-			return $live_result;
-
-		$live_data = getData($live_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $live_data['mail_infos']);
-		$synced_gesamt += $live_data['synced'];
-
-		if (!empty($mail_infos_gesamt))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($mail_infos_gesamt);
-		}
-
-		return success(['synced' => $synced_gesamt]);
-	}
-
-	private function _getManuallySetStatus($status_kurzbz_list)
-	{
-		if (empty($status_kurzbz_list))
-			return success([]);
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->db->where_in('status_kurzbz', $status_kurzbz_list);
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success([]);
-
-		return success(array_column(getData($result), 'kalender_id'));
-	}
-
-	public function getKalenderIds($oe_kurzbz, $studiensemester_kurzbz, $status_kurzbz_list, $ausbildungssemester = null, $studienplan_id = null, $datum_bis = null)
-	{
-		if (empty($status_kurzbz_list))
-			return success([]);
-
-		$studiengang_result = $this->_getStudiengang($oe_kurzbz);
-
-		if (isError($studiengang_result))
-			return $studiengang_result;
-
-		$studiengang_kz = getData($studiengang_result);
-
-		if (!hasData($studiengang_result))
-		{
-			$organisationseinheiten = $this->_ci->OrganisationseinheitModel->getChilds($oe_kurzbz);
-			$oe_kurzbz = hasData($organisationseinheiten) ? array_column(getData($organisationseinheiten), 'oe_kurzbz') : [];
-		}
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'tbl_kalender.kalender_id = tbl_kalender_lehreinheit.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'tbl_kalender_lehreinheit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
-
-		if (!is_null($studiengang_kz))
-		{
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang_kz);
-		}
-		else
-		{
-			$this->_ci->KalenderModel->db->where_in('tbl_lehrveranstaltung.oe_kurzbz', $oe_kurzbz);
-		}
-
-		$this->_ci->KalenderModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.status_kurzbz', $status_kurzbz_list);
-
-		$this->_ci->KalenderModel->db->where('NOT EXISTS (
-				SELECT 1 FROM lehre.tbl_kalender nachfolger
-				WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)', null, false);
-
-		if (!is_null($studienplan_id))
-		{
-			$this->_ci->KalenderModel->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id');
-			$this->_ci->KalenderModel->db->where('tbl_studienplan_lehrveranstaltung.studienplan_id', $studienplan_id);
-		}
-
-		if (!is_null($ausbildungssemester))
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.semester', $ausbildungssemester);
-
-		if (!is_null($datum_bis))
-		{
-			$end_date = date('Y-m-d', strtotime($datum_bis . ' +1 day'));
-			$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $end_date);
-		}
-
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success([]);
-
-		return success(array_column(getData($result), 'kalender_id'));
-	}
-
-
-	private function _archiveVorgaenger($vorgaenger_kalender_id, $stop_at_live = false)
-	{
-		$return_array = array();
-		if (!$vorgaenger_kalender_id) return success($return_array);
-
-		$current_id = $vorgaenger_kalender_id;
-
-		while ($current_id)
-		{
-			$vorgaenger = $this->_ci->KalenderModel->load(array('kalender_id' => $current_id));
-			if (!hasData($vorgaenger)) return success($return_array);
-
-			$vorgaenger = getData($vorgaenger)[0];
-
-			if ($stop_at_live && $vorgaenger->status_kurzbz === 'live')
-				return success($return_array);
-
-			if (in_array($vorgaenger->status_kurzbz, array('preview', 'live')))
-			{
-				$this->_ci->KalenderModel->update(
-					array('kalender_id' => $current_id),
-					array('status_kurzbz' => 'archived', 'status_kurzbz_max' => $vorgaenger->status_kurzbz)
-				);
-
-				$return_array[] = $vorgaenger;
-			}
-
-			$current_id = $vorgaenger->vorgaenger_kalender_id;
-		}
-		return success($return_array);
-	}
-
-	private function _syncKalenderIds($kalender_ids, $ziel_status)
-	{
-		if (empty($kalender_ids))
-			return success(['synced' => 0, 'mail_infos' => []]);
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.*, tbl_kalender_ort.ort_kurzbz, tbl_kalender_ort.location');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->addOrder('tbl_kalender.kalender_id', 'DESC');
-		$to_update = $this->_ci->KalenderModel->load();
-
-		if (isError($to_update))
-			return $to_update;
-
-		if (!hasData($to_update))
-			return success(['synced' => 0, 'mail_infos' => []]);
-
-		$mail_infos = [];
-		$synced = 0;
-
-		foreach (getData($to_update) as $entry)
-		{
-			if (in_array($entry->status_kurzbz, array('to_delete', 'to_delete_live', 'to_delete_preview')))
-			{
-				$notify = array();
-				if ($entry->status_kurzbz === 'to_delete_live')
-				{
-					$status_max = 'live';
-					$notify = array('lektor', 'student');
-				}
-				else if ($entry->status_kurzbz === 'to_delete_preview')
-				{
-					$status_max = 'preview';
-					$notify = array('lektor');
-				}
-				else if ($entry->status_kurzbz === 'to_delete')
-				{
-					$status_max = 'planning';
-				}
-
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted', 'status_kurzbz_max' => $status_max));
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => $notify);
-
-				$vorgaenger_array = $this->_archiveVorgaenger($entry->vorgaenger_kalender_id);
-
-
-
-				if (hasData($vorgaenger_array))
-				{
-					foreach(getData($vorgaenger_array) as $vorgaenger)
-					{
-						$archive_notify = array();
-
-						if ($vorgaenger->status_kurzbz === 'preview')
-							$archive_notify = array('lektor');
-						else if ($vorgaenger->status_kurzbz === 'live')
-						{
-							$archive_notify = array('student', 'lektor');
-
-							$history = $this->_ci->kalenderlib->getHistory($vorgaenger->kalender_id, false, false);
-							if (hasData($history))
-							{
-								$history = getData($history);
-
-								foreach ($history as $entry)
-								{
-									if ($entry->status_kurzbz === 'deleted' && $entry->status_kurzbz_max === 'preview')
-									{
-										$archive_notify = array('student');
-										break;
-									}
-								}
-							}
-						}
-
-						$mail_infos[] = array('entry' => $vorgaenger, 'new_status' => 'deleted', 'notify' => $archive_notify);
-					}
-				}
-
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'preview' && in_array($entry->status_kurzbz, array('planning', 'sync_preview')))
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'preview'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, true);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'preview', 'notify' => array('lektor'));
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'live' && in_array($entry->status_kurzbz, array('planning', 'sync_preview', 'sync_live')))
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'live' && $entry->status_kurzbz === 'preview')
-			{
-				$current = getData($this->_ci->KalenderModel->load(array('kalender_id' => $entry->kalender_id)))[0];
-				if ($current->status_kurzbz === 'archived')
-					continue;
-
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
-				$synced++;
-			}
-		}
-
-		return success(['synced' => $synced, 'mail_infos' => $mail_infos]);
-	}
-
-
-	private function _getStudiengang($oe_kurzbz)
-	{
-		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
-		$result = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success(null);
-
-		return success(getData($result)[0]->studiengang_kz);
-	}
-}

application/libraries/RaumvorschlagLib.php

@@ -1,563 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-use CI3_Events as Events;
-
-class RaumvorschlagLib
-{
-	private $_ci;
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$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('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-
-		$this->_ci->load->library('CollisionChecker');
-		$this->_ci->load->library('KalenderLib');
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-	}
-
-
-	public function getVorschlaege($kalender_id)
-	{
-		$event = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
-		$event = $event[0];
-		return $this->_getVorschlaegeForEvent($event);
-	}
-
-	public function getVorschlaegeByLehreinheit($lehreinheit_id, $von, $bis)
-	{
-		$teilnehmer = $this->_getLehreinheitTeilnehmer($lehreinheit_id);
-
-		$event = (object) [
-			'kalender_id' => null,
-			'lehreinheit_id' => [$lehreinheit_id],
-			'isostart' => (new DateTime($von))->format('c'),
-			'isoend' => (new DateTime($bis))->format('c'),
-			'datum' => (new DateTime($von))->format('Y-m-d'),
-			'lektor' => $teilnehmer->lektor_data,
-			'gruppe' => $teilnehmer->gruppen_data,
-		];
-
-		return $this->_getVorschlaegeForEvent($event);
-	}
-
-	public function getVorschlaegeSlots($lehreinheit_id, $start_date, $end_date)
-	{
-		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
-		if (!hasData($lehreinheit_result))
-			return error('Lehreinheit nicht gefunden');
-		$lehreinheit = getData($lehreinheit_result)[0];
-
-		$block = $lehreinheit->stundenblockung;
-		if ($block <= 0)
-			return error('Stundenblockung ist ungültig');
-
-		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
-		$stunden_result = $this->_ci->StundeModel->load();
-		$stunden = hasData($stunden_result) ? array_values(getData($stunden_result)) : [];
-
-		if (empty($stunden))
-			return error('Kein Stunden-Raster gefunden');
-
-		$teilnehmer = $this->_getLehreinheitTeilnehmer($lehreinheit_id);
-		$grp = $this->_splitGruppen($teilnehmer->gruppen_data);
-		$lektor_uids = array_column($teilnehmer->lektor_data, 'mitarbeiter_uid');
-
-		$verplante_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$start_date,
-			$end_date,
-			$lektor_uids,
-			$grp->gruppen_kurzbz,
-			$grp->lehrverband_gruppen
-		);
-
-		$start_day = strtotime($start_date);
-		$end_day = strtotime($end_date);
-
-		$moegliche_slots = array();
-
-		$verplante_zeitsperren = $this->_getZeitsperen($start_date, $end_date, $lektor_uids);
-		while ($start_day <= $end_day)
-		{
-			$tag = date('Y-m-d', $start_day);
-
-			$verplante_tages_events = array_values(array_filter($verplante_events, function($event) use ($tag)
-			{
-				return $event->datum === $tag;
-			}));
-
-			foreach ($stunden as $index => $start_stunde)
-			{
-				if (!isset($stunden[$index + $block - 1]))
-					continue;
-
-				$end_stunde = $stunden[$index + $block - 1];
-
-				$slot_start = $tag . ' ' . $start_stunde->beginn;
-				$slot_end = $tag . ' ' . $end_stunde->ende;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_zeitsperren, $lektor_uids, 'lektor'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $lektor_uids, 'lektor'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $grp->gruppen_kurzbz, 'gruppe'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $grp->lehrverband_gruppen_bezeichnung, 'lehrverband'))
-					continue;
-
-				$moegliche_slots[] = [
-					'isostart' => (new DateTime($slot_start))->format('c'),
-					'isoend' => (new DateTime($slot_end))->format('c'),
-					'marker_isoend' => (new DateTime($tag . ' ' . $start_stunde->ende))->format('c'),
-				];
-			}
-
-			$start_day = strtotime('+1 day', $start_day);
-		}
-
-
-		$slots = [];
-		foreach ($moegliche_slots as $slot)
-		{
-			$event_obj = (object) [
-				'kalender_id' => null,
-				'lehreinheit_id' => [$lehreinheit_id],
-				'isostart' => $slot['isostart'],
-				'isoend' => $slot['isoend'],
-			];
-
-			$raumkandidaten = $this->_getRaumkandidaten($event_obj);
-
-			if (empty($raumkandidaten))
-				continue;
-
-			$ratings = $this->_getRatings($verplante_events, $slot, $raumkandidaten, $lektor_uids, $grp->gruppen_kurzbz, $grp->lehrverband_gruppen_bezeichnung);
-			$best = $ratings[0];
-			$anzahl_weitere = count($ratings) - 1;
-
-			$slots[] = [
-				'isostart' => $slot['isostart'],
-				'isoend' => $slot['isoend'],
-				'marker_isoend' => $slot['marker_isoend'],
-				'rating' => $this->_scoreToRating($best['score']),
-				'label' => $anzahl_weitere > 0 ? $best['ort_kurzbz'] . ' (' . $best['score'] . ') + ' . $anzahl_weitere . ' weitere' : $best['ort_kurzbz'] . ' (' . $best['score'] . ')',
-				'raeume' => $ratings,
-			];
-		}
-		return success($slots);
-	}
-
-	private function _getZeitsperen($start_date, $end_date, $uids)
-	{
-
-		if (empty($uids)) return [];
-
-		if (($this->_ci->variablelib->getVar('ignore_kollision') === 'true') || ($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 <', $end_date);
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $start_date);
-
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-		$result = $this->_ci->ZeitsperreModel->load();
-
-		if (!hasData($result)) return [];
-
-		$events = [];
-		foreach (getData($result) as $row)
-		{
-			$von = new DateTime($row->vondatum . ' ' . ($row->von_beginn ?? '00:00'));
-			$bis = new DateTime($row->bisdatum . ' ' . ($row->bis_ende ?? '23:59'));
-
-			$events[] = (object)[
-				'isostart' => $von->format('c'),
-				'isoend' => $bis->format('c'),
-				'lektor' => [['mitarbeiter_uid' => $row->mitarbeiter_uid]]
-			];
-		}
-		return $events;
-	}
-
-	private function _getLehreinheitTeilnehmer($lehreinheit_id)
-	{
-		$lektoren_result = $this->_ci->LehreinheitMitarbeiterModel->loadWhere(['lehreinheit_id' => $lehreinheit_id]);
-		$lektor_data = [];
-		if (hasData($lektoren_result))
-		{
-			$lektor_data = getData($lektoren_result);
-		}
-
-		$gruppen_result = $this->_ci->LehreinheitgruppeModel->getByLehreinheit($lehreinheit_id);
-		$gruppen_data = [];
-		if (hasData($gruppen_result))
-		{
-			$gruppen_rows = getData($gruppen_result);
-
-			foreach ($gruppen_rows as $gruppe)
-			{
-				$gruppen_data[] = (array) $gruppe;
-			}
-		}
-
-
-		return (object)[
-			'lektor_data' => $lektor_data,
-			'gruppen_data' => $gruppen_data,
-		];
-
-	}
-
-	private function _splitGruppen($gruppen_data)
-	{
-		$gruppen_kurzbz = array_values(array_filter(array_column($gruppen_data, 'gruppe_kurzbz')));
-		$lehrverband_gruppen = array_values(array_filter($gruppen_data, function($gruppe)
-		{
-			return empty($gruppe['gruppe_kurzbz']);
-		}));
-		$lehrverband_gruppen_bezeichnung = array_column($lehrverband_gruppen, 'bezeichnung');
-
-		return (object)[
-			'gruppen_kurzbz' => $gruppen_kurzbz,
-			'lehrverband_gruppen' => $lehrverband_gruppen,
-			'lehrverband_gruppen_bezeichnung' => $lehrverband_gruppen_bezeichnung
-		];
-
-	}
-	//TODO (david) umbauen auf CollisionChecks
-	private function _isFrei($slot_start, $slot_end, $events, $check_array, $type)
-	{
-		if (empty($check_array)) return true;
-
-		$slot_start_ts = strtotime($slot_start);
-		$slot_end_ts = strtotime($slot_end);
-
-		foreach ($events as $event)
-		{
-			$event_start_ts = strtotime($event->isostart);
-			$event_end_ts = strtotime($event->isoend);
-
-			if ($event_end_ts <= $slot_start_ts || $event_start_ts >= $slot_end_ts)
-				continue;
-
-			$event_uids = $this->_getIds($event, $type);
-
-			if (!empty(array_intersect($event_uids, $check_array)))
-				return false;
-		}
-
-		return true;
-	}
-
-	private function _scoreToRating($score)
-	{
-		if ($score >= 90)
-			return 'good';
-		if ($score >= 60)
-			return 'mid';
-		return 'bad';
-	}
-	private function _getVorschlaegeForEvent($event)
-	{
-		$raumkandidaten = $this->_getRaumkandidaten($event);
-		if (empty($raumkandidaten)) return [];
-
-		$lektor_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		$grp = $this->_splitGruppen($event->gruppe);
-
-		$tages_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$event->datum,
-			$event->datum,
-			$lektor_uids,
-			$grp->gruppen_kurzbz,
-			$grp->lehrverband_gruppen
-		);
-
-		return $this->_getRatings($tages_events, $event, $raumkandidaten, $lektor_uids, $grp->gruppen_kurzbz, $grp->lehrverband_gruppen_bezeichnung);
-	}
-	private function _getRatings($events, $event, $raumkandidaten, $lektor_uids, $gruppen_kurzbz, $lehrverband_gruppen_bezeichnung)
-	{
-		$event = (object)$event;
-		$lektor_davor = $this->_getEventDavor($events, $event->isostart, $lektor_uids, 'lektor');
-		$gruppen_davor = $this->_getEventDavor($events, $event->isostart, $gruppen_kurzbz, 'gruppe');
-		$lehrverband_davor = $this->_getEventDavor($events, $event->isostart, $lehrverband_gruppen_bezeichnung, 'lehrverband');
-
-		$lektor_davor_ort = $lektor_davor ? $this->_getOrtDetails($lektor_davor->ort_kurzbz) : null;
-		$gruppen_davor_ort = $gruppen_davor ? $this->_getOrtDetails($gruppen_davor->ort_kurzbz) : null;
-		$lehrverband_davor_ort = $lehrverband_davor ? $this->_getOrtDetails($lehrverband_davor->ort_kurzbz) : null;
-
-		$unique = [];
-
-		foreach ($raumkandidaten as $raum)
-		{
-			$unique[$raum->ort_kurzbz] = $raum;
-		}
-
-		$kandidaten = array_values($unique);
-
-
-		$ratings = [];
-		foreach ($kandidaten as $raum)
-		{
-			$rating = ['ort_kurzbz' => $raum->ort_kurzbz, 'score' => 100, 'details' => [],
-				'raumtyp_kurzbz' => $raum->raumtyp_kurzbz, 'max_person' => $raum->max_person];
-			$this->_rateLektor($rating, $raum, $lektor_davor_ort);
-			$this->_rateGruppen($rating, $raum, $gruppen_davor_ort);
-			$this->_rateGruppen($rating, $raum, $lehrverband_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;
-
-			$event_uids = $this->_getIds($event, $type);
-
-			if (empty(array_intersect($event_uids, $uids)))
-				continue;
-
-			if ($kandidat === null || $event->isoend > $kandidat->isoend)
-				$kandidat = $event;
-		}
-
-		return $kandidat;
-	}
-
-	private function _getIds($event, $type)
-	{
-		$event_uids = array();
-
-		if ($type === 'lektor')
-			$event_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		else if ($type === 'gruppe')
-			$event_uids = array_column($event->gruppe, 'gruppe_kurzbz');
-		else if ($type === 'lehrverband')
-			$event_uids = array_column($event->gruppe, 'bezeichnung');
-
-		return $event_uids;
-	}
-
-	private function _getRaumkandidaten($event)
-	{
-		$raumtyp = null;
-		$raumtypalternativ = null;
-
-		if (!empty($event->lehreinheit_id))
-		{
-			$lehreinheit = $this->_ci->LehreinheitModel->load($event->lehreinheit_id[0]);
-			if (hasData($lehreinheit))
-			{
-				$lehreinheit = getData($lehreinheit)[0];
-				$raumtyp = $lehreinheit->raumtyp ?? null;
-				$raumtypalternativ = $lehreinheit->raumtypalternativ ?? null;
-			}
-		}
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender_ort.ort_kurzbz');
-		$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);
-		if (!is_null($event->kalender_id))
-		{
-			$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $event->kalender_id);
-		}
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['deleted', 'to_delete', 'to_delete_live', 'to_delete_preview', 'archived']);
-		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz IS NOT NULL', null, false);
-		$this->_ci->KalenderModel->db->where(
-			'NOT EXISTS (
-				SELECT 1 FROM lehre.tbl_kalender nachfolger
-				WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-			)', null, false
-		);
-
-		$belegte = $this->_ci->KalenderModel->load();
-
-		$belegte_orte = hasData($belegte) ? array_column(getData($belegte), 'ort_kurzbz') : [];
-
-		if (empty($raumtyp))
-		{
-			$raeume = $this->_getFreieRaeume(null, $belegte_orte);
-			return hasData($raeume) ? getData($raeume) : [];
-		}
-
-		$vorschlaege = [];
-
-		$raeume = $this->_getFreieRaeume($raumtyp, $belegte_orte);
-		if (hasData($raeume))
-			$vorschlaege = getData($raeume);
-
-		if (count($vorschlaege) < 5 && !empty($raumtypalternativ))
-		{
-			$bereits_gefunden = array_merge($belegte_orte, array_column($vorschlaege, 'ort_kurzbz'));
-			$alternativ = $this->_getFreieRaeume($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, max_person, raumtyp_kurzbz');
-		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
-
-		if (!empty($raumtyp))
-			$this->_ci->OrtModel->db->where('raumtyp_kurzbz', $raumtyp);
-		else
-			$this->_ci->OrtModel->db->where('reservieren', true);
-
-		$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/SignatureLib.php

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

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -1,303 +0,0 @@
-<?php
-
-class LectureCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'lecture';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis)) return [];
-		if (empty($data->kalender_id) && empty($data->lehreinheit_id) && empty($data->uids)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		if (!empty($data->kalender_id))
-			$uids = $this->_getUids($data->kalender_id);
-		else if (!empty($data->lehreinheit_id))
-			$uids = $this->_getUidsFromLehreinheit($data->lehreinheit_id);
-		else
-			$uids = $data->uids;
-
-		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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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', 'to_delete_live', 'to_delete_preview']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-		$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 _getUidsFromLehreinheit($lehreinheit_id)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$uids = array_column(getData($result), 'mitarbeiter_uid');
-		$uids = array_diff(array_filter($uids), $kollisionsfreie_user);
-
-		return array_values(array_unique($uids));
-	}
-
-	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);
-		if (!empty($data->kalender_id))
-			$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', 'to_delete_live', 'to_delete_preview'));
-		$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);
-		if (!empty($data->kalender_id))
-			$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', 'to_delete_live', 'to_delete_preview'));
-		$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,94 +0,0 @@
-<?php
-
-class ResourcesCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$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)) 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');
-
-		if (!empty($data->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', 'to_delete_live', 'to_delete_preview']);
-		$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', 'to_delete_live', 'to_delete_preview']);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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,90 +0,0 @@
-<?php
-
-class RoomCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$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) || 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');
-
-		if (!empty($data->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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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,286 +0,0 @@
-<?php
-
-class StudentCollisionCheck implements ICollisionCheck
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'student';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis)) return [];
-		if (!isset($data->kalender_id) && !isset($data->lehreinheit_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();
-
-		if (isset($data->kalender_id))
-		{
-			$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)
-	";
-
-			$qry_1_param = $data->kalender_id;
-		}
-		else
-		{
-			$qry1 = "
-				SELECT DISTINCT tbl_benutzergruppe.uid
-				FROM lehre.tbl_lehreinheit
-				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_lehreinheit.lehreinheit_id = ?
-					AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-
-				UNION ALL
-
-				SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
-				FROM lehre.tbl_lehreinheit
-				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_lehreinheit.lehreinheit_id = ?
-					AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-        ";
-
-			$qry_1_param = $data->lehreinheit_id;
-		}
-
-		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
-			[$qry_1_param],
-			$kollisionsfreie_user,
-			[$qry_1_param],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result1) || !hasData($result1)) return [];
-
-		$curUids = array_flip(array_column(getData($result1), 'uid'));
-
-		$exclude_kalender = isset($data->kalender_id) ? "AND tbl_kalender.kalender_id != ?" : "";
-		$exclude_kalender_param = isset($data->kalender_id) ? [$data->kalender_id] : [];
-
-		$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 > ?
-				$exclude_kalender
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-				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 > ?
-				$exclude_kalender
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-				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], $exclude_kalender_param, $kollisionsfreie_user,
-			[$data->bis, $data->von], $exclude_kalender_param, $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', 'to_delete_live', 'to_delete_preview')
-				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', 'to_delete_live', 'to_delete_preview')
-				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,413 +0,0 @@
-<?php
-
-class VerbandCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'verband';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis)) return [];
-		if (!isset($data->kalender_id) && !isset($data->lehreinheit_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 (!isset($data->kalender_id)) $kollision_reservierung = false;
-
-		if (!$kollision_student && !$kollision_reservierung) return [];
-
-		$dbModel = new DB_Model();
-		$collisions = [];
-
-		$group_matching_qry = "
-			(
-				(
-					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
-					)
-				)
-			)
-		";
-
-		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'
-				";
-			}
-
-			$other_lehreinheitgruppe_subquery = "
-				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 ."
-        ";
-
-			if (isset($data->kalender_id))
-			{
-				$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 (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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 (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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', 'to_delete_live', 'to_delete_preview')
-					AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-					AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-					AND ". $group_matching_qry ."
-					AND other_kalender.kalender_id NOT IN (
-						SELECT vorgaenger_kalender_id
-						FROM lehre.tbl_kalender
-						WHERE vorgaenger_kalender_id IS NOT NULL
-					)
-            ";
-
-				$params = [$data->bis, $data->von, $data->kalender_id];
-			}
-			else
-			{
-				$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_lehreinheitgruppe current_lehreinheitguppe
-					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.von < ?
-						AND other_kalender.bis > ?
-	
-					JOIN (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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_lehreinheitguppe.lehreinheit_id = ?
-					AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-					AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-					AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-					AND ". $group_matching_qry ."
-					AND other_kalender.kalender_id NOT IN (
-						SELECT vorgaenger_kalender_id
-						FROM lehre.tbl_kalender
-						WHERE vorgaenger_kalender_id IS NOT NULL
-					)
-				";
-
-				$params = [$data->bis, $data->von, $data->lehreinheit_id];
-			}
-
-			$result = $dbModel->execReadOnlyQuery($sql_gruppen, $params);
-
-			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', 'to_delete_live', 'to_delete_preview')
-				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', 'to_delete_live', 'to_delete_preview')
-			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/treemenu/TempusLib.php

@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Tempus Menu library
- */
-class TempusLib
-{
-	protected $_ci = null;
-
-	public $config = [];
-
-	public function __construct()
-	{
-		// Get code igniter instance
-		$this->_ci =& get_instance();
-
-		// Load Tree-config
-		$this->_ci->load->config('treemenu/custom/tempus');
-		$this->config = $this->_ci->config->item('root');
-
-		// Load Libraries
-		$this->_ci->load->library('treemenu/base/StgLib');
-
-		// Load Model
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function stg($path_template)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return [];
-
-		return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
-	}
-
-	public function semester($path_template, $has_children, $stg)
-	{
-
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$has_children)
-			$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz);
-	}
-
-	public function verband($path_template, $stg, $semester)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
-		$this->_ci->StudiengangModel->addGroupBy('v.studiengang_kz, v.semester');
-
-
-		return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester);
-	}
-
-	public function group($path_template, $stg, $semester, $verband)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		if ($verband === null) {
-			$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
-			$this->_ci->GruppeModel->addSelect('semester');
-
-			return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester);
-		}
-
-
-		return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband);
-	}
-
-	public function orgform($path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$stg->mischform)
-			return [];
-		
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		$this->_ci->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-		$this->_ci->StudienordnungModel->addSelect("p.orgform_kurzbz");
-
-		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
-	}
-
-	protected function getPermittedStudiengangKzs()
-	{
-		$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/lvplan') ?: []);
-		return $permittedStgs;
-	}
-
-	protected function getStgFromUrl($stg)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return null;
-
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
-		$stg = $this->_ci->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => $stg
-		]);
-
-		if (!hasData($stg))
-			return null;
-
-		return current(getData($stg));
-	}
-}

application/models/accounting/Vertrag_model.php

@@ -31,18 +31,20 @@ class Vertrag_model extends DB_Model
      */
 	public function save($person_id, $mitarbeiter_uid, $lehrveranstaltung_id, $lehreinheit_id, $projektarbeit_id = null, $vertragsstunden, $betrag, $studiensemester_kurzbz)
     {
-        $person_id = (isset($person_id) && is_numeric($person_id))
+		$vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
+		$person_id = (isset($person_id) && is_numeric($person_id))
             ? $person_id
             : show_error('peron_id must be set and numeric.');
-        $lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
-            ? $lehreinheit_id
-            : show_error('lehreinheit_id must be set and numeric.');
         $lehrveranstaltung_id = (isset($lehrveranstaltung_id) && is_numeric($lehrveranstaltung_id))
             ? $lehrveranstaltung_id
             : show_error('lehrveranstaltung_id must be set and numeric.');
         $projektarbeit_id = (isset($projektarbeit_id) && is_numeric($projektarbeit_id))
             ? $projektarbeit_id
             : null;
+		$lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
+			? $lehreinheit_id
+			: (($vertragstyp_kurzbz == 'Betreuung') ? null : show_error('lehreinheit_id must be set and numeric.'));
         $vertragsstunden = (isset($vertragsstunden) && is_numeric($vertragsstunden))
             ? $vertragsstunden
             : 0;
@@ -53,7 +55,7 @@ class Vertrag_model extends DB_Model
             ? $mitarbeiter_uid
             : show_error('mitarbeiter_uid must be set and a string value.');;
 
-        $vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
 
         // First check if Vertrag already exists for that Lehrauftrag or for that Projektbetreuerauftrag
         if ($vertragstyp_kurzbz == 'Lehrauftrag')
@@ -257,7 +259,7 @@ class Vertrag_model extends DB_Model
         }
         elseif ($vertragstyp_kurzbz == 'Betreuung')
         {
-            $this->addSelect('lehreinheit_id');
+            $this->addSelect('lehreinheit_id, lehre.tbl_projektarbeit.lehrveranstaltung_id, lehre.tbl_projektarbeit.studiensemester_kurzbz');
             $this->addJoin('lehre.tbl_projektbetreuer', 'vertrag_id');
             $this->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
             if ($result = $this->loadWhere(array('vertrag_id' => $vertrag_id)))
@@ -281,17 +283,22 @@ class Vertrag_model extends DB_Model
     {
         if ($result = getData($this->getLehreinheitID($vertrag_id)))
         {
-            $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-            $this->LehreinheitModel->addSelect($select);
+            if (!empty($result[0]->lehreinheit_id))
+            {
+                $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+                $this->LehreinheitModel->addSelect($select);
 
-            if($result = $this->LehreinheitModel->load($result[0]->lehreinheit_id))
-            {
-                return success($result->retval);
-            }
-            else
-            {
-                return error('Fehler beim Laden der Lehreinheit');
+                if ($result = $this->LehreinheitModel->load($result[0]->lehreinheit_id))
+                {
+                    return success($result->retval);
+                }
+                else
+                {
+                    return error('Fehler beim Laden der Lehreinheit');
+                }
             }
+
+            return success($result);
         }
         else
         {
@@ -563,14 +570,13 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektarbeit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 		WHERE
 			tbl_projektbetreuer.person_id=?
 			AND vertrag_id IS NULL
@@ -619,14 +625,13 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektarbeit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung, vertrag_id
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 		WHERE
 			tbl_projektbetreuer.person_id=?
 			AND vertrag_id = ?

application/models/crm/Akte_model.php

@@ -248,60 +248,5 @@ class Akte_model extends DB_Model
 
 		return success($dokumente->retval);
 	}
-
-	/**
-	 * Liefert die Archivdokumente einer Person/mehrerer Personen
-	 *
-	 * @param integer/array				$person_id
-	 * @param boolean|null			$signiert			Wenn true werden nur Dokumente geliefert die digital signiert wurden.
-	 * @param boolean|null			$stud_selfservice	Wenn true werden nur Dokumente geliefert die Studierende selbst herunterladen duerfen.
-	 *
-	 * @return stdClass
-	 */
-	public function getArchiv($person_id, $signiert = null, $stud_selfservice = null)
-	{
-		$this->addSelect('akte_id');
-		$this->addSelect('person_id');
-		$this->addSelect('dokument_kurzbz');
-		$this->addSelect('mimetype');
-		$this->addSelect('erstelltam');
-		$this->addSelect('gedruckt');
-		$this->addSelect('titel_intern');
-		$this->addSelect('anmerkung_intern');
-		$this->addSelect('titel');
-		$this->addSelect('bezeichnung');
-		$this->addSelect('updateamum');
-		$this->addSelect('insertamum');
-		$this->addSelect('updatevon');
-		$this->addSelect('insertvon');
-		$this->addSelect('uid');
-		$this->addSelect('dms_id');
-		$this->addSelect('anmerkung');
-		$this->addSelect('nachgereicht');
-		$this->addSelect('CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden', false);
-		$this->addSelect('nachgereicht_am');
-		$this->addSelect('ausstellungsnation');
-		$this->addSelect('formal_geprueft_amum');
-		$this->addSelect('archiv');
-		$this->addSelect('signiert');
-		$this->addSelect('stud_selfservice');
-		$this->addSelect('akzeptiertamum');
-
-		if ($signiert !== null)
-			$this->db->where('signiert', (boolean)$signiert);
-		if ($stud_selfservice !== null)
-			$this->db->where('stud_selfservice', (boolean)$stud_selfservice);
-
-		if (is_array($person_id))
-			$this->db->where_in('person_id', $person_id);
-		else
-			$this->db->where('person_id', $person_id);
-
-		$this->addOrder('erstelltam', 'DESC');
-		$this->addOrder('akte_id', 'DESC');
-
-		return $this->loadWhere([
-			'archiv' => true
-		]);
-	}
 }
+

application/models/crm/Prestudentstatus_model.php

@@ -177,7 +177,7 @@ class Prestudentstatus_model extends DB_Model
 	 * @param prestudent_id ID of the Prestudent.
 	 * @param $status_kurzbz kurzbz of the status.
 	 * @param $ausbildungssemester ausbildungssemester of the status.
-	 * @param $studiensemester_kurzbz studiensemster of the status.
+	 * @param $studiensemester_kurzbz studiensemester of the status.
 	 *
 	 * @return result object with all the status entries
 	 */

application/models/education/Lehreinheit_model.php

@@ -395,80 +395,6 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}
 
-	public function getOffeneStunden($lehreinheit_ids)
-	{
-		if (!is_array($lehreinheit_ids))
-			$lehreinheit_ids = [$lehreinheit_ids];
-
-		if (empty($lehreinheit_ids))
-			return success([]);
-
-		$db = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($lehreinheit_ids), '?'));
-
-		$qry = "WITH eventdauer AS (
-					SELECT
-						tbl_kalender_lehreinheit.lehreinheit_id,
-						tbl_kalender.von,
-						tbl_kalender.bis,
-						tbl_kalender.kalender_id
-					FROM lehre.tbl_lehreinheit
-							JOIN lehre.tbl_kalender_lehreinheit USING(lehreinheit_id)
-							JOIN lehre.tbl_kalender USING(kalender_id)
-					WHERE tbl_lehreinheit.lehreinheit_id IN ($placeholders)
-						AND NOT EXISTS (SELECT 1 FROM lehre.tbl_kalender nachfolger
-										WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)
-						AND tbl_kalender.status_kurzbz NOT IN ('deleted', 'todelete', 'archived')
-					GROUP BY tbl_kalender_lehreinheit.lehreinheit_id, tbl_kalender.von, tbl_kalender.bis, tbl_kalender.kalender_id
-				),
-				raster AS (
-					SELECT
-						eventdauer.lehreinheit_id,
-						eventdauer.kalender_id,
-						eventdauer.von,
-						eventdauer.bis,
-						vonstunde.stunde AS vonstunde_nr,
-						bisstunde.stunde AS bisstunde_nr
-					FROM eventdauer
-						LEFT JOIN lehre.tbl_stunde vonstunde ON eventdauer.von::time = vonstunde.beginn
-						LEFT JOIN lehre.tbl_stunde bisstunde ON eventdauer.bis::time = bisstunde.ende
-				),
-				unterrichtsdauer AS (
-					SELECT
-						raster.lehreinheit_id,
-						raster.kalender_id,
-						sum(EXTRACT(EPOCH FROM (LEAST(stunde.ende, raster.bis::time) - GREATEST(stunde.beginn, raster.von::time))) / 60) AS minuten
-					FROM raster JOIN lehre.tbl_stunde stunde ON stunde.beginn < raster.bis::time AND stunde.ende > raster.von::time
-					WHERE raster.vonstunde_nr IS NULL OR raster.bisstunde_nr IS NULL
-					GROUP BY raster.lehreinheit_id, raster.kalender_id
-				),
-				verplantestunden AS (
-					SELECT raster.lehreinheit_id, raster.kalender_id,
-						CASE
-							WHEN raster.vonstunde_nr IS NOT NULL AND raster.bisstunde_nr IS NOT NULL
-								THEN (raster.bisstunde_nr - raster.vonstunde_nr + 1)
-							ELSE coalesce(unterrichtsdauer.minuten, 0) / 45
-						END AS verplantestunde
-					FROM raster LEFT JOIN unterrichtsdauer ON unterrichtsdauer.lehreinheit_id = raster.lehreinheit_id AND unterrichtsdauer.kalender_id = raster.kalender_id
-				),
-				verplant_gesamt AS (
-					SELECT lehreinheit_id, SUM(verplantestunde) AS verplant
-					FROM verplantestunden
-					GROUP BY lehreinheit_id
-				)
-				SELECT
-					lema.lehreinheit_id,
-					lema.mitarbeiter_uid,
-					lema.planstunden,
-					ROUND(coalesce(verplant_gesamt.verplant, 0), 2) AS verplant,
-					ROUND((lema.planstunden - coalesce(verplant_gesamt.verplant, 0)), 2) AS offenestunden
-				FROM lehre.tbl_lehreinheitmitarbeiter lema
-					LEFT JOIN verplant_gesamt ON verplant_gesamt.lehreinheit_id = lema.lehreinheit_id
-				WHERE lema.lehreinheit_id IN ($placeholders)";
-
-		return $db->execReadOnlyQuery($qry, array_merge($lehreinheit_ids, $lehreinheit_ids));
-	}
-
 	private function getLVTmp($stg_kz = null)
 	{
 		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 

application/models/education/Lehreinheitmitarbeiter_model.php

@@ -85,9 +85,18 @@ class Lehreinheitmitarbeiter_model extends DB_Model
 
 	public function getLektorenByLe($lehreinheit_id)
 	{
-		$this->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant');
+		$this->addSelect('tbl_person.vorname, tbl_person.nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant, 
+		COALESCE(insertvonperson.vorname || \' \' || insertvonperson.nachname, tbl_lehreinheitmitarbeiter.insertvon) as insertvon,
+		COALESCE(updatevonperson.vorname || \' \' || updatevonperson.nachname, tbl_lehreinheitmitarbeiter.updatevon) as updatevon');
 		$this->addJoin('tbl_benutzer', 'uid = mitarbeiter_uid');
 		$this->addJoin('tbl_person', 'person_id');
+		$this->addJoin('tbl_benutzer insertvonbenutzer', 'insertvonbenutzer.uid = tbl_lehreinheitmitarbeiter.insertvon', 'LEFT');
+		$this->addJoin('tbl_person insertvonperson', 'insertvonperson.person_id = insertvonbenutzer.person_id', 'LEFT');
+
+		$this->addJoin('tbl_benutzer updatevonbenutzer', 'updatevonbenutzer.uid = tbl_lehreinheitmitarbeiter.updatevon', 'LEFT');
+		$this->addJoin('tbl_person updatevonperson', 'updatevonperson.person_id = updatevonbenutzer.person_id', 'LEFT');
+
+
 
 		$this->addJoin('(
 			SELECT 1 as verplant, lehreinheit_id, mitarbeiter_uid

application/models/education/Lehrveranstaltung_model.php

@@ -1263,6 +1263,39 @@ class Lehrveranstaltung_model extends DB_Model
 		";
 	}
 
+	/**
+	 * Gets lehrveranstaltungen of Studienplan of a certain lva_id set
+	 * used if a bigger set of lva id is already available and it needs to be checked against a certain studienplan aswell
+	 * @param $studienplan_id ID des Studienplans
+	 * @param $lva_ids LVA_ID welche abgegleicht werden sollen
+	 * @return array|null
+	 */
+	public function getLvsByStudienplanByLvaIDs($studienplan_id, $lva_ids)
+	{
+		$params = array($studienplan_id, $lva_ids);
+
+		$qry = "SELECT tbl_lehrveranstaltung.*,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+			tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+			tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+			tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+			tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+			tbl_studienplan_lehrveranstaltung.curriculum,
+			tbl_studienplan_lehrveranstaltung.export,
+			tbl_studienplan_lehrveranstaltung.genehmigung
+		FROM lehre.tbl_lehrveranstaltung
+		JOIN lehre.tbl_studienplan_lehrveranstaltung
+		USING(lehrveranstaltung_id)
+		WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ? 
+			AND tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN ?
+		";
+
+		$qry .= " ORDER BY stpllv_sort, semester, sort";
+
+		return $this->execQuery($qry, $params);
+	}
+
 	public function getAllOe($lv_id)
 	{
 		$qry = "SELECT DISTINCT oe_kurzbz

application/models/education/Paabgabe_model.php

@@ -50,8 +50,7 @@ class Paabgabe_model extends DB_Model
 					JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
 					JOIN public.tbl_benutzer bn_student ON(tbl_projektarbeit.student_uid=bn_student.uid)
 					JOIN public.tbl_person person_student ON(bn_student.person_id=person_student.person_id)
-					JOIN lehre.tbl_lehreinheit ON(tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
-					JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+					JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 					JOIN public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
 					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE
@@ -68,14 +67,13 @@ class Paabgabe_model extends DB_Model
 			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
 			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
-			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.studiensemester_kurzbz,
 			   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 		FROM campus.tbl_paabgabe
 				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+				 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				 JOIN public.tbl_studiengang ON(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
@@ -93,7 +91,7 @@ class Paabgabe_model extends DB_Model
 					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
 					   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
-					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.studiensemester_kurzbz,
 					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
 					   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 				
@@ -101,8 +99,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 						 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 						 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-						 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-						 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+						 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 						 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 						 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)

application/models/education/Projektarbeit_model.php

@@ -25,7 +25,7 @@ class Projektarbeit_model extends DB_Model
 	{
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
-					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					pa.studiensemester_kurzbz, pa.lehrveranstaltung_id,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -41,7 +41,6 @@ class Projektarbeit_model extends DB_Model
 				FROM
 					lehre.tbl_projektarbeit pa
 					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
@@ -57,7 +56,7 @@ class Projektarbeit_model extends DB_Model
 
 		if (isset($studiensemester_kurzbz))
 		{
-			$qry .= ' AND tbl_lehreinheit.studiensemester_kurzbz=?';
+			$qry .= ' AND tbl_projektarbeit.studiensemester_kurzbz=?';
 			$params[] = $studiensemester_kurzbz;
 		}
 
@@ -134,7 +133,7 @@ class Projektarbeit_model extends DB_Model
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
 			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
-			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_projektarbeit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
 			lehre.tbl_projektarbeit.note as note,
@@ -157,7 +156,6 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer USING(person_id)
 				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
 				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
@@ -366,7 +364,7 @@ class Projektarbeit_model extends DB_Model
 					tbl_studiengang.typ, tbl_studiengang.kurzbz,
 					tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, 
 					tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
-					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
+					student_benutzer.uid, tbl_student.matrikelnr, tbl_projektarbeit.studiensemester_kurzbz, public.tbl_student.student_uid,
 		
 					lehre.tbl_projektarbeit.sprache,
 					 lehre.tbl_projektarbeit.seitenanzahl,
@@ -430,7 +428,6 @@ class Projektarbeit_model extends DB_Model
 					LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 					LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 					LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-					LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 					LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 					LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 					LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
@@ -503,7 +500,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
+				 tbl_projektarbeit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -565,7 +562,6 @@ class Projektarbeit_model extends DB_Model
 				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
@@ -633,7 +629,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
+				 tbl_projektarbeit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -695,7 +691,6 @@ class Projektarbeit_model extends DB_Model
 				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)

application/models/organisation/Gruppe_model.php

@@ -11,26 +11,4 @@ class Gruppe_model extends DB_Model
 		$this->dbTable = 'public.tbl_gruppe';
 		$this->pk = 'gruppe_kurzbz';
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-
-		return $this->load();
-	}
 }

application/models/organisation/Lehrverband_model.php

@@ -41,29 +41,4 @@ class Lehrverband_model extends DB_Model
 
 		return $result;
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->addOrder('verband');
-		$this->addOrder('gruppe');
-		$this->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-		return $this->load();
-	}
 }

application/models/organisation/Studiensemester_model.php

@@ -218,7 +218,7 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemester of a date or the next closest previous studiensemester if a date is not within a studiensemester
 		$query = "
 			SELECT  studiensemester_kurzbz, start, ende
 			FROM	public.tbl_studiensemester
@@ -292,13 +292,29 @@ class Studiensemester_model extends DB_Model
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_startdate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_startdate)
-				) AS studiensemester_kurzbz
+				) AS studiensemester_kurzbz,
+				COALESCE(
+					(SELECT start FROM semester_interval_startdate),
+					(SELECT start FROM nearest_semester_interval_startdate)
+				) as start,
+				COALESCE(
+					(SELECT ende FROM semester_interval_startdate),
+					(SELECT ende FROM nearest_semester_interval_startdate)
+				) as ende
 			UNION
 			SELECT
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_enddate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_enddate)
-				) AS studiensemester_kurzbz
+				) AS studiensemester_kurzbz,
+				COALESCE(
+					(SELECT start FROM semester_interval_enddate),
+					(SELECT start FROM nearest_semester_interval_enddate)
+				) as start,
+				COALESCE(
+					(SELECT ende FROM semester_interval_enddate),
+					(SELECT ende FROM nearest_semester_interval_enddate)
+				) as ende
 
 EOSQL;
 

application/models/person/Notiz_model.php

@@ -98,7 +98,7 @@ class Notiz_model extends DB_Model
 	/**
 	 * Add a Notiz for a given person
 	 */
-	public function addNotizForPerson($person_id, $titel, $text, $erledigt, $verfasser_uid)
+	public function addNotizForPerson($person_id, $titel, $text, $erledigt, $verfasser_uid, $insertvon = null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -106,8 +106,15 @@ class Notiz_model extends DB_Model
 		// Start DB transaction
 		$this->db->trans_start(false);
 
-		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
-			"insertvon" => $verfasser_uid));
+		$result = $this->insert(
+			array(
+				'titel' => $titel,
+				'text' => $text,
+				'erledigt' => $erledigt,
+				'verfasser_uid' => $verfasser_uid,
+				'insertvon' => $insertvon ?? $verfasser_uid
+			)
+		);
 
 		if (isSuccess($result))
 		{

application/models/ressource/BetriebsmittelKalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class BetriebsmittelKalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_betriebsmittel_kalender';
-		$this->pk = 'betriebsmittel_kalender_id';
-	}
-}

application/models/ressource/Betriebsmittel_model.php

@@ -31,26 +31,4 @@ class Betriebsmittel_model extends DB_Model
 
 		return $this->execQuery($qry);
 	}
-
-	public function getSchedulableEntriesByDatetimeInterval($from, $to)
-	{
-		$qry = "SELECT
-					*
-				FROM
-					wawi.tbl_betriebsmittel
-				WHERE
-					verplanen=true
-					AND 
-				NOT EXISTS(
-					SELECT 1 FROM lehre.tbl_betriebsmittel_kalender
-					JOIN lehre.tbl_kalender ON tbl_kalender.eindeutige_kalender_gruppen_id = tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id
-					WHERE
-						betriebsmittel_id=tbl_betriebsmittel.betriebsmittel_id
-					AND tbl_kalender.von < ?
-					AND tbl_kalender.bis > ?
-				)";
-
-
-		return $this->execQuery($qry, array($to, $from));
-	}
 }

application/models/ressource/Kalender_Event_Rolle_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_Rolle_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_rolle';
-		$this->pk = array('rolle_kurzbz');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_Teilnehmer_model.php

@@ -1,16 +0,0 @@
-<?php
-class
-Kalender_Event_Teilnehmer_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_teilnehmer';
-		$this->pk = array('kalender_event_teilnehmer_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event';
-		$this->pk = array('kalender_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Lehreinheit_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Lehreinheit_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_lehreinheit';
-		$this->pk = array('kalender_id','lehreinheit_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Ort_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalender_Ort_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_ort';
-		$this->pk = 'kalender_ort_id';
-	}
-}

application/models/ressource/Kalender_model.php

@@ -1,25 +0,0 @@
-<?php
-class Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender';
-		$this->pk = 'kalender_id';
-	}
-
-	public function generateUniqueGroupId()
-	{
-		while (true) {
-			$uniqueGroupId = generateUUID();
-			$result = $this->loadWhere(['eindeutige_kalender_gruppen_id' => $uniqueGroupId]);
-			if (!hasData($result)) {
-				return $uniqueGroupId;
-			}
-		}
-	}
-}

application/models/ressource/Kalenderstatus_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalenderstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_status';
-		$this->pk = 'status_kurzbz';
-	}
-}

application/models/ressource/Kalendersyncstatus_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalendersyncstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_syncstatus';
-		$this->pk = 'kalender_syncstatus_id';
-	}
-}

application/models/ressource/Reservierung_Kalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class Reservierung_Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'sync.tbl_reservierung_kalender';
-		$this->pk = 'reservierung_kalender_id';
-	}
-}

application/models/ressource/Stundenplandev_Kalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class Stundenplandev_Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'sync.tbl_stundenplandev_kalender';
-		$this->pk = 'stundenplandev_kalender_id';
-	}
-}

application/views/Tempus.php

@@ -1,52 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'Tempus',
-		'axios027' => true,
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3' => true,
-		'primevue3' => true,
-		'tabulator5' => true,
-		'filtercomponent' => true,
-		'navigationcomponent' => true,
-		'vuedatepicker11' => true,
-		'tags' => true,
-		'phrases' => array(
-			'global',
-			'ui',
-			'lehre'
-		),
-		'customCSSs' => [
-			'public/css/components/vue-datepicker.css',
-			'public/css/components/primevue.css',
-			'public/css/components/calendar.css',
-			'public/css/Tempus.css',
-			'public/css/Studentenverwaltung.css',
-			'public/css/components/function.css'
-		],
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js',
-			'vendor/npm-asset/primevue/listbox/listbox.min.js'
-		],
-		'customJSModules' => [
-			'public/js/apps/Tempus.js'
-		]
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-	<div id="main">
-		<router-view
-			default-semester="<?= $variables['semester_aktuell']; ?>"
-			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
-			tempus-root="<?= site_url('Tempus'); ?>"
-			cis-root="<?= CIS_ROOT; ?>"
-			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
-			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
-			:config="<?=  htmlspecialchars(json_encode($variables)); ?>"
-			>
-		</router-view>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php

@@ -16,7 +16,7 @@ $query = '
 			anrechnung.begruendung_id,
 			anrechnung.dms_id,
 			CASE
-				WHEN stg.typ || stg.kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
+				WHEN stg.oe_kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
 				ELSE FALSE
 			END "schreibberechtigt",
 			anrechnung.studiensemester_kurzbz,

application/views/lehre/lehrauftrag/acceptLehrauftragData.php

@@ -232,8 +232,8 @@ FROM
                 SELECT
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
-                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -268,8 +268,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                      pb
                         JOIN lehre.tbl_projektarbeit               pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit                 le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung           lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung           lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit       oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person                     person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag                vertrag USING (vertrag_id)
@@ -280,7 +279,7 @@ FROM
                     /* filter projektbetreuuer */
                     pb.person_id =  \'' . $PERSON_ID . '\'
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */

application/views/lehre/lehrauftrag/approveLehrauftragData.php

@@ -242,8 +242,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    (pa.projektarbeit_id::text)                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    (pa.projektarbeit_id::text)                                                         AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -270,7 +270,7 @@ FROM
                         ELSE (oe.organisationseinheittyp_kurzbz ||
                               \' \' || oe.bezeichnung)
                         END                                                                             AS "lv_oe_kurzbz",
-                    (nachname || \' \' || vorname)                                                        AS "lektor",
+                    (nachname || \' \' || vorname)                                                      AS "lektor",
                     TRUNC(pb.stunden, 1)                                                                AS "stunden",
                     pb.stundensatz,
                     TRUNC((pb.stunden * pb.stundensatz), 2)                                             AS "betrag",
@@ -280,8 +280,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -291,7 +290,7 @@ FROM
                     /* filter organisationseinheit */
                     lv.oe_kurzbz IN (\'' . implode('\',\'', $ORGANISATIONSEINHEIT) . '\')
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */