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

application/config/navigation.php

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

application/controllers/Cis/Documents.php

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

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->getOutputFileInfo($dms_id);
+				$download = $this->dmslib->download($dms_id);
 				if (isError($download))
 					return $download;
 
@@ -84,4 +84,3 @@ class ProfilUpdate extends Auth_Controller
 		}
 	}
 }
-

application/controllers/Cis/Pub.php

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

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

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

@@ -511,11 +511,10 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
+
+		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
-		if(count($projektarbeiten_ids) > 0) {
-			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
-		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			
@@ -847,10 +846,9 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		if(count($result->retval) > 0) {
-			$email = getData($result);
-			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
-		} else return '';
+		$email = $this->getDataOrTerminateWithError($result, 'general');
+		
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
 	}
 

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

@@ -51,8 +51,6 @@ class Documents extends FHCAPI_Controller
 		$this->loadPhrases([
 			'stv'
 		]);
-
-		$this->load->library('DocumentExportLib');
 	}
 
 	/**
@@ -102,11 +100,23 @@ class Documents extends FHCAPI_Controller
 	{
 		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
 
-		$akteData = $akteExportData['akteData'];
-		$exportData = $akteExportData['exportData'];
+		$akteData = $akteData['akteData'];
+		$exportData = $akteData['exportData'];
+
+		/**
+		 *				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		 */
 
 		// Output
-		$contentResult = $this->documentexportlib->getContent(
+		$result = $this->documentexportlib->showContent(
+			$akteData['akteData']['inhalt'],
 			$exportData['vorlage'],
 			$exportData['xml_data'],
 			$exportData['oe_kurzbz'],
@@ -115,9 +125,7 @@ class Documents extends FHCAPI_Controller
 			$exportData['sign_user']
 		);
 
-		$content = $this->getDataOrTerminateWithError($contentResult);
-
-		$this->terminateWithFileOutput($akteData['mimetype'], $content, $akteData['titel'] . '.pdf');
+		$this->terminateWithSuccess(true);
 	}
 
 	/**
@@ -153,10 +161,12 @@ class Documents extends FHCAPI_Controller
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
+				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
+				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}
 
@@ -198,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -210,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -240,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -324,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 
@@ -455,13 +462,18 @@ class Documents extends FHCAPI_Controller
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));
 
+
+		$this->load->library('DocumentExportLib');
+
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->documentexportlib->addArchiveToData($data);
-		$contentResult = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
 
-		$content = $this->getDataOrTerminateWithError($contentResult);
+		// Output
+		$result = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+
+		$content = $this->getDataOrTerminateWithError($result);
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);
 
@@ -479,4 +491,3 @@ class Documents extends FHCAPI_Controller
 		];
 	}
 }
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,44 +851,40 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$this->load->config('stv');
+		$tags = $this->config->item('stv_prestudent_tags');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$tags = $this->config->item('stv_prestudent_tags');
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags)) {
+			$tags = array_keys($tags);
 
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->db->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			foreach ($tags as $key => $tag) {
+				$tags[$key] = $this->db->escape($tag);
 			}
-			$subQueryTag = "
-			  (
-				SELECT
-				  tag.prestudent_id,
-				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-				  SELECT DISTINCT ON (n.notiz_id)
-					n.notiz_id AS id,
-					nt.typ_kurzbz,
-					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-					n.text AS notiz,
-					nt.style,
-					n.erledigt AS done,
-					nz.prestudent_id
-				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-				. $whereTags .
-				"
-				) AS tag
-				GROUP BY tag.prestudent_id
-			  ) AS tag_data_agg
-			";
+			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 		}
+		$subQueryTag = "
+		  (
+			SELECT
+			  tag.prestudent_id,
+			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+			FROM (
+			  SELECT DISTINCT ON (n.notiz_id)
+				n.notiz_id AS id,
+				nt.typ_kurzbz,
+				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+				n.text AS notiz,
+				nt.style,
+				n.erledigt AS done,
+				nz.prestudent_id
+			  FROM public.tbl_notizzuordnung AS nz
+				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+			. $whereTags .
+			"
+			) AS tag
+			GROUP BY tag.prestudent_id
+		  ) AS tag_data_agg
+		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -911,17 +907,11 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
+		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
 
 
 		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

application/controllers/dashboard/Admin.php

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

application/controllers/dashboard/Api.php

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

application/controllers/dashboard/Config.php

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

application/controllers/dashboard/Dashboard.php

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

application/controllers/dashboard/DashboardDemo.php

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

application/controllers/dashboard/Widget.php

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

application/controllers/jobs/AbgabetoolJob.php

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

application/controllers/lehre/Antrag/Attachment.php

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

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->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($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->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/CreateAnrechnung.php

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

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

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->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($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->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/system/infocenter/InfoCenter.php

@@ -179,7 +179,6 @@ class InfoCenter extends Auth_Controller
 		// Loads libraries
 		$this->load->library('PersonLogLib');
 		$this->load->library('WidgetLib');
-		$this->load->library('AkteLib');
 
 		$this->load->config('infocenter');
 
@@ -453,7 +452,8 @@ class InfoCenter extends Auth_Controller
 
 		if (isset($akte_id) && isset($person_id))
 		{
-			$akte = $this->aktelib->getByAkteId($akte_id);
+			$this->load->library('AkteLib');
+			$akte = $this->aktelib->get($akte_id);
 
 			if (hasData($akte))
 			{
@@ -1169,6 +1169,8 @@ class InfoCenter extends Auth_Controller
 	 */
 	public function outputAkteContent($akte_id)
 	{
+		$this->load->library('DmsLib');
+
 		$akte = $this->AkteModel->load($akte_id);
 
 		if (isError($akte))
@@ -1176,7 +1178,7 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($akte));
 		}
 
-		$aktecontent = $this->aktelib->getByAkteId($akte_id);
+		$aktecontent = $this->dmslib->getAkteContent($akte_id);
 
 		if (isError($aktecontent))
 		{
@@ -2466,4 +2468,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}

application/core/FHC_Controller.php

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

application/core/Notiz_Controller.php

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

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

application/helpers/hlp_header_helper.php

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

application/libraries/AkteLib.php

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

application/libraries/AntragLib.php

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

application/libraries/DmsLib.php

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

application/libraries/DocumentExportLib.php

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

application/libraries/DocumentLib.php

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

application/libraries/ExtensionsLib.php

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

application/libraries/PermissionLib.php

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

application/libraries/SignatureLib.php

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

application/libraries/dashboard/DashboardLib.php

@@ -49,7 +49,7 @@ class DashboardLib
 	
 	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,31 +57,14 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id, $uid)
 	{
-		$funktion_kurzbzs = [];
-		$rights = $this->_ci->permissionlib->getAccessRights();
-		if ($rights)
-			$funktion_kurzbzs = array_unique(array_map(function ($right) {
-				return $right->funktion_kurzbz;
-			}, $rights));
-		
-		$this->_ci->DashboardPresetModel->db
-			->group_start()
-				->where_in('funktion_kurzbz', $funktion_kurzbzs)
-				->or_where('funktion_kurzbz IS NULL')
-			->group_end();
-
-		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
-		
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard_id
-		]);
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
 		$defaultconfig = array();
 		
-		if (hasData($result))
+		if (hasData($res_presets))
 		{
-			$presets = getData($result);
+			$presets = getData($res_presets);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -154,10 +137,8 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard->dashboard_id,
-			'funktion_kurzbz' => $funktion_kurzbz
-		]);
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
 		if (hasData($result))
 		{
@@ -214,11 +195,11 @@ class DashboardLib
 	{
 		foreach ($addwigets as $widget)
 		{
-			if(!isset($widget['widgetid']))
+			if(!isset($widget->widgetid))
 			{
-				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
 			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
 		}
 	}
 	

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,7 +3,6 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
-use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -23,7 +22,6 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
-	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -71,11 +69,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
-
-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$vertragsbestandteil = new VertragsbestandteilLohnguide();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -134,12 +127,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
-					'VertragsbestandteilLohnguide_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
-				break;
-
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -10,7 +10,6 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
-require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -1,155 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilLohnguide extends Vertragsbestandteil
-{
-	protected $stellenbezeichnung;
-	protected $vordienstzeit;
-	protected $fachrichtung_kurzbz;
-	protected $modellstelle_kurzbz;
-	protected $kommentar_person;
-	protected $kommentar_modellstelle;
-
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
-	}
-
-	public function getStellenbezeichnung()
-	{
-		return $this->stellenbezeichnung;
-	}
-
-	public function setStellenbezeichnung($stellenbezeichnung): self
-	{
-		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
-		$this->stellenbezeichnung = $stellenbezeichnung;
-		return $this;
-	}
-
-	public function getVordienstzeit()
-	{
-		return $this->vordienstzeit;
-	}
-
-	public function setVordienstzeit($vordienstzeit): self
-	{
-		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
-		$this->vordienstzeit = $vordienstzeit;
-		return $this;
-	}
-
-	public function getFachrichtung_kurzbz()
-	{
-		return $this->fachrichtung_kurzbz;
-	}
-
-	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
-	{
-		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
-		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
-		return $this;
-	}
-
-	public function getModellstelle_kurzbz()
-	{
-		return $this->modellstelle_kurzbz;
-	}
-
-	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
-	{
-		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
-		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
-		return $this;
-	}
-
-	public function getKommentar_person()
-	{
-		return $this->kommentar_person;
-	}
-
-	public function setKommentar_person($kommentar_person): self
-	{
-		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
-		$this->kommentar_person = $kommentar_person;
-		return $this;
-	}
-
-	public function getKommentar_modellstelle()
-	{
-		return $this->kommentar_modellstelle;
-	}
-
-	public function setKommentar_modellstelle($kommentar_modellstelle): self
-	{
-		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
-		$this->kommentar_modellstelle = $kommentar_modellstelle;
-		return $this;
-	}
-
-	
-	
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
-		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
-		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
-		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
-		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
-		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
-		$this->fromdb = false;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'stellenbezeichnung' => $this->getStellenbezeichnung(),
-			'vordienstzeit' => $this->getVordienstzeit(),
-			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
-			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
-			'kommentar_person' => $this->getKommentar_person(),
-			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	/* public function validate()
-	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
-		}
-		
-		return parent::validate();
-	} */
-}

application/models/crm/Akte_model.php

@@ -248,5 +248,60 @@ 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/dashboard/Dashboard_Preset_model.php

@@ -11,4 +11,57 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
+
+	/**
+	 * Get Presets of given uid.
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	public function getPresets($dashboard_id, $uid)
+	{
+		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
+		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+		$sql = <<<EOSQL
+			SELECT 
+				* 
+			FROM 
+				dashboard.tbl_dashboard_preset 
+			WHERE 
+				dashboard_id = ? 
+			AND (
+					funktion_kurzbz IN (
+						SELECT 
+							DISTINCT funktion_kurzbz 
+						FROM 
+							public.tbl_benutzerfunktion 
+						WHERE 
+							uid = ? 
+						AND 
+							NOW()::date 
+						BETWEEN 
+							COALESCE(datum_von, '1970-01-01') 
+						AND 
+							COALESCE(datum_bis, '2170-12-31')
+					) 
+					OR 
+						funktion_kurzbz IS NULL
+				) 
+			ORDER BY 
+				funktion_kurzbz DESC
+EOSQL;
+		
+		return $this->execQuery($sql, array($dashboard_id, $uid));
+	}
+	
+	/**
+	 * Get Preset by Dashboard and Funktion
+	 * @param integer dashboard_id
+	 * @param string funktion_kurzbz
+	 * @return array
+	 */
+	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
+	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -402,17 +402,14 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit le
+				lehre.tbl_lehreinheit
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				le.lehrveranstaltung_id= ?
-				AND le.studiensemester_kurzbz = ?
+				tbl_lehreinheit.lehrveranstaltung_id= ?
+				AND tbl_lehreinheit.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
-				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
-			  	AND b.aktiv = TRUE 
-			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1

application/models/education/Paabgabe_model.php

@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
-			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
+		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/organisation/Studiengang_model.php

@@ -594,10 +594,7 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
-			. $this->dbTable . ".bezeichnung, ', ', "
-			. "UPPER(" . $this->dbTable . ".typ), "
-			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/person/Benutzerfunktion_model.php

@@ -261,42 +261,6 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
-	/**
-	 * Get active Kompetenzfeldleitung bei UID.
-	 *
-	 * @param $uid
-	 * @return array|stdClass|null
-	 */
-	public function getKFLByUID($uid)
-	{
-		$query = '
-            SELECT
-			  	bf.uid,
-				bf.oe_kurzbz,
-  				oe.organisationseinheittyp_kurzbz
-            FROM
-			  	public.tbl_benutzerfunktion bf
-				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
-  				JOIN public.tbl_benutzer b USING (uid)
-            WHERE
-                b.uid = ?
-              	AND b.aktiv = TRUE
-                AND funktion_kurzbz = \'Leitung\'
-               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
-              	AND (datum_von IS NULL OR datum_von <= now())
-              	AND (datum_bis IS NULL OR datum_bis >= now())
-        ';
-
-		$parameters_array = array();
-		if (is_string($uid))
-		{
-			$parameters_array[] = $uid;
-		}
-
-		return $this->execQuery($query, $parameters_array);
-	}
-
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/system/Message_model.php

@@ -242,7 +242,6 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
 		$sql = <<<EOSQL
 			with filtered_messages as (
 				select
@@ -311,12 +310,11 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			{$limitoffset}
+			limit ?
+			offset ?;
 EOSQL;
 
-		$parametersArray = $limitoffset
-			? array($person_id, $person_id, $limit, $offset)
-			: array($person_id, $person_id);
+		$parametersArray = array($person_id, $person_id, $limit, $offset);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -327,7 +325,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
+			$count = ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -1,11 +0,0 @@
-<?php
-
-class VertragsbestandteilLohnguide_model extends DB_Model
-{
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
-		$this->pk = 'vertragsbestandteil_id';
-	}
-}

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

@@ -37,8 +37,7 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
-				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -64,8 +63,6 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

application/views/dashboard/dashboard_demo.php

@@ -8,15 +8,9 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'primevue3' => true,
-		'vuedatepicker11' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
+		'customJSModules' => ['public/js/apps/Dashboard.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css',
-			'public/css/components/primevue.css',
+			'public/css/components/dashboard.css'
 		],
 		'navigationcomponent' => true
 	)
@@ -31,7 +25,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<dashboard-admin></dashboard-admin>
+			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/dashboard/dashboard_demo_admin.php

@@ -8,12 +8,7 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'vuedatepicker11' => true,
-		'primevue3' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
+		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -28,9 +23,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
+				<h1 class="h2">Dashboard</h1>
 			</div>
-			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
+			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
 		</div>
 	</div>
 

cis/private/info/service_uebersicht.php

@@ -46,13 +46,12 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
-	include('../../../include/meta/jquery.php');
-	include('../../../include/meta/jquery-tablesorter.php');
-
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -72,7 +71,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\',\'filter\']
+					widgets: [\'zebra\']
 				});
 			}
 		);
@@ -152,9 +151,8 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
-		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$oeBez->bezeichnung,'</td>';
+		echo '<td>',$row->oe_kurzbz,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/testtool/menu.php

@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,8 +342,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
-			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
-
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,7 +1708,6 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
-	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1726,7 +1725,6 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
-	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/student/studentdetailoverlay.xul.php

@@ -802,10 +802,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
 								<splitter class="tree-splitter"/>
-								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
-									class="sortDirectionIndicator"
-									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
-								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -832,7 +828,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
-												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

content/student/studentoverlay.js.php

@@ -3550,19 +3550,9 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
-		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
-		case 'microcredential_4':
-		case 'microdegree_1':
-		case 'microdegree_2':
-		case 'microdegree_3':
-		case 'microdegree_4':
-		case 'microdegreeabschluss_1':
-		case 'microdegreeabschluss_2':
-		case 'microdegreeabschluss_3':
-		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/entwicklungsteam.class.php

@@ -364,10 +364,9 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
+			$qry = "SELECT *
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
-					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -395,7 +394,6 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
-				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}

include/lehreinheitmitarbeiter.class.php

@@ -552,41 +552,9 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
-		// get relevant Studiensemester
-		$studiensemester_kurzbz_arr = [];
-
-		$qry = '
-			SELECT
-				studiensemester_kurzbz
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				start BETWEEN
-				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-				'. $this->db_add_param($ende->format('Y-m-d'));
-
-		if ($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
-
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
-
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT
-					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -596,104 +564,38 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
+					 AND (
+					 	ss.start BETWEEN
+					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
-					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
-					AND lema.semesterstunden != 0
+				AND lema.semesterstunden != 0
 			)
 
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode
+				studiensemester_kurzbz
 			ORDER BY
 				studiengang_kz;
 		';
 
 		if ($this->db_query($qry))
 		{
-			$additionalLehrgaenge = [];
-
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
-				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
-				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
-
-				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
-				{
-					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
-
-					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
-					{
-						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
-						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
-						{
-							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
-							{
-								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
-								if (
-									$studiengang_kz == $row->studiengang_kz
-									|| isset(
-										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
-									)
-								) continue;
-
-								// Lehrgang erstellen
-								$lg = new StdClass();
-								$lg->mitarbeiter_uid = $uid;
-								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
-								$lg->lgartcode = $lehrgang->lgartcode;
-								$lg->studiengang_kz = $lehrgang->studiengang_kz;
-								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
-								$lg->summe = $row->summe;
-								$lg->sws = $row->sws;
-								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
-								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
-							}
-						}
-					}
-
-					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
-					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
-					{
-						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
-
-						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
-						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
-						$sws = $row->sws/(count($addLehrgaenge) + 1);
-
-						// neue sws zuweisen
-						$obj->summe = $summeSws;
-						$obj->sws = $sws;
-
-						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
-						{
-							// sws fuer jeden verknuepften Lehrgang zuweisen
-							$lehrgang->summe = $summeSws;
-							$lehrgang->sws = $sws;
-
-							// neue lehrgang sws hinzufuegen
-							$this->result [] = $lehrgang;
-						}
-					}
-				}
-
 				$this->result []= $obj;
 			}
 			return true;
@@ -753,63 +655,4 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
-	/**
-	 * Get "connected" Lehrgaenge for equal sws distribution.
-	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
-	 * @return object success or error
-	 */
-	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
-	{
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
-
-		$qry = "
-			WITH gruppen AS (
-				SELECT
-					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
-					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
-				FROM
-					lehre.tbl_lehreinheitmitarbeiter lema
-					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
-					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)
-					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
-				WHERE
-					bismelden
-					AND stg.melderelevant
-					AND stg.typ = 'l'
-					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
-			)
-			SELECT
-				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			FROM
-				gruppen gr
-			GROUP BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			ORDER BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
-
-		$lehrgaengeDistributions = [];
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				// group by properties
-				$lehrgaengeDistributions
-					[$row->mitarbeiter_uid]
-					[$row->studiensemester_kurzbz]
-					[$row->lehreinheit_id]
-					[$row->studiengang_kz]
-					= $row;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		return $lehrgaengeDistributions;
-	}
-
 }

include/lehrelisthelper.class.php

@@ -270,8 +270,6 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
-					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
-						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

include/prestudent.class.php

@@ -706,7 +706,6 @@ class prestudent extends person
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
 				$rolle->fgm = $row->fgm;
-				$rolle->faktiv = $this->db_parse_bool($row->faktiv);
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;

package.json

@@ -0,0 +1,27 @@
+{
+  "name": "fhc-core",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "build": "rollup -c",
+    "watch": "rollup --watch -c"
+  },
+  "dependencies": {
+  },
+  "devDependencies": {
+    "@rollup/plugin-alias": "^5.1.0",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-terser": "^0.4.4",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "glob": "^13.0.6",
+    "node-sass": "^9.0.0",
+    "rollup": "^4.52.4",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-vue": "^6.0.0"
+  }
+}

public/css/components/dashboard/news.css

@@ -193,6 +193,3 @@
 	word-break: break-word;
 }
 
-.news-list-item p {
-	word-break: break-word;
-}

public/dist/js/apps/Bismeldestichtag/API.js

@@ -0,0 +1,2 @@
+const e="error",t="retval",r={get:function(e,t,n=null){return r._axiosCall(e,t,"get",n)},post:function(e,t,n=null){return r._axiosCall(e,t,"post",n)},isSuccess:function(r){return!("object"!=typeof r||!r.hasOwnProperty(e)||!r.hasOwnProperty(t)||0!=r.error)},isError:function(e){return!r.isSuccess(e)},hasData:function(e){return!(!r.isSuccess(e)||!("object"==typeof e[t]&&Object.keys(e[t]).length>0||"array"==typeof e[t]&&e[t].length>0||"string"==typeof e[t]&&""!=e[t].trim()||"number"==typeof e[t]))},getData:function(e){return r.hasData(e)?e[t]:null},getError:function(e){return"object"==typeof e&&Object.keys(e).length>0&&e.hasOwnProperty(t)?e[t]:"Generic error"},getErrorCode:function(t){return"object"==typeof t&&t.hasOwnProperty(e)?t[e]:1},_generateRouterURI:function(e){var t=null;return"undefined"!=typeof FHC_JS_DATA_STORAGE_OBJECT&&(t=FHC_JS_DATA_STORAGE_OBJECT.app_root+FHC_JS_DATA_STORAGE_OBJECT.ci_router+"/"+e),t},_printDebug:function(e,t,r){},_axiosCall:function(e,t,n,i){let o={method:n,url:r._generateRouterURI(e),timeout:5e3};if("get"==n?o.params=t:o.data=t,"object"==typeof i)for(var s in i)o[s]=i[s];return axios(o)}},n=2e3,i={getStudiensemester:function(){return r.get("codex/Bismeldestichtag/getStudiensemester",null,{timeout:n})},getBismeldestichtage:function(){return r.get("codex/Bismeldestichtag/getBismeldestichtage",null,{timeout:n})},addBismeldestichtag:function(e){return r.post("codex/Bismeldestichtag/addBismeldestichtag",{meldestichtag:e.meldestichtag,studiensemester_kurzbz:e.studiensemester_kurzbz},{timeout:n})},deleteBismeldestichtag:function(e){return r.post("codex/Bismeldestichtag/deleteBismeldestichtag",{meldestichtag_id:e.meldestichtag_id},{timeout:n})}};export{i as BismeldestichtagAPIs};
+//# sourceMappingURL=API.js.map

public/dist/js/apps/Bismeldestichtag/BismeldestichtagHelper.js

@@ -0,0 +1,2 @@
+const t={formatDate:function(t){return t.replace(/(.*)-(.*)-(.*)/,"$3.$2.$1")}};export{t as BismeldestichtagHelper};
+//# sourceMappingURL=BismeldestichtagHelper.js.map

public/dist/js/apps/Bismeldestichtag/BismeldestichtagHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BismeldestichtagHelper.js","sources":["../../../../js/apps/Bismeldestichtag/BismeldestichtagHelper.js"],"sourcesContent":["/**\n * Copyright (C) 2022 fhcomplete.org\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program.  If not, see <https://www.gnu.org/licenses/>.\n */\n\nexport const BismeldestichtagHelper = {\n\tformatDate: function(date) {\n\t\treturn date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');\n\t}\n}\n"],"names":["BismeldestichtagHelper","formatDate","date","replace"],"mappings":"AAiBO,MAAMA,EAAyB,CACrCC,WAAY,SAASC,GACpB,OAAOA,EAAKC,QAAQ,iBAAkB,WACvC"}

public/dist/js/apps/LogsViewer/TabulatorSetup.js

@@ -0,0 +1,2 @@
+const e={height:700,layout:"fitColumns",columns:[{title:"Log ID",field:"LogId",headerFilter:!0},{title:"Request ID",field:"RequestId",headerFilter:!0},{title:"Execution time",field:"ExecutionTime",headerFilter:!0},{title:"Executed by",field:"ExecutedBy",headerFilter:!0},{title:"Description",field:"Description",headerFilter:!0},{title:"Data",field:"Data",headerFilter:!0},{title:"Web service type",field:"WebserviceType",headerFilter:!0}],rowFormatter:function(e){let t=e.getData();if(null!=t&&t.hasOwnProperty("RequestId")&&null!=t.RequestId){let l=t.RequestId;l.includes("error")?e.getElement().style.color="red":l.includes("warning")&&(e.getElement().style.color="orange")}}},t=[{event:"rowClick",handler:function(e,t){alert(t.getData().Data)}}];export{t as LogsViewerTabulatorEventHandlers,e as LogsViewerTabulatorOptions};
+//# sourceMappingURL=TabulatorSetup.js.map

public/dist/js/apps/LogsViewer/TabulatorSetup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TabulatorSetup.js","sources":["../../../../js/apps/LogsViewer/TabulatorSetup.js"],"sourcesContent":["/**\n * Copyright (C) 2022 fhcomplete.org\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program.  If not, see <https://www.gnu.org/licenses/>.\n */\n\n/**\n *\n */\nexport const LogsViewerTabulatorOptions = {\n\theight: 700,\n\tlayout: 'fitColumns',\n\tcolumns: [\n\t\t{title: 'Log ID', field: 'LogId', headerFilter: true},\n\t\t{title: 'Request ID', field: 'RequestId', headerFilter: true},\n\t\t{title: 'Execution time', field: 'ExecutionTime', headerFilter: true},\n\t\t{title: 'Executed by', field: 'ExecutedBy', headerFilter: true},\n\t\t{title: 'Description', field: 'Description', headerFilter: true},\n\t\t{title: 'Data', field: 'Data', headerFilter: true},\n\t\t{title: 'Web service type', field: 'WebserviceType', headerFilter: true}\n\t],\n\trowFormatter: function(row) {\n\n\t\tlet data = row.getData(); // get data for this row\n\n\t\t// If data is not null and provides the property RequestId and it is not null\n\t\tif (data != null && data.hasOwnProperty('RequestId') && data.RequestId != null)\n\t\t{\n\t\t\tlet requestId = data.RequestId;\n\n\t\t\tif (requestId.includes(\"error\"))\n\t\t\t{\n\t\t\t\trow.getElement().style.color = \"red\";\n\t\t\t}\n\t\t\telse if (requestId.includes(\"warning\"))\n\t\t\t{\n\t\t\t\trow.getElement().style.color = \"orange\";\n\t\t\t\n\t\t\t}\n\t\t}\n\t}\n};\n\n/**\n *\n */\nexport const LogsViewerTabulatorEventHandlers = [\n\t{\n\t\tevent: \"rowClick\",\n\t\thandler: function(e, row) {\n\t\t\talert(row.getData().Data);\n\t\t}\n\t}\n];\n\n"],"names":["LogsViewerTabulatorOptions","height","layout","columns","title","field","headerFilter","rowFormatter","row","data","getData","hasOwnProperty","RequestId","requestId","includes","getElement","style","color","LogsViewerTabulatorEventHandlers","event","handler","e","alert","Data"],"mappings":"AAoBO,MAAMA,EAA6B,CACzCC,OAAQ,IACRC,OAAQ,aACRC,QAAS,CACR,CAACC,MAAO,SAAUC,MAAO,QAASC,cAAc,GAChD,CAACF,MAAO,aAAcC,MAAO,YAAaC,cAAc,GACxD,CAACF,MAAO,iBAAkBC,MAAO,gBAAiBC,cAAc,GAChE,CAACF,MAAO,cAAeC,MAAO,aAAcC,cAAc,GAC1D,CAACF,MAAO,cAAeC,MAAO,cAAeC,cAAc,GAC3D,CAACF,MAAO,OAAQC,MAAO,OAAQC,cAAc,GAC7C,CAACF,MAAO,mBAAoBC,MAAO,iBAAkBC,cAAc,IAEpEC,aAAc,SAASC,GAEtB,IAAIC,EAAOD,EAAIE,UAGf,GAAY,MAARD,GAAgBA,EAAKE,eAAe,cAAkC,MAAlBF,EAAKG,UAC7D,CACC,IAAIC,EAAYJ,EAAKG,UAEjBC,EAAUC,SAAS,SAEtBN,EAAIO,aAAaC,MAAMC,MAAQ,MAEvBJ,EAAUC,SAAS,aAE3BN,EAAIO,aAAaC,MAAMC,MAAQ,SAGjC,CACD,GAMYC,EAAmC,CAC/C,CACCC,MAAO,WACPC,QAAS,SAASC,EAAGb,GACpBc,MAAMd,EAAIE,UAAUa,KACrB"}