merged master into

application/config/Events.php

@@ -33,5 +33,25 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["coodle"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Coodle/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Coodle/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Coodle/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["freeBusy"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/FreeBusy/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/FreeBusy/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/FreeBusy/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
 
 

application/config/cms.php

@@ -1,21 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// Preferred organisational unit for a new content.
-// If the user is entitled for this unit, it wins.
-// If not, the first entitled unit wins.
-$config['default_oe_kurzbz'] = 'etw';
-
-// Lifetime of an edit lock in hours, counted from tbl_contentlog.start. Must be > 0.
-$config['lock_ttl_hours'] = 24;
-
-// Switches the click statistics off completely. With false the admin tab stays hidden and
-// the endpoint refuses every request, whatever the rights of the caller are.
-$config['clickstats_enabled'] = true;
-
-// Default period of the click statistics in months, when the caller sends none.
-$config['clickstats_months'] = 12;
-
-// Length of the ranking in the click statistics tab.
-$config['clickstats_limit'] = 100;

application/config/infocenter.php

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

application/config/routes.php

@@ -68,6 +68,12 @@ $route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
 //Route for LV Plan Stg/Semester/Verband/Gruppe
 $route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
 
+$route['Cis/CoodleExternal/(:any)/(:any)'] = 'Cis/CoodleExternal/index/$1/$2';
+
+$route['CoodleFreeBusy/(:any)'] = 'api/frontend/v1/coodle/FreeBusy/getCoodleFreeBusy/$1';
+$route['CoodleIcal/encrypted/(:any)'] = 'api/frontend/v1/coodle/CoodleSurvey/getCoodleIcalEncrypted/$1';
+$route['CoodleIcal/(:any)'] = 'api/frontend/v1/coodle/CoodleSurvey/getCoodleIcal/$1';
+
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
 $route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
@@ -75,10 +81,6 @@ $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
 $route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
 $route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
 
-// CMS Admin App Routes
-$route['cms'] = 'cms/index';
-$route['cms/.*'] = 'cms/index';
-
 // Studierendenverwaltung App Routes
 $route['studvw'] = 'studentenverwaltung/index';
 $route['studvw/.*'] = 'studentenverwaltung/index';

application/config/search.php

@@ -872,3 +872,19 @@ $config['dms'] = [
 				)
 			)"
 ];
+
+$config['group'] = [
+	'primarykey' => 'gruppe_kurzbz',
+	'table' => 'public.tbl_gruppe',
+	'searchfields' => [
+		'gruppe_kurzbz' => [
+			'comparison' => 'similar',
+			'field' => 'gruppe_kurzbz',
+		],
+	],
+	'resultfields' => [
+		"g.gruppe_kurzbz as name",
+	],
+	'resultjoin' => "
+		JOIN public.tbl_gruppe g USING (gruppe_kurzbz)"
+];

application/config/search_coodle_participants.php

@@ -0,0 +1,55 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+
+$config['employee'] = $CI->config->item('employee', 'search');
+unset($config['student']['searchfields']['email']);
+unset($config['student']['searchfields']['tel']);
+$config['employee']['resultfields'] = [
+	"m.mitarbeiter_uid AS uid",
+	"(p.vorname || ' ' || p.nachname) AS name",
+];
+$config['employee']['resultjoin'] = "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)";
+
+$config['student'] = $CI->config->item('student', 'search');
+unset($config['student']['searchfields']['email']);
+unset($config['student']['searchfields']['tel']);
+$config['student']['resultfields'] = [
+	"s.student_uid AS uid",
+	"(p.vorname || ' ' || p.nachname) AS name",
+];
+$config['student']['resultjoin'] = "
+		JOIN public.tbl_student s USING (student_uid)
+		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)";
+
+$config['group'] = $CI->config->item('group', 'search');
+$config['group']['resultfields'] = [
+		"g.gruppe_kurzbz as name",
+		"ARRAY( 
+			SELECT bg.uid as uid
+			FROM public.tbl_benutzergruppe bg
+			WHERE bg.gruppe_kurzbz = g.gruppe_kurzbz
+			ORDER BY bg.uid
+			) AS user_uids",
+		"ARRAY( 
+			SELECT p.vorname || ' ' || p.nachname AS name
+			FROM public.tbl_benutzergruppe bg
+			JOIN public.tbl_benutzer b ON(b.uid = bg.uid)
+			JOIN public.tbl_person p ON(p.person_id = b.person_id)
+			WHERE bg.gruppe_kurzbz = g.gruppe_kurzbz
+			ORDER BY bg.uid
+			) AS user_names",
+];

application/controllers/Cis/Compat.php

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

application/controllers/Cis/Coodle.php

@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Coodle extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => [self::PERM_LOGGED],
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php', ["viewData" => [], 'route' => 'Coodle']);
+	}
+}

application/controllers/Cis/CoodleExternal.php

@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class CoodleExternal extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => [self::PERM_ANONYMOUS],
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'CoodleExternal', 'isExternal' => true]);
+	}
+}

application/controllers/CisVue/Cms.php

@@ -44,22 +44,19 @@ class Cms extends Auth_Controller
 	 *
 	 * @return void
 	 */
-	public function content($content_id = null, $version = null, $sprache = null, $sichtbar = true)
+	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		if (!is_numeric($content_id))
-			show_404();
+		// return early if the content_id for the content is missing
+		if (!isset($content_id))
+			$this->terminateWithError("content_id is missing");
 
 		$content = $this->ContentModel->load($content_id);
 		if (isError($content))
-		{
-			show_error('The content could not be loaded');
-		}
+			$this->terminateWithError(getError($content));
 
 		$content = getData($content);
-
-		if (NULL === $content) {
-			show_404();
-		}
+		if (NULL === $content)
+			$this->terminateWithError("Content not found");
 
 		$content = current($content);
 

application/controllers/Cms.php

@@ -1,23 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Cms extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(['index' => 'basis/cms:r']);
-		$this->load->library('PermissionLib');
-		$this->config->load('cms');
-		$this->loadPhrases(['global', 'ui', 'cms']);
-	}
-
-	public function index()
-	{
-		// decide whether the click statistics tab is shown at all.
-		$this->load->view('Cms.php', [
-			'clickstats' => $this->config->item('clickstats_enabled')
-				&& $this->permissionlib->isBerechtigt('admin')
-		]);
-	}
-}

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

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 class AuthInfo extends FHCAPI_Controller
 {
@@ -37,6 +38,7 @@ class AuthInfo extends FHCAPI_Controller
 
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
@@ -54,15 +56,16 @@ class AuthInfo extends FHCAPI_Controller
 	 */
 	public function getAuthUID()
 	{
-		$this->terminateWithSuccess(['uid'=>$this->uid]);
+		$this->terminateWithSuccess(['uid' => $this->uid]);
 	}
-	
+
 	public function getAuthInfo()
 	{
 		$data = (object) array(
-				'uid' => $this->uid,
-				'isMitarbeiter' => $this->isMitarbeiter,
-				'isStudent' => $this->isStudent
+			'uid' => $this->uid,
+			'isMitarbeiter' => $this->isMitarbeiter,
+			'isStudent' => $this->isStudent,
+			'name' => getData($this->PersonModel->getFullName($this->uid)),
 		);
 		$this->terminateWithSuccess($data);
 	}

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

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

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

@@ -25,10 +25,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Cms extends FHCAPI_Controller
 {
-	// Upper bound for the tiefe of oe-personen and dms-liste. A hierarchy this deep does
-	// not occur, and the cap keeps one marker from walking a whole tree.
-	const MAX_TIEFE = 10;
-
 	
 	/**
 	 * Object initialization
@@ -43,11 +39,6 @@ class Cms extends FHCAPI_Controller
 			'news' => self::PERM_LOGGED,
 			'getNewsRowCount' => self::PERM_LOGGED,
 			'getNews' => self::PERM_LOGGED,
-			'getOePersonen' => self::PERM_LOGGED,
-			'getDmsKategorie' => self::PERM_LOGGED,
-			'getContentChilds' => self::PERM_LOGGED,
-			'getPerson' => self::PERM_LOGGED,
-			'getDmsDokumente' => self::PERM_LOGGED,
 
 		]);
 
@@ -64,7 +55,11 @@ class Cms extends FHCAPI_Controller
 		]);
 
 	}
-	
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
@@ -85,10 +80,7 @@ class Cms extends FHCAPI_Controller
         $sprache = $this->input->get("sprache",TRUE);
         $sichtbar = $this->input->get("sichtbar",TRUE);
 
-		// cms admin preview renders a content without counting a view
-		$preview = $this->input->get("preview",TRUE);
-
-		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar, !$preview);
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
 		$content = $this->getDataOrTerminateWithError($content);
 
 		$this->terminateWithSuccess($content);
@@ -211,331 +203,5 @@ class Cms extends FHCAPI_Controller
 	}
 
 	
-
-	/**
-	 * Lists the people assigned to an organisation unit.
-	 * Used by the CMS content component "oe-personen".
-	 */
-	public function getOePersonen()
-	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-
-		$oe_kurzbz = $this->input->get('oe_kurzbz', TRUE);
-		$mitFoto = $this->input->get('foto', TRUE) ? true : false;
-
-		// tiefe 0 asks about the one unit. Deeper takes the sub units with it.
-		$oeResult = $this->OrganisationseinheitModel->getMitUntereinheiten(
-			$oe_kurzbz, $this->_tiefe()
-		);
-		$oeRows = $this->getDataOrTerminateWithError($oeResult) ?: array();
-
-		$uids = array();
-		$funktionen = array();
-
-		foreach ($oeRows as $oe)
-		{
-			// 'oezuordnung' is the function that assigns an employee to an organisation
-			// unit. The model already filters datum_von and datum_bis.
-			$rows = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed(
-				'oezuordnung', $oe->oe_kurzbz
-			);
-			$rows = $this->getDataOrTerminateWithError($rows) ?: array();
-
-			foreach ($rows as $row)
-			{
-				// The model returns the aktiv flag but does not filter on it.
-				if (!$row->aktiv)
-					continue;
-
-				// One person can hold the assignment in several units of the walk. The
-				// first one wins, so the list keeps one block per person.
-				if (isset($funktionen[$row->uid]))
-					continue;
-
-				$uids[] = $row->uid;
-				// tbl_benutzerfunktion.bezeichnung is the free label of one assignment,
-				// for example "Bibliothekarin". tbl_funktion.beschreibung is the generic
-				// name.
-				$funktionen[$row->uid] = $row->bezeichnung ?: $row->beschreibung;
-			}
-		}
-
-		$this->terminateWithSuccess($this->_cmsPersonen($uids, $funktionen, $mitFoto));
-	}
-
-	/**
-	 * Contact data of one person.
-	 * Used by the CMS content component "person-block".
-	 */
-	public function getPerson()
-	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('uid', 'UID', 'required');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$uid = $this->input->get('uid', TRUE);
-		$mitFoto = $this->input->get('foto', TRUE) ? true : false;
-
-		// The function label comes from the marker, not from the database. The component
-		// passes it through as a property.
-		$personen = $this->_cmsPersonen(array($uid), array(), $mitFoto);
-
-		$this->terminateWithSuccess($personen ? current($personen) : null);
-	}
-
-	/**
-	 * Lists the published documents of one DMS category.
-	 * Used by the CMS content component "dms-liste".
-	 */
-	public function getDmsKategorie()
-	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('kategorie_kurzbz', 'DMS-Kategorie', 'required');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$kategorie_kurzbz = $this->input->get('kategorie_kurzbz', TRUE);
-
-		$erlaubt = $this->_dmsKategorieErlaubt($kategorie_kurzbz);
-
-		if ($erlaubt === null)
-			$this->terminateWithError('DMS category not found', self::ERROR_TYPE_404);
-
-		// a missing entitlement answers with success and an empty list, not with
-		// an error. The component sits inside a public content page. An error would raise a
-		// toast for every reader who is simply not in the group.
-		$dokumente = array();
-		if ($erlaubt)
-		{
-			// tiefe 0 asks about the one category. Deeper takes the sub categories with it.
-			$katResult = $this->DmsModel->getMitUnterkategorien(
-				$kategorie_kurzbz, $this->_tiefe()
-			);
-			$kategorien = $this->getDataOrTerminateWithError($katResult) ?: array();
-
-			foreach ($kategorien as $kat)
-			{
-				// Every category carries its own group rule, so a sub category can be
-				// closed while the parent is open. Ask for each one instead of letting the
-				// entitlement of the root stand for the whole walk. The root is already
-				// answered above.
-				if ($kat->kategorie_kurzbz !== $kategorie_kurzbz
-					&& $this->_dmsKategorieErlaubt($kat->kategorie_kurzbz) !== true)
-					continue;
-
-				$rows = $this->DmsModel->getKategorieDokumente($kat->kategorie_kurzbz);
-				$rows = $this->getDataOrTerminateWithError($rows) ?: array();
-
-				foreach ($rows as $row)
-					$dokumente[] = $row;
-			}
-		}
-
-		$this->terminateWithSuccess(array(
-			'zugriff' => $erlaubt,
-			'dokumente' => $dokumente
-		));
-	}
-
-	/**
-	 * Lists named documents, in the order the caller asked for them.
-	 * Used by the CMS content component "dms-dokumente".
-	 */
-	public function getDmsDokumente()
-	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('dms_ids', 'DMS-IDs', 'required');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('content/Dms_model', 'DmsModel');
-
-		$ids = array();
-		foreach (explode(',', $this->input->get('dms_ids', TRUE)) as $teil)
-		{
-			$teil = trim($teil);
-			if (is_numeric($teil))
-				$ids[] = (int) $teil;
-		}
-
-		// An unbounded list would let one marker fetch the whole DMS.
-		$ids = array_slice(array_unique($ids), 0, 50);
-
-		$dokumente = $this->DmsModel->getDokumenteByIds($ids);
-		$dokumente = $this->getDataOrTerminateWithError($dokumente) ?: array();
-
-		// A hand picked list holds few categories, so deciding per category is cheap and
-		// reuses the rule of getDmsKategorie().
-		$erlaubte = array();
-		$nachId = array();
-		foreach ($dokumente as $dokument)
-		{
-			if (!array_key_exists($dokument->kategorie_kurzbz, $erlaubte))
-				$erlaubte[$dokument->kategorie_kurzbz] = $this->_dmsKategorieErlaubt($dokument->kategorie_kurzbz);
-
-			if ($erlaubte[$dokument->kategorie_kurzbz] === true)
-				$nachId[$dokument->dms_id] = $dokument;
-		}
-
-		// The editor chose the order. Keep it.
-		$sortiert = array();
-		foreach ($ids as $id)
-		{
-			if (isset($nachId[$id]))
-				$sortiert[] = $nachId[$id];
-		}
-
-		$this->terminateWithSuccess($sortiert);
-	}
-
-	/**
-	 * Lists the child pages of a content, as a reader may see them.
-	 * Used by the CMS content component "contentchild-menu".
-	 */
-	public function getContentChilds()
-	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural_no_zero');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('content/Contentchild_model', 'ContentchildModel');
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-		if (!$sprache)
-			$sprache = getUserLanguage();
-
-		$childs = $this->ContentchildModel->getChildsForReader($content_id, $sprache, getAuthUID());
-
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($childs) ?: array());
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Builds the shape both person content components render.
-	 *
-	 * The assembly follows Cis/Cms/News/Xml/Address/Detailed.php, so a person reads the
-	 * same in the news extras and on a content page.
-	 *
-	 * @param array $uids in the order the result should keep
-	 * @param array $funktionen uid => function label, may be empty
-	 * @param boolean $mitFoto
-	 * @return array
-	 */
-	private function _cmsPersonen($uids, $funktionen, $mitFoto)
-	{
-		if (empty($uids))
-			return array();
-
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$kontakt = $this->PersonModel->getCmsKontakt($uids, $mitFoto);
-		$kontakt = $this->getDataOrTerminateWithError($kontakt) ?: array();
-
-		$nachUid = array();
-		foreach ($kontakt as $row)
-			$nachUid[$row->uid] = $row;
-
-		$personen = array();
-
-		// Loops over $uids, not over the result, so the caller keeps its order.
-		foreach ($uids as $uid)
-		{
-			if (!isset($nachUid[$uid]))
-				continue;
-
-			$row = $nachUid[$uid];
-
-			$name = trim(implode(' ', array_filter(array(
-				$row->titelpre, $row->vorname, $row->nachname, $row->titelpost
-			))));
-
-			$telefon = '';
-			if ($row->telefonklappe)
-				$telefon = trim(($row->kontakt ?: '') . ' - ' . $row->telefonklappe);
-
-			$email = '';
-			if (defined('DOMAIN'))
-				$email = ($row->alias ?: $row->uid) . '@' . DOMAIN;
-
-			$personen[] = array(
-				'uid' => $row->uid,
-				'name' => $name,
-				'funktion' => isset($funktionen[$uid]) ? $funktionen[$uid] : '',
-				'telefon' => $telefon,
-				'email' => $email,
-				'ort' => $row->planbezeichnung,
-				'foto' => $row->foto
-			);
-		}
-
-		return $personen;
-	}
-
-	/**
-	 * Decides whether the current user may see a DMS category.
-	 *
-	 * Same rule as cms/dms.php: an unlocked category is open to everyone. A locked one
-	 * needs a granted group, or the category permission together with basis/dms.
-	 *
-	 * @param string $kategorie_kurzbz
-	 * @return boolean|null null when the category does not exist
-	 */
-	/**
-	 * Reads the tiefe parameter of a content component. 0 keeps the component to the unit
-	 * or category it names, which is what a marker without the attribute means.
-	 * Capped, because the depth drives a recursive walk and one query per level found.
-	 *
-	 * @return int
-	 */
-	private function _tiefe()
-	{
-		$tiefe = (int) $this->input->get('tiefe', TRUE);
-
-		if ($tiefe < 0)
-			return 0;
-
-		return min($tiefe, self::MAX_TIEFE);
-	}
-
-	private function _dmsKategorieErlaubt($kategorie_kurzbz)
-	{
-		$this->load->library('PermissionLib');
-		$this->load->model('content/Dms_model', 'DmsModel');
-
-		$zugriff = $this->DmsModel->getKategorieZugriff($kategorie_kurzbz, getAuthUID());
-		$zugriff = $this->getDataOrTerminateWithError($zugriff);
-
-		if (empty($zugriff))
-			return null;
-
-		$kategorie = current($zugriff);
-
-		if (!$kategorie->gesperrt || $kategorie->in_gruppe)
-			return true;
-
-		$erlaubt = $this->permissionlib->isBerechtigt('basis/dms');
-
-		if ($erlaubt && $kategorie->berechtigung_kurzbz != '')
-			$erlaubt = $this->permissionlib->isBerechtigt($kategorie->berechtigung_kurzbz);
-
-		return $erlaubt;
-	}
-
 }
 

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

@@ -1,760 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class CmsAdmin extends FHCAPI_Controller
-{
-	const MAX_TREE_DEPTH = 50;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTree'                   => ['basis/cms:r'],
-			'getSubtree'                => ['basis/cms:r'],
-			'getContent'                => ['basis/cms:r'],
-			'getContentsprache'         => ['basis/cms:r'],
-			'getTemplates'              => ['basis/cms:r'],
-			'getOrganisationseinheiten' => ['basis/cms:r'],
-			'getSprachen'               => ['basis/cms:r'],
-			'getDmsKategorien'          => ['basis/cms:r'],
-			'getMitarbeiter'            => ['basis/cms:r'],
-			'getDmsKategorieDokumente'  => ['basis/cms:r'],
-			'getUsage'                  => ['basis/cms:r'],
-			'getTreeMeta'               => ['basis/cms:r'],
-			'getAncestors'              => ['basis/cms:r'],
-			'getClickCount'             => ['basis/cms:r'],
-			'getClickRanking'           => ['basis/cms:r'],
-			'postContent'               => ['basis/cms:rw'],
-			'postTranslation'           => ['basis/cms:rw'],
-			'postVersion'               => ['basis/cms:rw'],
-			'putProperties'             => ['basis/cms:rw'],
-			'deleteContent'             => ['basis/cms:rw'],
-			'deleteContentsprache'      => ['basis/cms:rw']
-		]);
-
-		$this->load->library('CmsAdminLib');
-		$this->load->library('PermissionLib');
-		$this->load->model('content/Content_model', 'ContentModel');
-		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
-		$this->load->model('content/Contentchild_model', 'ContentchildModel');
-		$this->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
-		$this->load->model('content/Template_model', 'TemplateModel');
-
-		$this->loadPhrases(['global', 'cms']);
-	}
-
-	public function getTree()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('menu', 'Menu', 'required|in_list[content,news]');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$menu = $this->input->get('menu', TRUE);
-		$filter = $this->input->get('filter', TRUE);
-
-		$entitledResult = $this->cmsadminlib->getEntitledOe();
-		$entitledOe = isError($entitledResult) ? [] : getData($entitledResult) ?? [];
-
-		$nodes = [];
-
-		if ($menu === 'news')
-		{
-			$newsResult = $this->ContentModel->getNewsContent();
-			if (!isError($newsResult) && getData($newsResult))
-			{
-				foreach (getData($newsResult) as $row)
-				{
-					$titel = '';
-					$csResult = $this->ContentspracheModel->getOne(
-						(int) $row->content_id, DEFAULT_LANGUAGE
-					);
-					if (!isError($csResult))
-						$titel = getData($csResult)->titel;
-
-					$node = new stdClass();
-					$node->content_id = (int) $row->content_id;
-					$node->titel = mb_substr($titel, 0, 15) . ' '
-						. date('d.m.Y', strtotime($row->insertamum));
-					$node->template_kurzbz = $row->template_kurzbz;
-					$node->oe_kurzbz = $row->oe_kurzbz;
-					$node->aktiv = ($row->aktiv === 't' || $row->aktiv === true);
-					$node->entitled = false;
-					$node->groups = [];
-					$node->children = [];
-					$nodes[] = $node;
-				}
-			}
-		}
-		else
-		{
-			if (!empty($filter))
-			{
-				$clean = str_replace(['!', '.', '?', ','], '', $filter);
-				$searchItems = preg_split('/\s+/', $clean, -1, PREG_SPLIT_NO_EMPTY);
-				$rootsResult = $this->ContentModel->searchCms($searchItems);
-			}
-			else
-			{
-				$rootsResult = $this->ContentModel->getRootContent();
-			}
-
-			if (!isError($rootsResult) && getData($rootsResult))
-			{
-				$visited = [];
-				foreach (getData($rootsResult) as $row)
-				{
-					$node = $this->buildTreeNode(
-						(int) $row->content_id, 0, $visited
-					);
-					if ($node !== null)
-						$nodes[] = $node;
-				}
-			}
-		}
-
-		$allIds = [];
-		$this->collectContentIds($nodes, $allIds);
-
-		$groupMap = [];
-		if (!empty($allIds))
-		{
-			$gResult = $this->ContentgruppeModel->getGruppenForContents($allIds);
-			if (!isError($gResult))
-				$groupMap = getData($gResult);
-		}
-
-		$this->applyMeta($nodes, $entitledOe, $groupMap);
-
-		$result = [];
-		foreach ($nodes as $node)
-		{
-			$pruned = $this->pruneUnentitled($node);
-			if ($pruned !== null)
-				$result[] = $pruned;
-		}
-
-		$this->terminateWithSuccess($result);
-	}
-
-	// One subtree in the shape of a getTree root node. Lets the client replace a branch
-	// instead of rebuilding the whole tree after a change.
-	// The visited map starts empty here, so a node with several parents can show up twice
-	// until the next full reload. Rebuilding the whole tree on every change costs more.
-	public function getSubtree()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = (int) $this->input->get('content_id', TRUE);
-
-		$entitledResult = $this->cmsadminlib->getEntitledOe();
-		$entitledOe = isError($entitledResult) ? [] : getData($entitledResult);
-
-		$visited = [];
-		$node = $this->buildTreeNode($content_id, 0, $visited);
-
-		// Deleted meanwhile. The client drops the branch.
-		if ($node === null)
-			$this->terminateWithSuccess(null);
-
-		$nodes = [$node];
-
-		$allIds = [];
-		$this->collectContentIds($nodes, $allIds);
-
-		$groupMap = [];
-		if (!empty($allIds))
-		{
-			$gResult = $this->ContentgruppeModel->getGruppenForContents($allIds);
-			if (!isError($gResult))
-				$groupMap = getData($gResult);
-		}
-
-		$this->applyMeta($nodes, $entitledOe, $groupMap);
-
-		$this->terminateWithSuccess($this->pruneUnentitled($node));
-	}
-
-	public function getContent()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-
-		$entitledResult = $this->cmsadminlib->isEntitledForContent($content_id);
-		$entitled = $this->getDataOrTerminateWithError($entitledResult);
-
-		if (!$entitled)
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigungFuerDiesenEintrag'));
-
-		$this->ContentModel->resetQuery();
-		$contentResult = $this->ContentModel->load($content_id);
-		$contentData = $this->getDataOrTerminateWithError($contentResult);
-		if (empty($contentData))
-			$this->terminateWithError($this->p->t('cms', 'contentNichtGefunden'));
-		$content = $contentData[0];
-
-		$langResult = $this->ContentspracheModel->getLanguages($content_id);
-		$languages = $this->getDataOrTerminateWithError($langResult);
-
-		$versions = new stdClass();
-		foreach ($languages as $sprache)
-		{
-			$vResult = $this->ContentspracheModel->getVersions($content_id, $sprache);
-			if (!isError($vResult) && getData($vResult))
-			{
-				$versions->$sprache = array_map(function ($v) {
-					return (int) $v->version;
-				}, getData($vResult));
-			}
-		}
-
-		$result = new stdClass();
-		$result->content_id = (int) $content->content_id;
-		$result->template_kurzbz = $content->template_kurzbz;
-		$result->oe_kurzbz = $content->oe_kurzbz;
-		$result->aktiv = ($content->aktiv === 't' || $content->aktiv === true);
-		$result->menu_open = ($content->menu_open === 't' || $content->menu_open === true);
-		$result->beschreibung = $content->beschreibung ?: '';
-		$result->entitled = true;
-		$result->languages = $languages;
-		$result->versions = $versions;
-
-		// Tells the CIS4 preview whether this template renders there at all.
-		$cis4Result = $this->TemplateModel->hasCis4Stylesheet($content->template_kurzbz);
-		$result->has_cis4_stylesheet = !isError($cis4Result) && getData($cis4Result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getContentsprache()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-		$version = $this->input->get('version', TRUE);
-
-		$result = $this->ContentspracheModel->getOne($content_id, $sprache, $version);
-		if (isError($result))
-			$this->terminateWithError($this->p->t('cms', 'versionNichtGefunden'));
-
-		$data = getData($result);
-		$data->sichtbar = ($data->sichtbar === 't' || $data->sichtbar === true);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	// The tree lists a search hit out of its place, so a generic title carries no context.
-	// This answers where each one sits. One walk for the whole list, not one per node.
-	const MAX_ANCESTOR_TIEFE = 12;
-
-	/**
-	 * Ancestors of the given contents, keyed by content_id and ordered from the top down.
-	 */
-	public function getAncestors()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_ids', 'Content IDs', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$ids = [];
-		foreach (explode(',', $this->input->get('content_ids', TRUE)) as $teil)
-		{
-			$teil = trim($teil);
-			if (is_numeric($teil))
-				$ids[] = (int) $teil;
-		}
-		$ids = array_values(array_unique($ids));
-
-		if (empty($ids))
-			$this->terminateWithSuccess(new stdClass());
-
-		$result = $this->ContentchildModel->getAncestors(
-			$ids, self::MAX_ANCESTOR_TIEFE, DEFAULT_LANGUAGE
-		);
-		$rows = $this->getDataOrTerminateWithError($result);
-
-		// Same rule as the tree: an entry of an organisational unit the editor is not
-		// entitled for stays readable but cannot be opened.
-		$entitledResult = $this->cmsadminlib->getEntitledOe();
-		$entitledOe = isError($entitledResult) ? [] : getData($entitledResult) ?? [];
-
-		// The query orders by the distance, farthest first, so appending keeps the path
-		// reading from the top down.
-		$pfade = [];
-		foreach ((array) $rows as $row)
-		{
-			$start = (int) $row->start_id;
-
-			if (!isset($pfade[$start]))
-				$pfade[$start] = [];
-
-			$pfade[$start][] = [
-				'content_id' => (int) $row->content_id,
-				'titel' => $row->titel,
-				'tiefe' => (int) $row->tiefe,
-				'entitled' => in_array($row->oe_kurzbz, $entitledOe)
-			];
-		}
-
-		$this->terminateWithSuccess($pfade ?: new stdClass());
-	}
-
-	/**
-	 * Per content metadata for the tree filter, keyed by content_id.
-	 * One query for the whole tree, so the client filters and sorts without a round trip.
-	 */
-	public function getTreeMeta()
-	{
-		$result = $this->ContentModel->getTreeMeta(getAuthUID(), DEFAULT_LANGUAGE);
-		$rows = $this->getDataOrTerminateWithError($result);
-
-		$meta = [];
-		foreach ((array) $rows as $row)
-		{
-			$meta[(int) $row->content_id] = [
-				'childcount' => (int) $row->childcount,
-				'insertamum' => $row->insertamum,
-				'updateamum' => $row->updateamum,
-				'mine' => ($row->mine === 't' || $row->mine === true),
-				'contentlength' => (int) $row->contentlength
-			];
-		}
-
-		$this->terminateWithSuccess($meta);
-	}
-
-	/**
-	 * Two gates guard every click statistics request: the config flag switches the feature
-	 * off for everybody, the admin right decides who may read the numbers.
-	 */
-	private function checkClickstatsAccess()
-	{
-		$this->config->load('cms');
-
-		if (!$this->config->item('clickstats_enabled'))
-			$this->terminateWithError($this->p->t('cms', 'klickstatistikDeaktiviert'));
-
-		if (!$this->permissionlib->isBerechtigt('admin'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-	}
-
-	/**
-	 * Period of a click statistics request. 0 counts the whole log.
-	 * Call it after checkClickstatsAccess, which loads the config.
-	 * @return array months and the start date, null for the whole log
-	 */
-	private function clickstatsPeriod()
-	{
-		$months = $this->input->get('months');
-		if ($months === null || $months === '')
-			$months = $this->config->item('clickstats_months');
-		$months = (int) $months;
-
-		$since = ($months > 0)
-			? date('Y-m-d H:i:s', strtotime('-' . $months . ' months'))
-			: null;
-
-		return [$months, $since];
-	}
-
-	/**
-	 * Views of one content. One counting query, so the tab loads it right away.
-	 * Empty if LOG_CONTENT is off.
-	 */
-	public function getClickCount()
-	{
-		$this->checkClickstatsAccess();
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('months', 'Monate', 'is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
-
-		list($months, $since) = $this->clickstatsPeriod();
-
-		$result = $this->WebservicelogModel->getContentClickCount(
-			(int) $this->input->get('content_id', TRUE), $since
-		);
-
-		$this->terminateWithSuccess([
-			'since' => $since,
-			'months' => $months,
-			'own' => $this->getDataOrTerminateWithError($result)
-		]);
-	}
-
-	/**
-	 * The ranking of the most viewed contents. It groups the whole log and resolves a
-	 * title per row, which takes seconds, so the tab fetches it only on request.
-	 * Empty if LOG_CONTENT is off.
-	 */
-	public function getClickRanking()
-	{
-		$this->checkClickstatsAccess();
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('months', 'Monate', 'is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
-
-		list($months, $since) = $this->clickstatsPeriod();
-
-		$sprache = $this->input->get('sprache', TRUE);
-		if (empty($sprache))
-			$sprache = DEFAULT_LANGUAGE;
-
-		$result = $this->WebservicelogModel->getContentClickCounts(
-			$since, $sprache, (int) $this->config->item('clickstats_limit')
-		);
-		$rows = $this->getDataOrTerminateWithError($result);
-
-		$ranked = [];
-		foreach ((array) $rows as $row)
-		{
-			$ranked[] = [
-				'content_id' => (int) $row->content_id,
-				'titel' => $row->titel,
-				'hits' => (int) $row->hits
-			];
-		}
-
-		$this->terminateWithSuccess([
-			'since' => $since,
-			'months' => $months,
-			'ranked' => $ranked
-		]);
-	}
-
-	public function getTemplates()
-	{
-		$this->TemplateModel->addSelect('template_kurzbz, bezeichnung');
-		$this->TemplateModel->addOrder('bezeichnung');
-		$result = $this->TemplateModel->loadWhere([]);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getOrganisationseinheiten()
-	{
-		$this->load->model(
-			'organisation/Organisationseinheit_model', 'OrganisationseinheitModel'
-		);
-		$this->OrganisationseinheitModel->addSelect(
-			'oe_kurzbz, bezeichnung, organisationseinheittyp_kurzbz, aktiv'
-		);
-		$this->OrganisationseinheitModel->addOrder('bezeichnung');
-		$result = $this->OrganisationseinheitModel->loadWhere([]);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getSprachen()
-	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->SpracheModel->addSelect('sprache, bezeichnung');
-		
-		$result = $this->SpracheModel->loadWhere(['content' => true]);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getUsage()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$result = $this->ContentModel->getUsage($content_id);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function postContent()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'i'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('parent_content_id', 'Parent', 'is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$parent = $this->input->post('parent_content_id');
-		if (empty($parent))
-			$parent = null;
-
-		$result = $this->cmsadminlib->createContent($parent);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function postTranslation()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'i'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		$this->form_validation->set_rules('target_sprache', 'Target Sprache', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->cmsadminlib->createTranslation(
-			$this->input->post('content_id'),
-			$this->input->post('sprache'),
-			$this->input->post('version'),
-			$this->input->post('target_sprache')
-		);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function postVersion()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'i'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->cmsadminlib->createVersion(
-			$this->input->post('content_id'),
-			$this->input->post('sprache')
-		);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function putProperties()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		$this->form_validation->set_rules('template_kurzbz', 'Template', 'required');
-		$this->form_validation->set_rules('oe_kurzbz', 'OE', 'required');
-		$this->form_validation->set_rules('titel', 'Titel', 'required|max_length[256]');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$daten = [
-			'content_id'      => $this->input->post('content_id'),
-			'sprache'         => $this->input->post('sprache'),
-			'version'         => $this->input->post('version'),
-			'template_kurzbz' => $this->input->post('template_kurzbz'),
-			'oe_kurzbz'       => $this->input->post('oe_kurzbz'),
-			'titel'           => $this->input->post('titel'),
-			'beschreibung'    => $this->input->post('beschreibung') ?: '',
-			'aktiv'           => filter_var($this->input->post('aktiv'), FILTER_VALIDATE_BOOLEAN),
-			'menu_open'       => filter_var($this->input->post('menu_open'), FILTER_VALIDATE_BOOLEAN),
-			'sichtbar'        => filter_var($this->input->post('sichtbar'), FILTER_VALIDATE_BOOLEAN)
-		];
-
-		$result = $this->cmsadminlib->saveProperties($daten);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function deleteContent()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'd'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->cmsadminlib->deleteContent($this->input->post('content_id'));
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function deleteContentsprache()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'd'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->validateContentSpracheVersion();
-
-		$result = $this->cmsadminlib->deleteVersion(
-			$this->input->post('content_id'),
-			$this->input->post('sprache'),
-			$this->input->post('version')
-		);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	// --- Private helpers ---
-
-	private function validateContentSpracheVersion()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-	}
-
-	private function buildTreeNode($content_id, $depth, &$visited)
-	{
-		if ($depth > self::MAX_TREE_DEPTH || isset($visited[$content_id]))
-			return null;
-
-		$visited[$content_id] = true;
-
-		$this->ContentModel->resetQuery();
-		$contentResult = $this->ContentModel->load($content_id);
-		if (isError($contentResult) || empty(getData($contentResult)))
-			return null;
-		$content = getData($contentResult)[0];
-
-		$titel = '';
-		$csResult = $this->ContentspracheModel->getOne($content_id, DEFAULT_LANGUAGE);
-		if (!isError($csResult))
-			$titel = getData($csResult)->titel;
-
-		$childrenResult = $this->ContentchildModel->getChilds($content_id, DEFAULT_LANGUAGE);
-		$children = [];
-		if (!isError($childrenResult) && getData($childrenResult))
-		{
-			foreach (getData($childrenResult) as $child)
-			{
-				$childNode = $this->buildTreeNode(
-					(int) $child->child_content_id, $depth + 1, $visited
-				);
-				if ($childNode !== null)
-					$children[] = $childNode;
-			}
-		}
-
-		$node = new stdClass();
-		$node->content_id = (int) $content_id;
-		$node->titel = $titel;
-		$node->template_kurzbz = $content->template_kurzbz;
-		$node->oe_kurzbz = $content->oe_kurzbz;
-		$node->aktiv = ($content->aktiv === 't' || $content->aktiv === true);
-		$node->entitled = false;
-		$node->groups = [];
-		$node->children = $children;
-
-		return $node;
-	}
-
-	private function collectContentIds($nodes, &$ids)
-	{
-		foreach ($nodes as $node)
-		{
-			$ids[] = $node->content_id;
-			if (!empty($node->children))
-				$this->collectContentIds($node->children, $ids);
-		}
-	}
-
-	private function applyMeta(&$nodes, $entitledOe, $groupMap)
-	{
-		foreach ($nodes as $node)
-		{
-			$node->entitled = in_array($node->oe_kurzbz, $entitledOe);
-			$node->groups = isset($groupMap[$node->content_id])
-				? $groupMap[$node->content_id]
-				: [];
-			if (!empty($node->children))
-				$this->applyMeta($node->children, $entitledOe, $groupMap);
-		}
-	}
-
-	private function pruneUnentitled($node)
-	{
-		$kept = [];
-		foreach ($node->children as $child)
-		{
-			$pruned = $this->pruneUnentitled($child);
-			if ($pruned !== null)
-				$kept[] = $pruned;
-		}
-		$node->children = $kept;
-
-		if ($node->entitled || !empty($node->children))
-			return $node;
-
-		return null;
-	}
-
-	/**
-	 * Lists the DMS categories for the contentcomponent insert dialog.
-	 */
-	public function getDmsKategorien()
-	{
-		$this->load->model('content/Dms_model', 'DmsModel');
-
-		$result = $this->DmsModel->getKategorien();
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-
-	/**
-	 * Lists active staff for the contentcomponent insert dialog.
-	 * Names only. See Mitarbeiter_model::getAktivesPersonalNamen().
-	 */
-	public function getMitarbeiter()
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$result = $this->MitarbeiterModel->getAktivesPersonalNamen();
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-
-	/**
-	 * Lists the documents of one DMS category for the contentcomponent insert dialog.
-	 */
-	public function getDmsKategorieDokumente()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('kategorie_kurzbz', 'DMS-Kategorie', 'required');
-		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->load->model('content/Dms_model', 'DmsModel');
-
-		$result = $this->DmsModel->getKategorieDokumenteAlle($this->input->get('kategorie_kurzbz', TRUE));
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result) ?: array());
-	}
-
-}

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

@@ -1,195 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class CmsAdminInhalt extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getFormSchema'      => ['basis/cms:r'],
-			'getFormData'        => ['basis/cms:r'],
-			'getLock'            => ['basis/cms:r'],
-			'getVersions'        => ['basis/cms:r'],
-			'putFormData'        => ['basis/cms:rw'],
-			'postLock'           => ['basis/cms:rw'],
-			'deleteLock'         => ['basis/cms:rw'],
-			'deleteLockForced'   => ['basis/cms:rw']
-		]);
-
-		$this->load->library('CmsAdminLib');
-		$this->load->library('XsdSchemaLib');
-		$this->load->library('PermissionLib');
-		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
-		$this->load->model('content/Template_model', 'TemplateModel');
-
-		$this->loadPhrases(['global', 'cms']);
-	}
-
-	public function getFormSchema()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('template_kurzbz', 'Template', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$template_kurzbz = $this->input->get('template_kurzbz', TRUE);
-
-		$this->TemplateModel->resetQuery();
-		$templateResult = $this->TemplateModel->load($template_kurzbz);
-		$templateData = $this->getDataOrTerminateWithError($templateResult);
-		if (empty($templateData))
-			$this->terminateWithError($this->p->t('cms', 'vorlageNichtGefunden'));
-
-		$schemaResult = $this->xsdschemalib->parseSchema(
-			$templateData[0]->xsd, $template_kurzbz
-		);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($schemaResult));
-	}
-
-	public function getFormData()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-		$version = $this->input->get('version', TRUE);
-
-		$versionResult = $this->ContentspracheModel->getOne($content_id, $sprache, $version);
-		$row = $this->getDataOrTerminateWithError($versionResult);
-
-		$this->load->model('content/Content_model', 'ContentModel');
-		$this->ContentModel->resetQuery();
-		$contentResult = $this->ContentModel->load($content_id);
-		$contentData = $this->getDataOrTerminateWithError($contentResult);
-		if (empty($contentData))
-			$this->terminateWithError($this->p->t('cms', 'contentNichtGefunden'));
-
-		$this->TemplateModel->resetQuery();
-		$templateResult = $this->TemplateModel->load($contentData[0]->template_kurzbz);
-		$templateData = $this->getDataOrTerminateWithError($templateResult);
-		if (empty($templateData))
-			$this->terminateWithError($this->p->t('cms', 'vorlageNichtGefunden'));
-
-		$schemaResult = $this->xsdschemalib->parseSchema(
-			$templateData[0]->xsd, $contentData[0]->template_kurzbz
-		);
-		$schema = $this->getDataOrTerminateWithError($schemaResult);
-
-		$valuesResult = $this->xsdschemalib->extractValues($row->content, $schema);
-		$values = $this->getDataOrTerminateWithError($valuesResult);
-
-		$lockResult = $this->cmsadminlib->getLockState($content_id, $sprache, $version);
-		$lock = $this->getDataOrTerminateWithError($lockResult);
-
-		$this->terminateWithSuccess([
-			'schema' => $schema,
-			'values' => $values,
-			'sperre' => $lock
-		]);
-	}
-
-	public function getLock()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-		$version = $this->input->get('version', TRUE);
-
-		$result = $this->cmsadminlib->getLockState($content_id, $sprache, $version);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getVersions()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-
-		$result = $this->ContentspracheModel->getVersions($content_id, $sprache);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function putFormData()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('sprache', 'Sprache', 'required');
-		$this->form_validation->set_rules('version', 'Version', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->post('content_id');
-		$sprache = $this->input->post('sprache');
-		$version = $this->input->post('version');
-		$values = $this->input->post('values');
-
-		if (is_string($values))
-			$values = json_decode($values, true);
-
-		if (!is_array($values))
-			$values = [];
-
-		$lockResult = $this->cmsadminlib->getLockState($content_id, $sprache, $version);
-		$lock = $this->getDataOrTerminateWithError($lockResult);
-		if (!$lock['own'])
-			$this->terminateWithError($this->p->t('cms', 'speichernNurMitSperre'));
-
-		$result = $this->cmsadminlib->saveContentXml($content_id, $sprache, $version, $values);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function postLock()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigungFuerDieseAktion'));
-
-		$contentsprache_id = $this->input->post('contentsprache_id');
-
-		$result = $this->cmsadminlib->lock($contentsprache_id);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function deleteLock()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigungFuerDieseAktion'));
-
-		$contentsprache_id = $this->input->post('contentsprache_id');
-
-		$result = $this->cmsadminlib->releaseOwnLock($contentsprache_id);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function deleteLockForced()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms_sperrfreigabe', 'su'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigungFuerDieseAktion'));
-
-		$contentsprache_id = $this->input->post('contentsprache_id');
-
-		$result = $this->cmsadminlib->forceRelease($contentsprache_id);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-}

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

@@ -1,265 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class CmsAdminStruktur extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getGruppen'        => ['basis/cms:r'],
-			'getAllGruppen'     => ['basis/cms:r'],
-			'getChilds'        => ['basis/cms:r'],
-			'getParents'       => ['basis/cms:r'],
-			'getPossibleChilds' => ['basis/cms:r'],
-			'postGruppe'       => ['basis/cms:rw'],
-			'deleteGruppe'     => ['basis/cms:rw'],
-			'postChild'        => ['basis/cms:rw'],
-			'deleteChild'      => ['basis/cms:rw'],
-			'putChildSort'     => ['basis/cms:rw'],
-			'putChildOrder'    => ['basis/cms:rw']
-		]);
-
-		$this->load->library('PermissionLib');
-		$this->load->model('content/Content_model', 'ContentModel');
-		$this->load->model('content/Contentchild_model', 'ContentchildModel');
-		$this->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
-
-		$this->loadPhrases(['global', 'cms']);
-	}
-
-	public function getGruppen()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-
-		$result = $this->ContentgruppeModel->getGruppen($content_id);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getAllGruppen()
-	{
-		$result = $this->ContentgruppeModel->getAllGruppen();
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getChilds()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-
-		if (empty($sprache))
-			$sprache = DEFAULT_LANGUAGE;
-
-		$result = $this->ContentchildModel->getChilds($content_id, $sprache);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getParents()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-
-		if (empty($sprache))
-			$sprache = DEFAULT_LANGUAGE;
-
-		$result = $this->ContentchildModel->getParents($content_id, $sprache);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getPossibleChilds()
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->get('content_id', TRUE);
-		$sprache = $this->input->get('sprache', TRUE);
-
-		if (empty($sprache))
-			$sprache = DEFAULT_LANGUAGE;
-
-		$result = $this->ContentModel->getPossibleChilds($content_id, $sprache);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function postGruppe()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('gruppe_kurzbz', 'Gruppe', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->ContentgruppeModel->insert([
-			'content_id'    => $this->input->post('content_id'),
-			'gruppe_kurzbz' => $this->input->post('gruppe_kurzbz'),
-			'insertamum'    => date('Y-m-d H:i:s'),
-			'insertvon'     => getAuthUID()
-		]);
-
-		if (isError($result))
-		{
-			$this->terminateWithError($this->p->t('cms', 'gruppeBereitsZugeordnet'));
-		}
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function deleteGruppe()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('gruppe_kurzbz', 'Gruppe', 'required');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->ContentgruppeModel->delete([
-			$this->input->post('gruppe_kurzbz'),
-			$this->input->post('content_id')
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function postChild()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		$this->form_validation->set_rules('child_content_id', 'Child Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$content_id = $this->input->post('content_id');
-
-		$sortResult = $this->ContentchildModel->getMaxSort($content_id);
-		$sort = $this->getDataOrTerminateWithError($sortResult) + 1;
-		
-		$result = $this->ContentchildModel->insert([
-			'content_id'       => $content_id,
-			'child_content_id' => $this->input->post('child_content_id'),
-			'sort'             => $sort,
-			'insertamum'       => date('Y-m-d H:i:s'),
-			'insertvon'        => getAuthUID()
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function deleteChild()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('contentchild_id', 'Contentchild ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->ContentchildModel->delete($this->input->post('contentchild_id'));
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function putChildSort()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('contentchild_id', 'Contentchild ID', 'required|is_natural');
-		$this->form_validation->set_rules('direction', 'Direction', 'required|in_list[up,down]');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$direction = $this->input->post('direction');
-
-		$result = $this->ContentchildModel->swapSort(
-			$this->input->post('contentchild_id'),
-			$direction
-		);
-
-		if (isError($result))
-		{
-			// The child already sits at the end it was moved towards. That is a normal
-			// answer, not a failure, and the direction decides the wording.
-			if (getError($result) === Contentchild_model::NO_NEIGHBOUR)
-			{
-				$this->terminateWithError($this->p->t('cms',
-					$direction === 'up' ? 'bereitsGanzOben' : 'bereitsGanzUnten'));
-			}
-
-			$this->terminateWithError($this->p->t('cms', 'sortierungFehlgeschlagen'));
-		}
-
-		$this->terminateWithSuccess(true);
-	}
-
-	// Writes the whole order at once. The drag and drop moves a child over any distance,
-	// and putChildSort would need one request per position.
-	public function putChildOrder()
-	{
-		if (!$this->permissionlib->isBerechtigt('basis/cms', 'u'))
-			$this->terminateWithError($this->p->t('cms', 'keineBerechtigung'));
-
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_POST);
-		$this->form_validation->set_rules('content_id', 'Content ID', 'required|is_natural');
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$ids = $this->input->post('contentchild_ids');
-
-		if (is_string($ids))
-			$ids = json_decode($ids, true);
-
-		if (!is_array($ids) || empty($ids))
-			$this->terminateWithError($this->p->t('cms', 'sortierungFehlgeschlagen'));
-
-		$result = $this->ContentchildModel->setSortOrder(
-			$this->input->post('content_id'),
-			$ids
-		);
-
-		if (isError($result))
-			$this->terminateWithError($this->p->t('cms', 'sortierungFehlgeschlagen'));
-
-		$this->terminateWithSuccess(true);
-	}
-}

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

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

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

@@ -47,7 +47,7 @@ class LvPlan extends FHCAPI_Controller
 			'fetchFerienEvents' => self::PERM_LOGGED,
 			'getStudiengaenge' => self::PERM_LOGGED,
 			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
+			'permissionOtherLvPlan' => self::PERM_ANONYMOUS,
 			'compactibleEventTypes' => self::PERM_LOGGED,
 			'getLeEvents' => self::PERM_LOGGED,
 			'getLvEvents' => self::PERM_LOGGED,
@@ -62,6 +62,7 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));
 
+		$this->load->library('PermissionLib');
         $this->load->library('form_validation');
 		$this->load->library('PhrasesLib');
 		$this->loadPhrases(
@@ -437,7 +438,7 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	public function permissionOtherLvPlan()
 	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
+		$this->terminateWithSuccess(getAuthUID() && $this->permissionlib->isBerechtigt('basis/other_lv_plan'));
 	}
 
 	/**

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

@@ -25,7 +25,7 @@ class RouteInfo extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'info' => self::PERM_LOGGED,
+			'info' => self::PERM_ANONYMOUS,
 		]);
 
 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -33,6 +33,8 @@ class RouteInfo extends FHCAPI_Controller
 
 	public function info()
 	{
+		if (!getAuthUID()) $this->terminateWithSuccess(null);
+
 		$payload = json_decode($this->input->raw_input_stream);
 
 		if (isset($payload->app) && isset($payload->path) && $this->isValidApp($payload->app) && $this->isValidPath($payload->path))

application/controllers/api/frontend/v1/calendar/RoomPlan.php

@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class RoomPlan extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'addRoomReservation' => self::PERM_LOGGED,
+			'deleteRoomReservation' => self::PERM_LOGGED,
+			'getRoomCreationInfo' => self::PERM_LOGGED,
+			'getGruppen' => self::PERM_LOGGED,
+			'getLektor' => self::PERM_LOGGED,
+			'getReservableMap' => self::PERM_LOGGED,
+		]);
+
+		$this->load->library('LogLib');
+		$this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API',
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+		$this->load->library('form_validation');
+		$this->load->library('PermissionLib');
+		$this->load->library('StundenplanLib');
+
+		$this->loadPhrases(['ui']);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+
+	public function addRoomReservation()
+	{
+		$this->form_validation->set_rules('selectedStart', "Start", "required");
+		$this->form_validation->set_rules('selectedEnd', "End", "required");
+		$this->form_validation->set_rules('title', "Title", "required|max_length[10]");
+		$this->form_validation->set_rules('beschreibung', "Beschreibung", "required|max_length[32]");
+		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required|max_length[16]");
+		$this->form_validation->set_rules('studiengang', 'Studiengang', 'numeric');
+		$this->form_validation->set_rules('semester', 'Semester', 'integer|greater_than_equal_to[0]');
+		$this->form_validation->set_rules('verband', 'Verband', 'trim');
+		$this->form_validation->set_rules('gruppe', 'Gruppe', 'trim');
+		$this->form_validation->set_rules('spezialgruppe', 'Spezialgruppe', 'max_length[32]');
+		$this->form_validation->set_rules('lektoren', 'Lektoren');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$start = $this->input->post('selectedStart');
+		$end = $this->input->post('selectedEnd');
+		$title = $this->input->post('title');
+		$beschreibung = $this->input->post('beschreibung');
+		$ort_kurzbz = $this->input->post('ort_kurzbz');
+
+		$studiengang_kz = $this->input->post('studiengang');
+		$semester = $this->input->post('semester');
+		$verband = $this->input->post('verband');
+		$gruppe = $this->input->post('gruppe');
+		$spezialgruppe = $this->input->post('spezialgruppe');
+		$lektoren = $this->input->post('lektoren');
+
+
+		$result = $this->stundenplanlib->addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren, $studiengang_kz, $semester, $verband, $gruppe, $spezialgruppe);
+
+		if (isError($result))
+			$this->terminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deleteRoomReservation()
+	{
+		$reservierung_id = $this->input->post('reservierung_id');
+
+		$result = $this->stundenplanlib->deleteReservation($reservierung_id);
+
+		if (isError($result))
+			$this->terminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getRoomCreationInfo()
+	{
+		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
+		if (!$this->permissionlib->isBerechtigt('lehre/reservierung'))
+			$this->terminateWithSuccess($return_array);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess($return_array);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
+		$this->StudiengangModel->addOrder('typ, kurzbz');
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaenge))
+			$this->terminateWithError($studiengaenge);
+
+		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
+		$return_array['berechtigt'] = true;
+
+		$this->terminateWithSuccess($return_array);
+	}
+
+	public function getGruppen()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('organisation/gruppe_model', 'GruppeModel');
+
+		$query_words = explode(' ', urldecode($query));
+
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+		$this->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->GruppeModel->db->group_start();
+			$this->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('beschreibung ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('orgform_kurzbz ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->GruppeModel->db->or_where('studiengang_kz', $word);
+			}
+			$this->GruppeModel->db->group_end();
+		}
+		$this->GruppeModel->db->group_end();
+		$this->GruppeModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$gruppen = $this->GruppeModel->loadWhere(array('sichtbar' => true, 'lehre' => true));
+		if (isError($gruppen))
+			$this->terminateWithError($gruppen);
+
+		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : []);
+	}
+
+	public function getLektor()
+	{
+
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$query_words = explode(' ', urldecode($query));
+
+		$this->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+		$this->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+		$this->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->MitarbeiterModel->db->group_start();
+			$this->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->group_end();
+		}
+		$this->MitarbeiterModel->db->group_end();
+
+		$this->MitarbeiterModel->addOrder('nachname');
+		$this->MitarbeiterModel->addOrder('vorname');
+		$mitarbeiter = $this->MitarbeiterModel->load();
+		if (isError($mitarbeiter))
+			$this->terminateWithError($mitarbeiter);
+
+		$this->terminateWithSuccess(hasData($mitarbeiter) ? getData($mitarbeiter) : []);
+	}
+
+	public function getReservableMap($ort_kurzbz = null)
+	{
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
+
+		$result = $this->stundenplanlib->getReservableMap($ort_kurzbz, $start_date, $end_date);
+
+		$this->terminateWithSuccess(array('reservierbarMap' => hasData($result) ? getData($result) : []));
+	}
+
+}

application/controllers/api/frontend/v1/coodle/FreeBusy.php

@@ -0,0 +1,322 @@
+<?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 FreeBusy extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getFreeBusyTypes' => self::PERM_LOGGED,
+			'getFreeBusyEntries' => self::PERM_LOGGED,
+			'createFreeBusyEntry' => self::PERM_LOGGED,
+			'updateFreeBusyEntry' => self::PERM_LOGGED,
+			'deleteFreeBusyEntry' => self::PERM_LOGGED,
+			'getFreeBusySchedule' => self::PERM_LOGGED,
+			'getCoodleFreeBusy' => self::PERM_ANONYMOUS,
+		]);
+
+		$this->load->model('person/Freebusy_model', 'FreeBusyModel');
+		$this->load->model('person/Freebusytyp_model', 'FreeBusyTypeModel');
+
+		$this->load->library('FreeBusyLib');
+		$this->load->library('form_validation');
+
+		$this->load->model("ressource/CoodleSurvey_model", "CoodleSurveyModel");
+		$this->load->model("ressource/CoodleSurveyTimeslot_model", "CoodleSurveyTimeslotModel");
+		$this->load->model("ressource/CoodleSurveyParticipant_model", "CoodleSurveyParticipantModel");
+
+		$this->loadPhrases([
+			'coodle'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getFreeBusyTypes()
+	{
+		$freeBusyTypesResult = $this->FreeBusyTypeModel->getActiveFreeBusyTypes();
+		$freeBusyTypes = $this->getDataOrTerminateWithError($freeBusyTypesResult);
+		$freeBusyTypes = $this->formatDefaultUrlsInFreeBusyTypes($freeBusyTypes);
+		$this->terminateWithSuccess($freeBusyTypes);
+
+	}
+
+	public function getFreeBusyEntries()
+	{
+		$this->FreeBusyModel->addOrder("freebusy_id");
+		$freeBusyEntries = $this->FreeBusyModel->loadWhere(["uid" => getAuthUID()]);
+		$freeBusyEntries = $this->getDataOrTerminateWithError($freeBusyEntries);
+		$this->terminateWithSuccess($freeBusyEntries);
+	}
+
+	public function createFreeBusyEntry()
+	{
+		$description = $this->input->post("description");
+		$type = $this->input->post("type") ?? "Sonstiges";
+		$url = $this->input->post("url");
+		$isActive = $this->input->post("isActive");
+
+		$this->form_validation->set_data([
+			"url" => $url,
+			"description" => $description,
+		]);
+		$this->form_validation->set_rules("url", "URL", "required|max_length[255]");
+		$this->form_validation->set_rules("description", "Description", "max_length[255]");
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		if (!$this->isUrlValid($url)) {
+			$this->terminateWithError($this->p->t("coodle", "url_not_working"));
+		}
+
+		$this->FreeBusyModel->insert(
+			[
+				"uid" => getAuthUID(),
+				"freebusytyp_kurzbz" => $type,
+				"url" => $url,
+				"aktiv" => $isActive,
+				"bezeichnung" => $description,
+			]
+		);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function updateFreeBusyEntry()
+	{
+		$id = $this->input->post("id");
+		$description = $this->input->post("description");
+		$type = $this->input->post("type") ?? "Sonstiges";
+		$url = $this->input->post("url");
+		$isActive = $this->input->post("isActive");
+
+		$this->form_validation->set_data([
+			"url" => $url,
+			"description" => $description,
+		]);
+		$this->form_validation->set_rules("url", "URL", "required|max_length[255]");
+		$this->form_validation->set_rules("description", "Description", "max_length[255]");
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		if (!$this->isUrlValid($url)) {
+			$this->terminateWithError($this->p->t("coodle", "url_not_working"));
+		}
+
+		$existingFreeBusyEntryResult = $this->FreeBusyModel->load($id);
+		$existingFreeBusyEntry = $this->getDataOrTerminateWithError($existingFreeBusyEntryResult);
+		$existingFreeBusyEntry = $existingFreeBusyEntry && count($existingFreeBusyEntry) ? $existingFreeBusyEntry[0] : null;
+		if (!$existingFreeBusyEntry) {
+			$this->terminateWithError("FreeBusy entry not found!");
+		} else if ($existingFreeBusyEntry->uid !== getAuthUID()) {
+			$this->terminateWithError("You are not authorized to modify this FreeBusy entry!");
+		}
+
+		$this->FreeBusyModel->update(
+			$id,
+			[
+				"uid" => getAuthUID(),
+				"freebusytyp_kurzbz" => $type,
+				"url" => $url,
+				"aktiv" => $isActive,
+				"bezeichnung" => $description,
+			]
+		);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function deleteFreeBusyEntry()
+	{
+		$id = $this->input->post("id");
+
+		$existingFreeBusyEntryResult = $this->FreeBusyModel->load($id);
+		$existingFreeBusyEntry = $this->getDataOrTerminateWithError($existingFreeBusyEntryResult);
+		$existingFreeBusyEntry = $existingFreeBusyEntry && count($existingFreeBusyEntry) ? $existingFreeBusyEntry[0] : null;
+		if (!$existingFreeBusyEntry) {
+			$this->terminateWithError("FreeBusy entry not found!");
+		} else if ($existingFreeBusyEntry->uid !== getAuthUID()) {
+			$this->terminateWithError("You are not authorized to delete this FreeBusy entry!");
+		}
+
+		$this->FreeBusyModel->delete($id);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function getFreeBusySchedule()
+	{
+		$uid = $this->input->post("uid");
+		$coodleSurveyIdToExclude = $this->input->post("coodleSurveyIdToExclude");
+		$freeBusyEntries = $this->FreeBusyModel->loadWhere(["uid" => $uid, "aktiv" => true]);
+		$freeBusyEntries = $this->getDataOrTerminateWithError($freeBusyEntries);
+
+		$cumulativeFreeBusyEvents = $this->freebusylib->getDefaultInternalFreeBusy($uid);
+
+		foreach ($freeBusyEntries as $freeBusyEntry) {
+			// todo: following workaround is to use new coodle freebusy endpoint, remove once actual redirect is set up
+			// keep query param with excluded survey id, only remove url replacement
+			$freeBusyUrl = $freeBusyEntry->url;
+			if ($freeBusyEntry->freebusytyp_kurzbz === "Coodle") {
+				$freeBusyUrl = APP_ROOT . "cis.php/CoodleFreeBusy/" . $uid;
+				if ($coodleSurveyIdToExclude) {
+					$freeBusyUrl .= "?excludeSurvey=" . $coodleSurveyIdToExclude;
+				}
+			}
+
+			$freeBusyEvents = $this->freebusylib->getFreeBusy($freeBusyUrl);
+			$cumulativeFreeBusyEvents = array_merge(
+				$cumulativeFreeBusyEvents,
+				$freeBusyEvents
+			);
+		}
+
+		$this->terminateWithSuccess($cumulativeFreeBusyEvents);
+	}
+
+	public function getCoodleFreeBusy($uid)
+	{
+		$participantEntries = $this->CoodleSurveyParticipantModel->getParticipantEntriesByUid($uid);
+
+		$surveys = [];
+		if (count($participantEntries)) {
+			$surveyIds = array_map(
+				function ($participantEntry) {
+					return $participantEntry->survey_id;
+				},
+				$participantEntries
+			);
+			$surveys = $this->CoodleSurveyModel->getSurveys($surveyIds);
+		}
+
+		$surveyIdToBeExcluded = $this->input->get("excludeSurvey");
+		if ($surveyIdToBeExcluded) {
+			$surveyIdToBeExcluded = intval($surveyIdToBeExcluded);
+			$surveys = array_filter(
+				$surveys,
+				function ($survey) use ($surveyIdToBeExcluded) {
+					return $survey->id !== $surveyIdToBeExcluded;
+				}
+			);
+		}
+
+
+		$activeSurveys = array_filter(
+			$surveys,
+			function ($survey) {
+				return !$survey->completed_at && !$survey->canceled_at;
+			}
+		);
+
+		$timeslots = [];
+		if (count($activeSurveys)) {
+			$activeSurveyIds = array_map(
+				function ($activeSurvey) {
+					return $activeSurvey->id;
+				},
+				$activeSurveys
+			);
+			$timeslots = $this->CoodleSurveyTimeslotModel->getTimeslotsForMultipleSurveys($activeSurveyIds);
+		}
+
+		$formattedTimeslots = [];
+		if (count($timeslots)) {
+			$localTimezone = new DateTimeZone("Europe/Vienna");
+			$utcTimezone = new DateTimeZone("UTC");
+
+			foreach ($activeSurveys as $activeSurvey) {
+				$correspondingTimeslots = array_filter(
+					$timeslots,
+					function ($timeslot) use ($activeSurvey) {
+						return $timeslot->survey_id === $activeSurvey->id;
+					}
+				);
+				$formattedCorrespondingTimeslots = array_map(
+					function ($timeslot) use ($activeSurvey, $utcTimezone, $localTimezone) {
+						$startTime = new DateTime($timeslot->starts_at, $localTimezone);
+						$endTime = new DateTime($timeslot->starts_at, $localTimezone);
+						$endTime->modify("+$activeSurvey->timeslot_duration minutes");
+
+						$startTime->setTimezone($utcTimezone);
+						$endTime->setTimezone($utcTimezone);
+
+						$formattedStartTime = $startTime->format("Ymd\THis\Z");
+						$formattedEndTime = $endTime->format("Ymd\THis\Z");
+						return [
+							"start" => $formattedStartTime,
+							"end" => $formattedEndTime,
+						];
+					},
+					$correspondingTimeslots
+				);
+				$formattedTimeslots = array_merge($formattedTimeslots, $formattedCorrespondingTimeslots);
+			}
+		}
+
+		$coodleFreeBusyIcsFilePath = tempnam(sys_get_temp_dir(), "coodle_freebusy_");
+
+		$coodleFreeBusyIcsFile = fopen($coodleFreeBusyIcsFilePath, "w");
+		fwrite($coodleFreeBusyIcsFile, "BEGIN:VCALENDAR" . PHP_EOL);
+		fwrite($coodleFreeBusyIcsFile, "VERSION:2.0" . PHP_EOL);
+		fwrite($coodleFreeBusyIcsFile, "PRDODID:" . CAMPUS_NAME . PHP_EOL);
+		fwrite($coodleFreeBusyIcsFile, "ATTENDEE:mailto:" . $uid . "@" . DOMAIN . PHP_EOL);
+		fwrite($coodleFreeBusyIcsFile, "BEGIN:VFREEBUSY" . PHP_EOL);
+
+		foreach ($formattedTimeslots as $timeslot) {
+			fwrite($coodleFreeBusyIcsFile, "FREEBUSY;FBTYPE=BUSY:" . $timeslot["start"] . "/" . $timeslot["end"] . PHP_EOL);
+		}
+
+		fwrite($coodleFreeBusyIcsFile, "END:VFREEBUSY" . PHP_EOL);
+		fwrite($coodleFreeBusyIcsFile, "END:VCALENDAR");
+
+		$this->terminateWithFileOutput("text/calendar", file_get_contents($coodleFreeBusyIcsFilePath), "coodle_freebusy_$uid.ics");
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	private function isUrlValid($url)
+	{
+		return !!@fopen($url, "r");
+	}
+
+	private function formatDefaultUrlsInFreeBusyTypes($freeBusyTypes)
+	{
+		$uid = getAuthUID();
+		return array_map(function ($freeBusyType) use ($uid) {
+			if (!$freeBusyType->url_vorlage || !strlen($freeBusyType->url_vorlage)) {
+				$freeBusyType->url_default = null;
+				unset($freeBusyType->url_vorlage);
+				return $freeBusyType;
+			}
+
+			$freeBusyType->url_default = str_replace('$uid', $uid, $freeBusyType->url_vorlage);
+			unset($freeBusyType->url_vorlage);
+			return $freeBusyType;
+		}, $freeBusyTypes);
+	}
+
+}

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

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

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

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

application/controllers/jobs/ReihungstestJob.php

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

application/controllers/system/infocenter/InfoCenter.php

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

application/controllers/system/infocenter/Rueckstellung.php

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

application/helpers/hlp_sancho_helper.php

@@ -33,6 +33,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * @param string $headerImg	Filename of the specific Sancho header image.
  * @param string $cc Sets CC of mail.
  * @param string $bcc Sets BCC of mail.
+ * @param array $attachments array of arrays with 'filePath' and (optional) 'altName' keys
  * @return void
  */
 function sendSanchoMail(
@@ -44,7 +45,8 @@ function sendSanchoMail(
 	$footerImg = '',
 	$from = null,
 	$cc = null,
-	$bcc = null
+	$bcc = null,
+	$attachments = []
 )
 {
 	$ci =& get_instance();
@@ -116,6 +118,18 @@ function sendSanchoMail(
 		$ci->email->attach($sanchoFooter_img, 'inline');
 		$cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
 		$cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
+
+		// attach files
+		if (count($attachments)) {
+			foreach ($attachments as $attachment) {
+				if (isset($attachment["altName"])) {
+					$ci->email->attach($attachment["filePath"], 'attachment', $attachment["altName"]);
+				} else {
+					$ci->email->attach($attachment["filePath"], 'attachment');
+				}
+			}
+		}
+
 	}
 
 	// Set specific mail content into specific content template

application/libraries/AnrechnungLib.php

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

application/libraries/CmsAdminLib.php

@@ -1,563 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class CmsAdminLib
-{
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-
-		$this->ci->load->model('content/Content_model', 'ContentModel');
-		$this->ci->load->model('content/Contentsprache_model', 'ContentspracheModel');
-		$this->ci->load->model('content/Contentchild_model', 'ContentchildModel');
-		$this->ci->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
-		$this->ci->load->model('content/Contentlog_model', 'ContentlogModel');
-		$this->ci->load->model('content/Template_model', 'TemplateModel');
-
-		$this->ci->load->library('XsdSchemaLib');
-		$this->ci->load->library('PermissionLib');
-		$this->ci->config->load('cms');
-	}
-
-	/**
-	 * @return object success(array) entitled oe_kurzbz values
-	 */
-	public function getEntitledOe()
-	{
-		$oe = $this->ci->permissionlib->getOE_isEntitledFor('basis/cms');
-
-		if ($oe === false || !is_array($oe))
-			return success([]);
-
-		return success($oe);
-	}
-	
-	/**
-	 * @param int $content_id
-	 * @return object success(bool)
-	 */
-	public function isEntitledForContent($content_id)
-	{
-		$oeResult = $this->ci->ContentModel->getOeKurzbz($content_id);
-		if (isError($oeResult))
-			return $oeResult;
-
-		$entitledResult = $this->getEntitledOe();
-		if (isError($entitledResult))
-			return $entitledResult;
-
-		return success(in_array(getData($oeResult), getData($entitledResult)));
-	}
-
-	/**
-	 * @return object success(string) or error
-	 */
-	public function getDefaultOe()
-	{
-		$default = $this->ci->config->item('default_oe_kurzbz');
-
-		$entitledResult = $this->getEntitledOe();
-		if (isError($entitledResult))
-			return $entitledResult;
-		$entitled = getData($entitledResult);
-
-		if (empty($entitled))
-			return error($this->ci->p->t('cms', 'keineBerechtigteOe'));
-
-		if (in_array($default, $entitled))
-			return success($default);
-
-		return success($entitled[0]);
-	}
-
-	/**
-	 * @param int|null $parent_content_id
-	 * @return object success(array) with content_id, sprache, version
-	 */
-	public function createContent($parent_content_id = null)
-	{
-		$templatesResult = $this->ci->TemplateModel->loadWhere([]);
-		if (isError($templatesResult))
-			return $templatesResult;
-		$templates = getData($templatesResult);
-		if (empty($templates))
-			return error($this->ci->p->t('cms', 'keineVorlageVorhanden'));
-		$template = $templates[0];
-
-		$oeResult = $this->getDefaultOe();
-		if (isError($oeResult))
-			return $oeResult;
-		$oe = getData($oeResult);
-
-		$titel = $this->ci->p->t('cms', 'neuerEintrag');
-
-		$now = date('Y-m-d H:i:s');
-		$uid = getAuthUID();
-
-		$this->ci->db->trans_start();
-
-		$contentResult = $this->ci->ContentModel->insert([
-			'template_kurzbz' => $template->template_kurzbz,
-			'oe_kurzbz' => $oe,
-			'aktiv' => true,
-			'menu_open' => false,
-			'beschreibung' => '',
-			'insertamum' => $now,
-			'insertvon' => $uid
-		]);
-		if (isError($contentResult))
-			return $contentResult;
-		$content_id = getData($contentResult);
-
-		$spracheResult = $this->ci->ContentspracheModel->insert([
-			'content_id' => $content_id,
-			'sprache' => DEFAULT_LANGUAGE,
-			'version' => 1,
-			'sichtbar' => true,
-			'titel' => $titel,
-			'content' => '<?xml version="1.0" encoding="UTF-8" ?><content></content>',
-			'insertamum' => $now,
-			'insertvon' => $uid
-		]);
-		if (isError($spracheResult))
-			return $spracheResult;
-
-		if ($parent_content_id !== null)
-		{
-			$maxSortResult = $this->ci->ContentchildModel->getMaxSort($parent_content_id);
-			if (isError($maxSortResult))
-				return $maxSortResult;
-
-			$childResult = $this->ci->ContentchildModel->insert([
-				'content_id' => $parent_content_id,
-				'child_content_id' => $content_id,
-				'sort' => getData($maxSortResult) + 1,
-				'insertamum' => $now,
-				'insertvon' => $uid
-			]);
-			if (isError($childResult))
-				return $childResult;
-		}
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'speichernFehlgeschlagen'));
-
-		return success([
-			'content_id' => $content_id,
-			'sprache' => DEFAULT_LANGUAGE,
-			'version' => 1
-		]);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @param string $sprache source language
-	 * @param int $version source version
-	 * @param string $neueSprache target language
-	 * @return object success(array) with contentsprache_id
-	 */
-	public function createTranslation($content_id, $sprache, $version, $neueSprache)
-	{
-		$existsResult = $this->ci->ContentspracheModel->exists($content_id, $neueSprache);
-		if (isError($existsResult))
-			return $existsResult;
-		if (getData($existsResult))
-			return error($this->ci->p->t('cms', 'uebersetzungExistiert'));
-
-		$sourceResult = $this->ci->ContentspracheModel->getOne($content_id, $sprache, $version);
-		if (isError($sourceResult))
-			return $sourceResult;
-		$source = getData($sourceResult);
-
-		$now = date('Y-m-d H:i:s');
-		$uid = getAuthUID();
-
-		$insertResult = $this->ci->ContentspracheModel->insert([
-			'content_id' => $content_id,
-			'sprache' => $neueSprache,
-			'version' => $source->version,
-			'sichtbar' => true,
-			'titel' => $source->titel,
-			'content' => $source->content,
-			// The review feature is gone from this admin, but the columns stay
-			'reviewvon' => null,
-			'reviewamum' => null,
-			'gesperrt_uid' => null,
-			'insertamum' => $now,
-			'insertvon' => $uid,
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-		if (isError($insertResult))
-			return $insertResult;
-
-		return success(['contentsprache_id' => getData($insertResult)]);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return object success(array) with version
-	 */
-	public function createVersion($content_id, $sprache)
-	{
-		$sourceResult = $this->ci->ContentspracheModel->getOne($content_id, $sprache, null);
-		if (isError($sourceResult))
-			return $sourceResult;
-		$source = getData($sourceResult);
-
-		$maxResult = $this->ci->ContentspracheModel->getMaxVersion($content_id, $sprache);
-		if (isError($maxResult))
-			return $maxResult;
-		$newVersion = getData($maxResult) + 1;
-
-		$now = date('Y-m-d H:i:s');
-		$uid = getAuthUID();
-
-		$insertResult = $this->ci->ContentspracheModel->insert([
-			'content_id' => $content_id,
-			'sprache' => $sprache,
-			'version' => $newVersion,
-			'sichtbar' => false,
-			'titel' => $source->titel,
-			'content' => $source->content,
-			// The review feature is gone from this admin, but the columns stay
-			'reviewvon' => null,
-			'reviewamum' => null,
-			'gesperrt_uid' => null,
-			'insertamum' => $now,
-			'insertvon' => $uid,
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-		if (isError($insertResult))
-			return $insertResult;
-
-		return success(['version' => $newVersion]);
-	}
-
-	/**
-	 * Writes the properties of one content version.
-	 * @param array $daten content_id, sprache, version, template_kurzbz, oe_kurzbz,
-	 *        aktiv, menu_open, beschreibung, titel, sichtbar
-	 * @return object success(true) or error
-	 */
-	public function saveProperties($daten)
-	{
-		$versionResult = $this->ci->ContentspracheModel->getOne(
-			$daten['content_id'], $daten['sprache'], $daten['version']
-		);
-		if (isError($versionResult))
-			return $versionResult;
-		$row = getData($versionResult);
-
-		$now = date('Y-m-d H:i:s');
-		$uid = getAuthUID();
-
-		$this->ci->db->trans_start();
-
-		$this->ci->ContentModel->update($daten['content_id'], [
-			'template_kurzbz' => $daten['template_kurzbz'],
-			'oe_kurzbz' => $daten['oe_kurzbz'],
-			'aktiv' => $daten['aktiv'],
-			'menu_open' => $daten['menu_open'],
-			'beschreibung' => $daten['beschreibung'],
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-
-		$this->ci->ContentspracheModel->update($row->contentsprache_id, [
-			'titel' => $daten['titel'],
-			'sichtbar' => $daten['sichtbar'],
-			'updateamum' => $now,
-			'updatevon' => $uid
-		]);
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'speichernFehlgeschlagen'));
-
-		return success(true);
-	}
-
-	// legacy cms checks neither the permission
-	// type nor the lock. The form appears only when the user holds the lock, but the POST
-	// itself is unprotected.
-	/**
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param int $version
-	 * @param array $values field name => value
-	 * @return object success(true) or error
-	 */
-	public function saveContentXml($content_id, $sprache, $version, $values)
-	{
-		$versionResult = $this->ci->ContentspracheModel->getOne($content_id, $sprache, $version);
-		if (isError($versionResult))
-			return $versionResult;
-		$row = getData($versionResult);
-
-		$contentResult = $this->ci->ContentModel->load($content_id);
-		if (isError($contentResult))
-			return $contentResult;
-		$content = getData($contentResult);
-		if (empty($content))
-			return error($this->ci->p->t('cms', 'contentNichtGefunden'));
-
-		$templateResult = $this->ci->TemplateModel->load($content[0]->template_kurzbz);
-		if (isError($templateResult))
-			return $templateResult;
-		$template = getData($templateResult);
-		if (empty($template))
-			return error($this->ci->p->t('cms', 'keineVorlageVorhanden'));
-
-		$schemaResult = $this->ci->xsdschemalib->parseSchema(
-			$template[0]->xsd, $content[0]->template_kurzbz
-		);
-		if (isError($schemaResult))
-			return $schemaResult;
-
-		$xmlResult = $this->ci->xsdschemalib->buildXml(getData($schemaResult), $values);
-		if (isError($xmlResult))
-			return $xmlResult;
-
-		$updateResult = $this->ci->ContentspracheModel->update(
-			$row->contentsprache_id,
-			['content' => getData($xmlResult)]
-		);
-		if (isError($updateResult))
-			return $updateResult;
-
-		return success(true);
-	}
-	
-	/**
-	 * Locks a version for the current user, or takes over an expired lock.
-	 * @param int $contentsprache_id
-	 * @return object success(true) or error
-	 */
-	public function lock($contentsprache_id)
-	{
-		$uid = getAuthUID();
-
-		$rowResult = $this->ci->ContentspracheModel->load($contentsprache_id);
-		if (isError($rowResult))
-			return $rowResult;
-		$rowData = getData($rowResult);
-		if (empty($rowData))
-			return error($this->ci->p->t('cms', 'versionNichtGefunden'));
-
-		$holder = ($rowData[0]->gesperrt_uid === '') ? null : $rowData[0]->gesperrt_uid;
-
-		if ($holder !== null && $holder !== $uid)
-		{
-			$openResult = $this->ci->ContentlogModel->getOpenLock($contentsprache_id, $holder);
-			$openEntry = (!isError($openResult)) ? getData($openResult) : null;
-
-			if (!$this->isLockExpired($holder, $openEntry))
-				return error($this->ci->p->t('cms', 'bereitsGesperrt'));
-		}
-
-		$this->ci->db->trans_start();
-		
-		$this->ci->ContentlogModel->closeOpenEntries($contentsprache_id);
-
-		$logResult = $this->ci->ContentlogModel->insert([
-			'uid' => $uid,
-			'contentsprache_id' => $contentsprache_id,
-			'start' => date('Y-m-d H:i:s')
-		]);
-		if (isError($logResult))
-			return $logResult;
-
-		$updateResult = $this->ci->ContentspracheModel->update($contentsprache_id, [
-			'gesperrt_uid' => $uid
-		]);
-		if (isError($updateResult))
-			return $updateResult;
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'speichernFehlgeschlagen'));
-
-		return success(true);
-	}
-
-	// legacy released ALL locks of the user. Releasing now ends one lock.
-	// The uid predicate stops a user releasing a lock of somebody else.
-	/**
-	 * Releases the lock of the current user on one version.
-	 * @param int $contentsprache_id
-	 * @return object success(true)
-	 */
-	public function releaseOwnLock($contentsprache_id)
-	{
-		$uid = getAuthUID();
-
-		$this->ci->db->trans_start();
-
-		$this->ci->ContentlogModel->closeOpenEntries($contentsprache_id, $uid);
-		$this->ci->ContentspracheModel->releaseLock($contentsprache_id, $uid);
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'speichernFehlgeschlagen'));
-
-		return success(true);
-	}
-
-	/**
-	 * @param int $contentsprache_id
-	 * @return object success(true)
-	 */
-	public function forceRelease($contentsprache_id)
-	{
-		$this->ci->db->trans_start();
-
-		$this->ci->ContentlogModel->closeOpenEntries($contentsprache_id);
-		$this->ci->ContentspracheModel->releaseLock($contentsprache_id);
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'speichernFehlgeschlagen'));
-
-		return success(true);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param int $version
-	 * @return object success(array) gesperrt_uid, start, expires, own, expired, may_force
-	 */
-	public function getLockState($content_id, $sprache, $version)
-	{
-		$versionResult = $this->ci->ContentspracheModel->getOne($content_id, $sprache, $version);
-		if (isError($versionResult))
-			return $versionResult;
-		$row = getData($versionResult);
-
-		// legacy admin.php inserts an empty string, releasing writes NULL.
-		// this code reports NULL.
-		$gesperrt_uid = ($row->gesperrt_uid === '') ? null : $row->gesperrt_uid;
-
-		$logEntry = null;
-		if ($gesperrt_uid !== null)
-		{
-			$lockResult = $this->ci->ContentlogModel->getOpenLock(
-				$row->contentsprache_id, $gesperrt_uid
-			);
-			$logEntry = (!isError($lockResult)) ? getData($lockResult) : null;
-		}
-
-		return success([
-			'contentsprache_id' => (int) $row->contentsprache_id,
-			'gesperrt_uid' => $gesperrt_uid,
-			'start' => $logEntry ? $logEntry->start : null,
-			'own' => ($gesperrt_uid !== null && $gesperrt_uid === getAuthUID()),
-			'expired' => $this->isLockExpired($gesperrt_uid, $logEntry),
-			'expires' => $this->lockExpiryDate($logEntry),
-			'may_force' => $this->ci->permissionlib->isBerechtigt('basis/cms_sperrfreigabe', 'su')
-		]);
-	}
-
-	/**
-	 * End of the lock window, null if the entry carries no start.
-	 * @param stdClass|null $logEntry
-	 * @return string|null
-	 */
-	private function lockExpiryDate($logEntry)
-	{
-		if ($logEntry === null || empty($logEntry->start))
-			return null;
-
-		$ttlHours = (int) $this->ci->config->item('lock_ttl_hours');
-
-		// lock() writes start with PHP time, so stay on PHP time.
-		return date('Y-m-d H:i:s', strtotime($logEntry->start) + $ttlHours * 3600);
-	}
-
-	// Locks now age out after lock_ttl_hours.
-	/**
-	 * A lock without a log entry has no age and counts as expired.
-	 * @param string|null $gesperrt_uid
-	 * @param stdClass|null $logEntry
-	 * @return bool
-	 */
-	private function isLockExpired($gesperrt_uid, $logEntry)
-	{
-		if ($gesperrt_uid === null)
-			return false;
-
-		$expires = $this->lockExpiryDate($logEntry);
-
-		return $expires === null || strtotime($expires) < time();
-	}
-	
-	/**
-	 * @param int $content_id
-	 * @return object success(true) or error
-	 */
-	public function deleteContent($content_id)
-	{
-		$this->ci->db->trans_start();
-
-		$this->ci->ContentchildModel->deleteByContent($content_id);
-		$this->ci->ContentlogModel->deleteByContent($content_id);
-		$this->ci->ContentspracheModel->deleteByContent($content_id);
-		$this->ci->ContentgruppeModel->deleteByContent($content_id);
-		$this->ci->ContentModel->delete($content_id);
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'loeschenNichtMoeglichReferenzen'));
-
-		return success(true);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param int $version
-	 * @return object success(true) or error
-	 */
-	public function deleteVersion($content_id, $sprache, $version)
-	{
-		if ($sprache === DEFAULT_LANGUAGE)
-		{
-			$countResult = $this->ci->ContentspracheModel->getNumberOfVersions($content_id, $sprache);
-			if (isError($countResult))
-				return $countResult;
-			if (getData($countResult) === 1)
-				return error($this->ci->p->t('cms', 'letzteVersionNichtLoeschbar'));
-		}
-
-		$versionResult = $this->ci->ContentspracheModel->getOne($content_id, $sprache, $version);
-		if (isError($versionResult))
-			return $versionResult;
-		$row = getData($versionResult);
-
-		$this->ci->db->trans_start();
-
-		$this->ci->ContentlogModel->deleteByContentsprache($row->contentsprache_id);
-		$this->ci->ContentspracheModel->deleteVersion($content_id, $sprache, $version);
-
-		$this->ci->db->trans_complete();
-
-		if ($this->ci->db->trans_status() === false)
-			return error($this->ci->p->t('cms', 'loeschenFehlgeschlagen'));
-
-		return success(true);
-	}
-}

application/libraries/CmsLib.php

@@ -42,12 +42,10 @@ class CmsLib
 	 * @param int		$version
 	 * @param string	$sprache
 	 * @param boolean	$sichtbar
-	 * @param boolean	$log		false suppresses the click log entry. The CMS admin
-	 *								preview renders a content without counting a view.
 	 * 
 	 * @return stdClass
 	 */
-	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true, $log = true)
+	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
 		if (!is_numeric($content_id))
 			return error('ContentID ist ungueltig');
@@ -74,7 +72,7 @@ class CmsLib
 			return $content;
 
 		// Legt einen Logeintrag für die Klickstatistik an
-		if ($log && defined('LOG_CONTENT') && LOG_CONTENT) {
+		if (defined('LOG_CONTENT') && LOG_CONTENT) {
 			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
 			if (isLogged()) {
 				$request_data = 'content_id=' . $content_id;

application/libraries/CryptLib.php

@@ -25,4 +25,17 @@ class CryptLib
 
 		return $cipher->encrypt($value);
 	}
-}
+
+	public static function RIJNDAEL_256_ECB_DECRYPT($value, $key, $paddingDisabled = false)
+	{
+		if (isEmptyString($value) || isEmptyString($key)) return null;
+
+		$cipher = new Rijndael(Rijndael::MODE_ECB);
+		$cipher->setBlockLength(256);
+		$cipher->setKey($key);
+
+		if ($paddingDisabled === true) $cipher->disablePadding();
+
+		return $cipher->decrypt($value);
+	}
+}

application/libraries/FreeBusyLib.php

@@ -0,0 +1,242 @@
+<?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');
+
+// require_once('../../include/ical.class.php');
+
+class FreeBusyLib
+{
+	private $_ci; // Code igniter instance
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model("ressource/Zeitsperre_model", "ZeitsperreModel");
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getFreeBusy($url)
+	{
+		$fileStream = @fopen($url, "r");
+		if (!$fileStream)
+			return [];
+
+		$busyTimeslots = [];
+		$fileContent = file_get_contents($url);
+		if (mb_strpos($fileContent, "BEGIN:VFREEBUSY") !== false) {
+			$busyTimeslots = $this->parseFreeBusyFormat($fileContent);
+		} else {
+			$busyTimeslots = $this->parseConventionalFormat($fileContent);
+		}
+
+		return $busyTimeslots;
+	}
+
+	public function getDefaultInternalFreeBusy($uid)
+	{
+		$events = [];
+
+		$this->_ci->load->library('StundenplanLib');
+
+		$startDate = new DateTime();
+		$startDate = $startDate->format("Y-m-d");
+		$endDate = new DateTime();
+		$endDate->modify("+1 year");
+		$endDate = $endDate->format("Y-m-d");
+
+		$userEvents = getData($this->_ci->stundenplanlib->getEventsUser($startDate, $endDate, $uid));
+		if ($userEvents && count($userEvents)) {
+			$userEvents = array_map(
+				function ($event) {
+					return [
+						"start" => $event->datum . " " . $event->beginn,
+						"end" => $event->datum . " " . $event->ende,
+					];
+				},
+				$userEvents
+			);
+			$events = array_merge($events, $userEvents);
+		}
+
+		$userAbsences = getData($this->_ci->ZeitsperreModel->getZeitsperre($uid));
+		if ($userAbsences && count($userAbsences)) {
+			$today = new DateTime();
+			$today = $today->format("Y-m-d");
+			$userAbsences = array_filter(
+				$userAbsences,
+				function ($absence) use ($today) {
+					return $absence->bisdatum >= $today;
+				}
+			);
+			$userAbsences = array_map(
+				function ($absence) {
+					return [
+						"start" => $absence->vondatum . " 00:00:00",
+						"end" => $absence->bisdatum . " 23:59:00",
+					];
+				},
+				$userAbsences
+			);
+			$events = array_merge($events, $userAbsences);
+		}
+
+		return $events;
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	private function parseConventionalFormat($fileContent)
+	{
+		$fileContentRows = explode("\n", $fileContent);
+		$fileContentRows = array_map(function ($row) {
+			return trim($row);
+		}, $fileContentRows);
+
+		$busyTimeslots = [];
+		$isParsingEvent = false;
+		$parsedEvent = ["start" => null, "end" => null];
+		$currentDateTime = new DateTime();
+		$currentDateTime = $currentDateTime->format("Y-m-d H:i:s");
+
+		foreach ($fileContentRows as $row) {
+			if (mb_strpos($row, "BEGIN:VEVENT") !== false) {
+				$isParsingEvent = true;
+			} else if (mb_strpos($row, "END:VEVENT") !== false) {
+				if (
+					$isParsingEvent &&
+					$parsedEvent["start"] &&
+					$parsedEvent["end"] &&
+					$parsedEvent["end"] > $currentDateTime
+				) {
+					$busyTimeslots[] = $parsedEvent;
+				}
+
+				$isParsingEvent = false;
+				$parsedEvent["start"] = null;
+				$parsedEvent["end"] = null;
+			} else if (mb_strpos($row, "DTSTART;VALUE=DATE") !== false) {
+				$startDateString = explode(":", $row)[1];
+				$start = substr($startDateString, 0, 4) . "-" . substr($startDateString, 4, 2) . "-" . substr($startDateString, 6, 2) . " 00:00:00";
+				$parsedEvent["start"] = $start;
+			} else if (mb_strpos($row, "DTSTART") !== false) {
+				$timestamp = explode(":", $row)[1];
+
+				if (mb_substr($timestamp, -1) === "Z") {
+					$timestamp = $this->convertTimestampToLocalTimezone($timestamp);
+				} else if (mb_strpos($row, "TZID=") !== false) {
+					$remainingString = explode("TZID=", $row)[1];
+					$remainingString = explode(":", $remainingString)[0];
+					$timezoneIdentifier = explode(";", $remainingString)[0];
+					$timestamp = $this->convertTimestampToLocalTimezone($timestamp, $timezoneIdentifier);
+				}
+
+				$startDate = substr($timestamp, 0, 4) . "-" . substr($timestamp, 4, 2) . "-" . substr($timestamp, 6, 2);
+				$startTime = substr($timestamp, 9, 2) . ":" . substr($timestamp, 11, 2) . ":" . substr($timestamp, 13, 2);
+				$parsedEvent["start"] = $startDate . " " . $startTime;
+			} else if (mb_strpos($row, "DTEND;VALUE=DATE") !== false) {
+				$endDateString = explode(":", $row)[1];
+				$end = substr($endDateString, 0, 4) . "-" . substr($endDateString, 4, 2) . "-" . substr($endDateString, 6, 2) . " 00:00:00";
+				$parsedEvent["end"] = $end;
+			} else if (mb_strpos($row, "DTEND") !== false) {
+				$timestamp = explode(":", $row)[1];
+				if (mb_substr($timestamp, -1) === "Z") {
+					$timestamp = $this->convertTimestampToLocalTimezone($timestamp);
+				} else if (mb_strpos($row, "TZID=") !== false) {
+					$remainingString = explode("TZID=", $row)[1];
+					$remainingString = explode(":", $remainingString)[0];
+					$timezoneIdentifier = explode(";", $remainingString)[0];
+					$timestamp = $this->convertTimestampToLocalTimezone($timestamp, $timezoneIdentifier);
+				}
+
+				$endDate = substr($timestamp, 0, 4) . "-" . substr($timestamp, 4, 2) . "-" . substr($timestamp, 6, 2);
+				$endTime = substr($timestamp, 9, 2) . ":" . substr($timestamp, 11, 2) . ":" . substr($timestamp, 13, 2);
+				$parsedEvent["end"] = $endDate . " " . $endTime;
+			}
+		}
+
+		return $busyTimeslots;
+	}
+
+	private function parseFreeBusyFormat($fileContent)
+	{
+		$fileContentRows = explode("\n", $fileContent);
+		$fileContentRows = array_map(function ($row) {
+			return trim($row);
+		}, $fileContentRows);
+
+		$busyTimeslots = [];
+		$currentDateTime = new DateTime();
+		$currentDateTime = $currentDateTime->format("Y-m-d H:i:s");
+
+		foreach ($fileContentRows as $row) {
+			if (
+				mb_strpos($row, "VFREEBUSY") !== false ||
+				mb_strpos($row, "FREEBUSY") === false ||
+				mb_strpos($row, "FBTYPE=FREE") !== false
+			)
+				continue;
+
+			$timestamps = explode(":", $row)[1];
+			$timestamps = explode(",", $timestamps);
+			foreach ($timestamps as $timestamp) {
+				$startEndTimestamps = explode("/", $timestamp);
+
+				$startTimestamp = $startEndTimestamps[0];
+				$endTimestamp = $startEndTimestamps[1];
+
+				if (mb_substr($startTimestamp, -1) === "Z") {
+					$startTimestamp = $this->convertTimestampToLocalTimezone($startTimestamp);
+				}
+				if (mb_substr($endTimestamp, -1) === "Z") {
+					$endTimestamp = $this->convertTimestampToLocalTimezone($endTimestamp);
+				}
+
+				$startDate = substr($startTimestamp, 0, 4) . "-" . substr($startTimestamp, 4, 2) . "-" . substr($startTimestamp, 6, 2);
+				$startTime = substr($startTimestamp, 9, 2) . ":" . substr($startTimestamp, 11, 2) . ":" . substr($startTimestamp, 13, 2);
+				$start = $startDate . " " . $startTime;
+
+				$endDate = substr($endTimestamp, 0, 4) . "-" . substr($endTimestamp, 4, 2) . "-" . substr($endTimestamp, 6, 2);
+				$endTime = substr($endTimestamp, 9, 2) . ":" . substr($endTimestamp, 11, 2) . ":" . substr($endTimestamp, 13, 2);
+				$end = $endDate . " " . $endTime;
+
+				if ($end < $currentDateTime)
+					continue;
+
+				$busyTimeslots[] = ["start" => $start, "end" => $end];
+			}
+		}
+
+		return $busyTimeslots;
+	}
+
+	private function convertTimestampToLocalTimezone($timestamp, $originalTimezoneIdentifier = "UTC")
+	{
+		$originalTimezone = new DateTimeZone($originalTimezoneIdentifier);
+		$localTimezone = new DateTimeZone("Europe/Vienna");
+
+		$date = new DateTime($timestamp, $originalTimezone);
+		$date->setTimezone($localTimezone);
+		return $date->format("Ymd\THis");
+	}
+}

application/libraries/StundenplanLib.php

@@ -7,7 +7,6 @@ use \DateTime as DateTime;
 use \DateTimeZone as DateTimeZone;
 use \DateInterval as DateInterval;
 use \DatePeriod as DatePeriod;
-use CI3_Events as Events;
 
 class StundenplanLib
 {
@@ -117,6 +116,7 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
+		$this->_ci->addMeta("stundenplanData", $stundenplan_data);
 		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
@@ -144,7 +144,7 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
-		$function_error = $this->expandObjectInformation($stundenplan_data, true);
+		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
 		
@@ -304,7 +304,7 @@ class StundenplanLib
 		return success($lektoren);
 	}
 
-	public function expandObjectInformation($data, $callExtensionsEvent = false)
+	public function expandObjectInformation($data)
 	{
 		$this->_ci =& get_instance();
 		
@@ -392,21 +392,40 @@ class StundenplanLib
 			$item->gruppe = $gruppe_obj_array;
 			$item->lektor = $lektor_obj_array;
 
-		}
-		
-		// info retrieved from extensions might not be necessary for some stundenplan use cases so the event
-		// will be gated behind this flag
-		
-		if($callExtensionsEvent) {
-			Events::trigger(
-				'extendStundenplanData',
-				function & () use (&$data)
-				{
-					return $data;
-				}
+			$this->_ci->load->library('PermissionLib');
+			$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'sui');
+
+			$now = time();
+			$res_lektor_start = $this->jump_day($now, RES_TAGE_LEKTOR_MIN - 1);
+			$res_lektor_ende  = mktime(0, 0, 0, date('m', $now), date('d', $now) + RES_TAGE_LEKTOR_BIS, date('Y', $now));
+
+			$start_date = is_numeric($item->beginn) ? $item->beginn : strtotime($item->beginn);
+			if (!date('w', $start_date)) {
+				$start_date = $this->jump_day($start_date, 1);
+			}
+
+			$start_date_str = date('Y-m-d', $start_date);
+			$res_lektor_start_str = date('Y-m-d', $res_lektor_start);
+			$res_lektor_ende_str = date('Y-m-d', $res_lektor_ende);
+
+			$show_delete = (
+				(
+					$berechtigt_begrenzt &&
+					(
+						(isset($item->insertvon) && $item->insertvon == getAuthUID()) ||
+						(isset($item->uids) && in_array(getAuthUID(), $item->uids))
+					)
+				) &&
+				$start_date_str >= $res_lektor_start_str &&
+				$start_date_str <= $res_lektor_ende_str
 			);
+
+			if ($show_delete)
+				$item->deletable = true;
+			else
+				$item->deletable = false;
+
 		}
-		
 	}
 
 	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz)
@@ -501,6 +520,212 @@ class StundenplanLib
 		return success($stundenplan_data);
 	}
 
+	public function addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren = null, $studiengang = null, $semester = null, $verband = null, $gruppe = null, $spezialgruppe = null)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		$this->_ci->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->library('PermissionLib');
+
+		$startTime = new DateTime($start);
+		$endTime = new DateTime($end);
+
+		$stunden = $this->_ci->StundeModel->loadWhere(array(
+			'beginn <' => $endTime->format('H:i:s'),
+			'ende >' => $startTime->format('H:i:s')
+		));
+
+		if (!hasData($stunden))
+		{
+			return error("Keine Stunden vorhanden");
+		}
+
+		$stunden = array_column(getData($stunden), 'stunde');
+
+		$this->_ci->StundenplandevModel->db->select('1');
+		$this->_ci->StundenplandevModel->db->where('datum', $startTime->format('Y-m-d'));
+		$this->_ci->StundenplandevModel->db->where('ort_kurzbz', $ort_kurzbz);
+		$this->_ci->StundenplandevModel->db->where_in('stunde', $stunden);
+		$stundenplandev_belegung = $this->_ci->StundenplandevModel->load();
+
+		$this->_ci->StundenplanModel->db->select('1');
+		$this->_ci->StundenplanModel->db->where('ort_kurzbz', $ort_kurzbz);
+		$this->_ci->StundenplanModel->db->where('datum', $startTime->format('Y-m-d'));
+		$this->_ci->StundenplanModel->db->where_in('stunde', $stunden);
+		$stundenplan_belegung = $this->_ci->StundenplanModel->load();
+
+		if ((hasData($stundenplandev_belegung) || hasData($stundenplan_belegung))
+			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
+			return error ('lvplan/bereitsReserviert');
+
+		$this->_ci->ReservierungModel->addSelect('stunde');
+		$reservation_hours = $this->_ci->ReservierungModel->loadWhere(array('datum' => $startTime->format('Y-m-d'), 'ort_kurzbz' => $ort_kurzbz));
+
+
+		if (isError($reservation_hours))
+			return $reservation_hours;
+
+		$reservation_hours = hasData($reservation_hours) ? array_column(getData($reservation_hours), 'stunde') : array();
+
+		if (!empty(array_intersect($stunden, $reservation_hours))
+			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
+			return error("lvplan/bereitsReserviert");
+
+
+		if (!empty($lektoren))
+		{
+			foreach ($lektoren as $lektor)
+			{
+				$insert = array('ort_kurzbz' => $ort_kurzbz,
+					'datum' => $startTime->format('Y-m-d'),
+					'titel' => $title,
+					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
+					'beschreibung' => $beschreibung,
+					'insertvon' => getAuthUID(),
+					'uid' => $lektor,
+					'semester' => is_null($semester) ? null : $semester,
+					'verband' => is_null($verband) ? null : $verband,
+					'gruppe' => is_null($gruppe) ? null : $gruppe,
+					'gruppe_kurzbz' => is_null($spezialgruppe) ? null : $spezialgruppe,
+				);
+
+				foreach ($stunden as $stunde)
+				{
+					$insert['stunde'] = $stunde;
+					$check_insert = $this->_ci->ReservierungModel->insert($insert);
+					if (isError($check_insert))
+						return $check_insert;
+				}
+			}
+		}
+		else
+		{
+			foreach ($stunden as $stunde)
+			{
+				$check_insert = $this->_ci->ReservierungModel->insert(array(
+					'ort_kurzbz' => $ort_kurzbz,
+					'uid' => getAuthUID(),
+					'stunde' => $stunde,
+					'datum' => $startTime->format('Y-m-d'),
+					'titel' => $title,
+					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
+					'beschreibung' => $beschreibung,
+					'insertvon' => getAuthUID()
+				));
+				if (isError($check_insert))
+					return $check_insert;
+			}
+		}
+
+		return success("Erfolgreich");
+	}
+
+	public function deleteReservation($reservierung_id)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->_ci->load->library('PermissionLib');
+
+
+		$this->_ci->ReservierungModel->db->where_in('reservierung_id', $reservierung_id);
+		$reservation = $this->_ci->ReservierungModel->load();
+		if (isError($reservation))
+			return $reservation;
+
+		if (!hasData($reservation))
+			return error("Reservierungen nicht gefunden");
+
+		$reservations = getData($reservation);
+
+		$today = new DateTime();
+		foreach ($reservations as $reservierung)
+		{
+			if ($today->format('Y-m-d') > $reservierung->datum)
+				return error("Vergangene Reservierungen können nicht gelöscht werden");
+
+			if (($this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt')) && ($reservierung->insertvon == getAuthUID() || $reservierung->uid === getAuthUID()))
+			{
+				$delete_result = $this->_ci->ReservierungModel->delete($reservierung->reservierung_id);
+
+				if (isError($delete_result))
+					return $delete_result;
+			}
+		}
+		return success("Erfolgreich");
+	}
+
+
+	public function getReservableMap($ort_kurzbz, $start_date, $end_date)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->library('PermissionLib');
+
+		$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'suid');
+		$berechtigt_erweitert = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung', 'suid');
+
+		$ort_data = $this->_ci->OrtModel->load($ort_kurzbz);
+		if (isError($ort_data) || !hasData($ort_data))
+			return [];
+
+		$ort_data = getData($ort_data)[0];
+
+		if (!$ort_data->reservieren)
+			return [];
+
+		if (!$berechtigt_begrenzt && !$berechtigt_erweitert)
+			return [];
+
+		$start_ts = is_numeric($start_date) ? (int)$start_date : strtotime($start_date);
+		$end_ts = is_numeric($end_date) ? (int)$end_date : strtotime($end_date);
+
+		if (!$start_ts || !$end_ts)
+			return [];
+
+		if ($end_ts < $start_ts)
+		{
+			$tmp = $start_ts;
+			$start_ts = $end_ts;
+			$end_ts = $tmp;
+		}
+
+		$now = time();
+		$tage_min = defined('RES_TAGE_LEKTOR_MIN') ? (int)RES_TAGE_LEKTOR_MIN : 0;
+		$tage_bis = defined('RES_TAGE_LEKTOR_BIS') ? (int)RES_TAGE_LEKTOR_BIS : 0;
+
+		$datum_res_lektor_start = $this->jump_day($now, $tage_min - 1);
+		$datum_res_lektor_ende = $this->jump_day($now, $tage_bis);
+
+		$start_ymd_allowed = date('Y-m-d', $datum_res_lektor_start);
+		$end_ymd_allowed = date('Y-m-d', $datum_res_lektor_ende);
+
+		$result = [];
+
+		$current = strtotime(date('Y-m-d', $start_ts) . ' 00:00:00');
+		$end_day = strtotime(date('Y-m-d', $end_ts) . ' 00:00:00');
+
+		while ($current <= $end_day)
+		{
+			$ymd = date('Y-m-d', $current);
+
+			$result[$ymd] = ($ymd >= $start_ymd_allowed && $ymd <= $end_ymd_allowed) ? true : false;
+
+			$current = $this->jump_day($current, 1);
+		}
+
+		return success($result);
+	}
+
+	private function jump_day($timestamp, $days)
+	{
+		$days = (int)$days;
+		$prefix = ($days >= 0 ? '+' : '');
+		return strtotime($prefix . $days . ' days', $timestamp);
+	}
+
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

application/libraries/XsdSchemaLib.php

@@ -1,195 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-use \DOMDocument as DOMDocument;
-
-class XsdSchemaLib
-{
-	private $ci;
-
-	public function __construct()
-	{
-		$this->ci =& get_instance();
-	}
-
-	/**
-	 * Converts an XSD into a field schema.
-	 * @param string $xsd            the XSD as a string
-	 * @param string $templateKurzbz short name of the template
-	 * @return object success(array) with template_kurzbz, root, fields
-	 */
-	public function parseSchema($xsd, $templateKurzbz)
-	{
-		libxml_use_internal_errors(true);
-		$dom = new DOMDocument();
-
-		if (!$dom->loadXML($xsd))
-		{
-			libxml_clear_errors();
-			return error($this->ci->p->t('cms', 'xsdUngueltig'));
-		}
-
-		libxml_clear_errors();
-
-		$root = null;
-		$fields = array();
-		$this->_walkElements($dom->documentElement, $root, $fields);
-
-		return success(array(
-			'template_kurzbz' => $templateKurzbz,
-			'root'   => $root,
-			'fields' => $fields
-		));
-	}
-
-	/**
-	 * Reads the values of a content from the XML.
-	 * @param string $xml    the value of tbl_contentsprache.content
-	 * @param array  $schema the result of parseSchema
-	 * @return object success(array) field name => value
-	 */
-	public function extractValues($xml, $schema)
-	{
-		$values = array();
-
-		foreach ($schema['fields'] as $field)
-		{
-			$values[$field['name']] = '';
-		}
-
-		if ($xml === null || trim($xml) === '')
-		{
-			return success($values);
-		}
-
-		libxml_use_internal_errors(true);
-		$dom = new DOMDocument();
-
-		if (!$dom->loadXML($xml))
-		{
-			libxml_clear_errors();
-			return success($values);
-		}
-
-		libxml_clear_errors();
-
-		foreach ($schema['fields'] as $field)
-		{
-			$nodes = $dom->getElementsByTagName($field['name']);
-			if ($nodes->length > 0)
-			{
-				$values[$field['name']] = $nodes->item(0)->nodeValue;
-			}
-		}
-
-		return success($values);
-	}
-
-	/**
-	 * Builds the XML from the values.
-	 * @param array $schema the result of parseSchema
-	 * @param array $values field name => value
-	 * @return object success(string) the XML
-	 */
-	public function buildXml($schema, $values)
-	{
-		$xml  = '<?xml version="1.0" encoding="UTF-8"?>';
-		$xml .= "\n<" . $schema['root'] . '>';
-
-		foreach ($schema['fields'] as $field)
-		{
-			$value = isset($values[$field['name']]) ? $values[$field['name']] : '';
-			$xml .= "\n<" . $field['name'] . '><![CDATA[' . $this->_escapeCdata($value) . ']]></' . $field['name'] . '>';
-		}
-
-		$xml .= "\n</" . $schema['root'] . '>';
-
-		libxml_use_internal_errors(true);
-		$check = new DOMDocument();
-
-		if (!$check->loadXML($xml))
-		{
-			libxml_clear_errors();
-			return error($this->ci->p->t('cms', 'xmlUngueltig'));
-		}
-
-		libxml_clear_errors();
-
-		return success($xml);
-	}
-
-	// -------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Walks xs:element nodes recursively.
-	 * The first element without a type attribute is the root.
-	 * Elements with a type attribute are fields.
-	 * xs:complexType and xs:sequence are traversed and ignored.
-	 */
-	private function _walkElements($node, &$root, &$fields)
-	{
-		if ($node->nodeType !== XML_ELEMENT_NODE)
-		{
-			return;
-		}
-
-		$localName = $node->localName;
-
-		if ($localName === 'element')
-		{
-			$typeAttr = $node->getAttribute('type');
-
-			if ($typeAttr === '')
-			{
-				if ($root === null)
-				{
-					$root = $node->getAttribute('name');
-				}
-			}
-			else
-			{
-				$minOccurs = $node->getAttribute('minOccurs');
-				$required = ($minOccurs === '') ? true : ((int)$minOccurs > 0);
-
-				$fields[] = array(
-					'name'     => $node->getAttribute('name'),
-					'type'     => $this->_mapType($typeAttr),
-					'required' => $required
-				);
-			}
-		}
-
-		foreach ($node->childNodes as $child)
-		{
-			$this->_walkElements($child, $root, $fields);
-		}
-	}
-
-	/**
-	 * Maps an XSD type to the field schema type.
-	 */
-	private function _mapType($xsdType)
-	{
-		$map = array(
-			'xs:string'          => 'string',
-			'xs:decimal'         => 'string',
-			'xs:integer'         => 'string',
-			'xs:positiveInteger' => 'string',
-			'xs:date'            => 'date',
-			'wysiwyg'            => 'wysiwyg',
-			'file'               => 'file',
-			'boolean'            => 'boolean'
-		);
-
-		return isset($map[$xsdType]) ? $map[$xsdType] : 'string';
-	}
-
-	// Escapes ]]> in the value. The legacy code does not do this and writes broken XML.
-	private function _escapeCdata($value)
-	{
-		return str_replace(']]>', ']]]]><![CDATA[>', $value);
-	}
-}

application/models/accounting/Vertrag_model.php

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

application/models/content/Content_model.php

@@ -323,266 +323,4 @@ class Content_model extends DB_Model
 
 		return success(isset($result[$root_content_id]) ? $result[$root_content_id] : null);
 	}
-
-	/**
-	 * Root contents without a parent in tbl_contentchild. Excludes news.
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getRootContent()
-	{
-		$query = '
-			SELECT *
-			FROM (
-				SELECT DISTINCT ON (content_id) *
-				FROM campus.tbl_content
-					LEFT JOIN campus.tbl_contentchild USING (content_id)
-				WHERE tbl_content.template_kurzbz <> ?
-					AND content_id NOT IN (
-						SELECT child_content_id FROM campus.tbl_contentchild
-						WHERE child_content_id = tbl_content.content_id)
-			) AS a
-			ORDER BY sort, content_id
-		';
-
-		return $this->execReadOnlyQuery($query, ['news']);
-	}
-
-	/**
-	 * Recent news from the last two months, max 100 rows.
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getNewsContent()
-	{
-		$query = "
-			SELECT *
-			FROM campus.tbl_content
-				JOIN campus.tbl_news USING (content_id)
-			WHERE tbl_news.datum >= now() - '2 month'::interval
-			ORDER BY datum DESC
-			LIMIT 100
-		";
-
-		return $this->execReadOnlyQuery($query);
-	}
-
-	/**
-	 * Search contents by content_id or titel. Excludes news. Returns content_ids only.
-	 * @param array $searchItems search terms
-	 * @return stdClass success with array of rows or error
-	 */
-	public function searchCms($searchItems)
-	{
-		if (empty($searchItems))
-			return success([]);
-
-		$conditions = [];
-		$params = [];
-		foreach ($searchItems as $term)
-		{
-			$conditions[] = '(content_id::text = ? OR lower(titel) LIKE lower(?))';
-			$params[] = $term;
-			$params[] = '%' . $term . '%';
-		}
-
-		$query = '
-			SELECT DISTINCT tbl_content.content_id
-			FROM campus.tbl_contentsprache
-				JOIN campus.tbl_content USING (content_id)
-			WHERE tbl_content.template_kurzbz <> ?
-				AND (' . implode(' OR ', $conditions) . ')
-			ORDER BY content_id
-		';
-
-		array_unshift($params, 'news');
-
-		return $this->execReadOnlyQuery($query, $params);
-	}
-
-	/**
-	 * Per content metadata for the tree filter. Excludes news, like getRootContent().
-	 * updateamum is the last touch on the content or on any of its versions.
-	 *
-	 * contentlength counts the visible characters of the newest version, the way getOne()
-	 * picks it: the default language first, then the highest version. The XML scaffolding,
-	 * the CDATA markers, the HTML tags, the entities and every space drop out, so a content
-	 * that nobody ever filled measures 0 whatever empty shape it carries. The title counts
-	 * too, so a content with a title and no body measures short instead of zero.
-	 *
-	 * @param string $uid current user, decides the mine flag
-	 * @param string $sprache preferred language of the measured version
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getTreeMeta($uid, $sprache)
-	{
-		$query = "
-			SELECT tbl_content.content_id,
-				(SELECT COUNT(*) FROM campus.tbl_contentchild
-				 WHERE tbl_contentchild.content_id = tbl_content.content_id) AS childcount,
-				tbl_content.insertamum,
-				GREATEST(
-					tbl_content.updateamum,
-					(SELECT MAX(updateamum) FROM campus.tbl_contentsprache
-					 WHERE tbl_contentsprache.content_id = tbl_content.content_id)
-				) AS updateamum,
-				COALESCE(
-					tbl_content.insertvon = ? OR tbl_content.updatevon = ? OR EXISTS (
-						SELECT 1 FROM campus.tbl_contentsprache
-						WHERE tbl_contentsprache.content_id = tbl_content.content_id
-							AND (tbl_contentsprache.insertvon = ?
-								OR tbl_contentsprache.updatevon = ?)
-					),
-					false
-				) AS mine,
-				(SELECT length(
-						regexp_replace(
-							regexp_replace(
-								regexp_replace(
-									replace(replace(cs.content::text, '<![CDATA[', ''), ']]>', ''),
-									'<[^>]*>', '', 'g'),
-								'&[a-zA-Z]+;|&#[0-9]+;', '', 'g'),
-							'\s+', '', 'g')
-					)
-				 FROM campus.tbl_contentsprache cs
-				 WHERE cs.content_id = tbl_content.content_id
-				 ORDER BY (cs.sprache = ?) DESC, cs.version DESC
-				 LIMIT 1) AS contentlength
-			FROM campus.tbl_content
-			WHERE tbl_content.template_kurzbz <> ?
-		";
-
-		return $this->execReadOnlyQuery(
-			$query, [$uid, $uid, $uid, $uid, $sprache, 'news']
-		);
-	}
-
-	/**
-	 * All contents eligible as children: excludes ancestors, self, and news.
-	 * @param int $content_id the content to find children for
-	 * @param string $sprache language for the titel subselect
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getPossibleChilds($content_id, $sprache)
-	{
-		$query = '
-			SELECT content_id, oe_kurzbz, template_kurzbz,
-				(SELECT titel FROM campus.tbl_contentsprache
-				 WHERE sprache = ? AND content_id = tbl_content.content_id
-				 ORDER BY version LIMIT 1) AS titel
-			FROM campus.tbl_content
-			WHERE content_id NOT IN (
-					WITH RECURSIVE parents(content_id, child_content_id) AS (
-						SELECT content_id, child_content_id FROM campus.tbl_contentchild
-						WHERE child_content_id = ?
-						UNION ALL
-						SELECT cc.content_id, cc.child_content_id
-						FROM campus.tbl_contentchild cc, parents
-						WHERE cc.child_content_id = parents.content_id)
-					SELECT content_id FROM parents GROUP BY content_id)
-				AND content_id <> ?
-				AND template_kurzbz <> ?
-			ORDER BY titel
-		';
-
-		return $this->execReadOnlyQuery($query, [$sprache, $content_id, $content_id, 'news']);
-	}
-
-	/**
-	 * Where a content is referenced. Returns [{table, label}] for the delete dialog.
-	 * Tolerates missing addon/testtool schemas.
-	 * @param int $content_id
-	 * @return stdClass success with flat array or error
-	 */
-	public function getUsage($content_id)
-	{
-		$coreQuery = "
-			SELECT 'campus.tbl_infoscreen_content' AS \"table\",
-				infoscreen_id::text AS label
-			FROM campus.tbl_infoscreen_content WHERE content_id = ?
-			UNION ALL
-			SELECT 'campus.tbl_news', betreff
-			FROM campus.tbl_news WHERE content_id = ?
-			UNION ALL
-			SELECT 'public.tbl_ort', ort_kurzbz
-			FROM public.tbl_ort WHERE content_id = ?
-			UNION ALL
-			SELECT 'public.tbl_service', bezeichnung
-			FROM public.tbl_service WHERE content_id = ?
-			UNION ALL
-			SELECT 'public.tbl_statistik', bezeichnung
-			FROM public.tbl_statistik WHERE content_id = ?
-		";
-		$coreParams = [$content_id, $content_id, $content_id, $content_id, $content_id];
-
-		$coreResult = $this->execReadOnlyQuery($coreQuery, $coreParams);
-		$rows = [];
-
-		if (!isError($coreResult) && getData($coreResult))
-			$rows = getData($coreResult);
-
-		// Optional schemas: testtool and addon may not exist. A failing query still writes a
-		// db error into the response envelope, so check for the table before querying it.
-		$optionalQueries = [
-			[
-				'testtool', 'tbl_ablauf_vorgaben',
-				"SELECT 'testtool.tbl_ablauf_vorgaben' AS \"table\",
-					ablauf_vorgaben_id::text AS label
-				FROM testtool.tbl_ablauf_vorgaben WHERE content_id = ?"
-			],
-			[
-				'addon', 'tbl_software',
-				"SELECT 'addon.tbl_software' AS \"table\",
-					software_id::text AS label
-				FROM addon.tbl_software WHERE content_id = ?"
-			]
-		];
-
-		foreach ($optionalQueries as $opt)
-		{
-			if (!$this->tableExists($opt[0], $opt[1]))
-				continue;
-
-			$result = $this->execReadOnlyQuery($opt[2], [$content_id]);
-			if (!isError($result) && getData($result))
-				$rows = array_merge($rows, getData($result));
-		}
-
-		return success($rows);
-	}
-
-	/**
-	 * True if a base table exists. Guards the optional testtool and addon schemas.
-	 * @param string $schema
-	 * @param string $table
-	 * @return bool
-	 */
-	private function tableExists($schema, $table)
-	{
-		$query = "
-			SELECT 1 AS exists
-			FROM information_schema.tables
-			WHERE table_catalog = ? AND table_schema = ? AND table_name = ?
-		";
-
-		return hasData($this->execReadOnlyQuery($query, [DB_NAME, $schema, $table]));
-	}
-
-	/**
-	 * Returns oe_kurzbz for a content as a string.
-	 * @param int $content_id
-	 * @return stdClass success with string or error
-	 */
-	public function getOeKurzbz($content_id)
-	{
-		$query = 'SELECT oe_kurzbz FROM campus.tbl_content WHERE content_id = ?';
-		$result = $this->execReadOnlyQuery($query, [$content_id]);
-
-		if (isError($result))
-			return $result;
-
-		$data = getData($result);
-		if (empty($data))
-			return error('Content not found');
-
-		return success($data[0]->oe_kurzbz);
-	}
 }

application/models/content/Contentchild_model.php

@@ -1,9 +1,6 @@
 <?php
 class Contentchild_model extends DB_Model
 {
-	// swapSort reports the two boundary cases with this. See swapSort().
-	const NO_NEIGHBOUR = 'no neighbour';
-
 
 	/**
 	 * Constructor
@@ -14,345 +11,4 @@ class Contentchild_model extends DB_Model
 		$this->dbTable = 'campus.tbl_contentchild';
 		$this->pk = 'contentchild_id';
 	}
-
-	/**
-	 * Children with titel, sorted by sort.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getChilds($content_id, $sprache)
-	{
-		$query = '
-			SELECT cc.contentchild_id, cc.child_content_id, cc.sort,
-				(SELECT titel FROM campus.tbl_contentsprache
-				 WHERE content_id = cc.child_content_id AND sprache = ?
-				 ORDER BY version LIMIT 1) AS titel
-			FROM campus.tbl_contentchild cc
-			WHERE cc.content_id = ?
-			ORDER BY cc.sort, cc.contentchild_id
-		';
-
-		return $this->execReadOnlyQuery($query, [$sprache, $content_id]);
-	}
-
-
-	/**
-	 * Parents of a content, with the title of each parent.
-	 * A content can hang under more than one parent, so this returns a list.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getParents($content_id, $sprache)
-	{
-		$query = '
-			SELECT cc.contentchild_id, cc.content_id, cc.sort,
-				(SELECT titel FROM campus.tbl_contentsprache
-				 WHERE content_id = cc.content_id AND sprache = ?
-				 ORDER BY version LIMIT 1) AS titel
-			FROM campus.tbl_contentchild cc
-			WHERE cc.child_content_id = ?
-			ORDER BY cc.content_id
-		';
-
-		return $this->execReadOnlyQuery($query, [$sprache, $content_id]);
-	}
-
-	/**
-	 * Children of a content as a reader may see them.
-	 *
-	 * Differs from getChilds() on purpose. getChilds() serves the admin and returns every
-	 * child with the lowest version. A reader needs the newest visible version, only active
-	 * contents, and no page that a group rule keeps from them.
-	 *
-	 * The group rule follows CmsLib::getContent(): a content without a row in
-	 * tbl_contentgruppe is open, a content with rows needs membership in one of them.
-	 *
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param string $uid
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getChildsForReader($content_id, $sprache, $uid)
-	{
-		$query = '
-			SELECT
-				cc.child_content_id AS content_id,
-				cc.sort,
-				COALESCE(
-					(SELECT cs.titel FROM campus.tbl_contentsprache cs
-						WHERE cs.content_id = cc.child_content_id
-							AND cs.sprache = ?
-							AND cs.sichtbar
-							AND LENGTH(cs.titel) > 0
-						ORDER BY cs.version DESC NULLS LAST LIMIT 1),
-					(SELECT cs.titel FROM campus.tbl_contentsprache cs
-						WHERE cs.content_id = cc.child_content_id
-							AND cs.sichtbar
-							AND LENGTH(cs.titel) > 0
-						ORDER BY cs.version DESC NULLS LAST LIMIT 1),
-					c.beschreibung
-				) AS titel
-			FROM campus.tbl_contentchild cc
-				JOIN campus.tbl_content c ON c.content_id = cc.child_content_id
-			WHERE cc.content_id = ?
-				AND c.aktiv
-				-- Without a visible version the reader cannot open the page at all.
-				AND EXISTS (
-					SELECT 1 FROM campus.tbl_contentsprache cs
-					WHERE cs.content_id = cc.child_content_id AND cs.sichtbar
-				)
-				AND (
-					NOT EXISTS (
-						SELECT 1 FROM campus.tbl_contentgruppe cg
-						WHERE cg.content_id = cc.child_content_id
-					)
-					OR EXISTS (
-						SELECT 1 FROM campus.tbl_contentgruppe cg
-							JOIN public.vw_gruppen vg ON vg.gruppe_kurzbz = cg.gruppe_kurzbz
-						WHERE cg.content_id = cc.child_content_id AND vg.uid = ?
-					)
-				)
-			ORDER BY cc.sort, cc.contentchild_id
-		';
-
-		return $this->execReadOnlyQuery($query, [$sprache, $content_id, $uid]);
-	}
-
-	/**
-	 * Highest sort value. Returns 0 if no row exists.
-	 * @param int $content_id
-	 * @return stdClass success with int or error
-	 */
-	public function getMaxSort($content_id)
-	{
-		$query = '
-			SELECT COALESCE(MAX(sort), 0) AS max_sort
-			FROM campus.tbl_contentchild
-			WHERE content_id = ?
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$content_id]);
-		if (isError($result))
-			return $result;
-
-		return success((int) getData($result)[0]->max_sort);
-	}
-
-	/**
-	 * All descendant content_ids recursively. Returns a flat array.
-	 * @param int $content_id
-	 * @return stdClass success with array of ints or error
-	 */
-	public function getAllChildIds($content_id)
-	{
-		$query = '
-			WITH RECURSIVE childs(content_id, child_content_id) AS (
-				SELECT content_id, child_content_id FROM campus.tbl_contentchild WHERE content_id = ?
-				UNION ALL
-				SELECT cc.content_id, cc.child_content_id
-				FROM campus.tbl_contentchild cc, childs
-				WHERE cc.content_id = childs.child_content_id)
-			SELECT DISTINCT child_content_id FROM childs
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$content_id]);
-		if (isError($result))
-			return $result;
-
-		$ids = [];
-		if (getData($result))
-		{
-			foreach (getData($result) as $row)
-				$ids[] = (int) $row->child_content_id;
-		}
-
-		return success($ids);
-	}
-
-	/**
-	 * Swap sort value with the neighbour. Direction is 'up' or 'down'.
-	 * @param int $contentchild_id
-	 * @param string $direction 'up' or 'down'
-	 * @return stdClass success or error
-	 */
-	public function swapSort($contentchild_id, $direction)
-	{
-		$currentResult = $this->load($contentchild_id);
-		if (isError($currentResult))
-			return $currentResult;
-		$current = getData($currentResult)[0];
-
-		if ($direction === 'up')
-		{
-			$neighbourQuery = '
-				SELECT contentchild_id, sort
-				FROM campus.tbl_contentchild
-				WHERE content_id = ? AND sort < ?
-				ORDER BY sort DESC
-				LIMIT 1
-			';
-		}
-		else
-		{
-			$neighbourQuery = '
-				SELECT contentchild_id, sort
-				FROM campus.tbl_contentchild
-				WHERE content_id = ? AND sort > ?
-				ORDER BY sort ASC
-				LIMIT 1
-			';
-		}
-
-		$neighbourResult = $this->execReadOnlyQuery($neighbourQuery, [$current->content_id, $current->sort]);
-		if (isError($neighbourResult))
-			return $neighbourResult;
-
-		$neighbourData = getData($neighbourResult);
-		// A marker, not a message. The controller owns the wording, because a model has no
-		// phrases. Returning a phrase key here put the key itself in front of the user.
-		if (empty($neighbourData))
-			return error(self::NO_NEIGHBOUR);
-
-		$neighbour = $neighbourData[0];
-
-		// Transaction wraps the swap; the legacy does not.
-		$this->db->trans_start();
-
-		$this->execQuery(
-			'UPDATE campus.tbl_contentchild SET sort = ? WHERE contentchild_id = ?',
-			[$neighbour->sort, $current->contentchild_id]
-		);
-		$this->execQuery(
-			'UPDATE campus.tbl_contentchild SET sort = ? WHERE contentchild_id = ?',
-			[$current->sort, $neighbour->contentchild_id]
-		);
-
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === false)
-			return error('Sort swap failed');
-
-		return success(true);
-	}
-
-	/**
-	 * Writes the whole order of one content in one transaction. Serves the drag and drop.
-	 * The list must hold every child of the content exactly once, or the rows left out
-	 * would keep a stale sort value.
-	 * @param int $content_id
-	 * @param array $contentchild_ids in the wanted order
-	 * @return stdClass success(true) or error
-	 */
-	public function setSortOrder($content_id, $contentchild_ids)
-	{
-		$currentResult = $this->execReadOnlyQuery(
-			'SELECT contentchild_id FROM campus.tbl_contentchild WHERE content_id = ?',
-			[$content_id]
-		);
-		if (isError($currentResult))
-			return $currentResult;
-
-		$current = [];
-		foreach ((array) getData($currentResult) as $row)
-			$current[] = (int) $row->contentchild_id;
-
-		$wanted = array_map('intval', array_values($contentchild_ids));
-
-		$check = $wanted;
-		sort($current);
-		sort($check);
-		if ($current !== $check)
-			return error('Sort order does not match the children of the content');
-
-		$this->db->trans_start();
-
-		foreach ($wanted as $position => $contentchild_id)
-		{
-			$this->execQuery(
-				'UPDATE campus.tbl_contentchild SET sort = ? WHERE contentchild_id = ?',
-				[$position + 1, $contentchild_id]
-			);
-		}
-
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === false)
-			return error('Sort order update failed');
-
-		return success(true);
-	}
-
-	/**
-	 * Every ancestor of the given contents, with the distance to the content it belongs to.
-	 *
-	 * The tree shows a search result out of its place: a title like "Team" says nothing
-	 * about which unit it belongs to. This delivers the way down to it.
-	 *
-	 * A content can hang under more than one parent, so a level can hold more than one
-	 * ancestor. Every one of them comes back, with tiefe 1 for the direct parent. The
-	 * caller decides how to draw that.
-	 *
-	 * tiefe also ends a cycle: a content whose parent chain leads back to itself would
-	 * otherwise recurse forever.
-	 *
-	 * @param array $content_ids contents to walk up from
-	 * @param int $maxTiefe how many levels to climb
-	 * @param string $sprache language of the ancestor titles
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getAncestors($content_ids, $maxTiefe, $sprache)
-	{
-		if (empty($content_ids))
-			return success([]);
-
-		$platzhalter = implode(', ', array_fill(0, count($content_ids), '?'));
-
-		// The aggregate and the title sit in the final select. The recursive term names
-		// the working table once and carries no subquery, which is what Postgres allows.
-		$query = '
-			WITH RECURSIVE auf(start_id, content_id, tiefe) AS (
-				SELECT cc.child_content_id, cc.content_id, 1
-				FROM campus.tbl_contentchild cc
-				WHERE cc.child_content_id IN (' . $platzhalter . ')
-				UNION ALL
-				SELECT auf.start_id, cc.content_id, auf.tiefe + 1
-				FROM campus.tbl_contentchild cc
-					JOIN auf ON cc.child_content_id = auf.content_id
-				WHERE auf.tiefe < ?
-			)
-			SELECT auf.start_id, auf.content_id, MIN(auf.tiefe) AS tiefe,
-				(SELECT titel FROM campus.tbl_contentsprache cs
-				 WHERE cs.content_id = auf.content_id AND cs.sprache = ?
-				 ORDER BY cs.version LIMIT 1) AS titel,
-				-- The caller turns this into the entitled flag, so the path can offer a
-				-- link only for an ancestor the editor may open.
-				(SELECT c.oe_kurzbz FROM campus.tbl_content c
-				 WHERE c.content_id = auf.content_id) AS oe_kurzbz
-			FROM auf
-			GROUP BY auf.start_id, auf.content_id
-			ORDER BY auf.start_id, MIN(auf.tiefe) DESC, auf.content_id
-		';
-
-		$params = array_map('intval', array_values($content_ids));
-		$params[] = (int) $maxTiefe;
-		$params[] = $sprache;
-
-		return $this->execReadOnlyQuery($query, $params);
-	}
-
-	/**
-	 * Removes a content from the child table, as parent and as child.
-	 * @param int $content_id
-	 * @return stdClass
-	 */
-	public function deleteByContent($content_id)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentchild
-				WHERE content_id = ? OR child_content_id = ?',
-			[$content_id, $content_id]
-		);
-	}
 }

application/models/content/Contentgruppe_model.php

@@ -10,8 +10,6 @@ class Contentgruppe_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'campus.tbl_contentgruppe';
 		$this->pk = array('gruppe_kurzbz', 'content_id');
-		// Composite key without a sequence, so insert() must skip insert_id() and its LASTVAL().
-		$this->hasSequence = false;
 	}
 
 	/**
@@ -20,7 +18,7 @@ class Contentgruppe_model extends DB_Model
 	 * 
 	 * @param int			$content_id
 	 * 
-	 * @return stdClass		success(true) wenn locked sonst success(false)
+	 * @return stdClass		success(true) wenn eingeschraenkt sonst success(false)
 	 */
 	public function islocked($content_id)
 	{
@@ -32,7 +30,7 @@ class Contentgruppe_model extends DB_Model
 	}
 	
 	/**
-	 * Prüft ob ein User die Berechtigung fuer das Anzeigen des 
+	 * Prueft ob ein User die Berechtigung fuer das Anzeigen des 
 	 * Contents besitzt
 	 * 
 	 * @param int			$content_id	ID des Contents
@@ -58,89 +56,5 @@ class Contentgruppe_model extends DB_Model
 			return $result;
 		return success(!!getData($result));
 	}
-
-	/**
-	 * Groups assigned to a content, with bezeichnung.
-	 * @param int $content_id
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getGruppen($content_id)
-	{
-		$query = '
-			SELECT cg.gruppe_kurzbz, g.bezeichnung
-			FROM campus.tbl_contentgruppe cg
-				JOIN public.tbl_gruppe g USING (gruppe_kurzbz)
-			WHERE cg.content_id = ?
-			ORDER BY cg.gruppe_kurzbz
-		';
-
-		return $this->execReadOnlyQuery($query, [$content_id]);
-	}
-
-	/**
-	 * All selectable groups. Returns gruppe_kurzbz and bezeichnung.
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getAllGruppen()
-	{
-		// content_visible marks a group as selectable for content rights. Generated groups
-		// carry FALSE. admin.php filters the same way via getgruppe(...,$content_visible=true).
-		$query = '
-			SELECT gruppe_kurzbz, bezeichnung
-			FROM public.tbl_gruppe
-			WHERE content_visible = TRUE
-			ORDER BY gruppe_kurzbz
-		';
-
-		return $this->execReadOnlyQuery($query);
-	}
-
-	/**
-	 * Groups for multiple contents in one query. Returns content_id => [gruppe_kurzbz, ...].
-	 * @param array $contentIds array of content_id values
-	 * @return stdClass success with associative array or error
-	 */
-	public function getGruppenForContents($contentIds)
-	{
-		if (empty($contentIds))
-			return success([]);
-
-		$placeholders = implode(',', array_fill(0, count($contentIds), '?'));
-		$query = '
-			SELECT content_id, gruppe_kurzbz
-			FROM campus.tbl_contentgruppe
-			WHERE content_id IN (' . $placeholders . ')
-			ORDER BY content_id, gruppe_kurzbz
-		';
-
-		$result = $this->execReadOnlyQuery($query, array_values($contentIds));
-		if (isError($result))
-			return $result;
-
-		$map = [];
-		if (getData($result))
-		{
-			foreach (getData($result) as $row)
-			{
-				$id = (int) $row->content_id;
-				if (!isset($map[$id]))
-					$map[$id] = [];
-				$map[$id][] = $row->gruppe_kurzbz;
-			}
-		}
-
-		return success($map);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @return stdClass
-	 */
-	public function deleteByContent($content_id)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentgruppe WHERE content_id = ?',
-			[$content_id]
-		);
-	}
+	
 }

application/models/content/Contentlog_model.php

@@ -11,76 +11,4 @@ class Contentlog_model extends DB_Model
 		$this->dbTable = 'campus.tbl_contentlog';
 		$this->pk = 'contentlog_id';
 	}
-
-	/**
-	 * The open lock entry of a user (ende IS NULL). Returns null if none exists.
-	 * Match the holder and take the newest, otherwise the age belongs to an abandoned entry.
-	 * @param int $contentsprache_id
-	 * @param string $uid holder of the lock
-	 * @return stdClass success with row or null, or error
-	 */
-	public function getOpenLock($contentsprache_id, $uid)
-	{
-		$query = '
-			SELECT contentlog_id, uid, contentsprache_id, start
-			FROM campus.tbl_contentlog
-			WHERE contentsprache_id = ? AND uid = ? AND ende IS NULL
-			ORDER BY start DESC
-			LIMIT 1
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$contentsprache_id, $uid]);
-		if (isError($result))
-			return $result;
-
-		$data = getData($result);
-		return success(empty($data) ? null : $data[0]);
-	}
-
-	/**
-	 * Ends every open lock entry of a version. Without a uid it ends the entry of every
-	 * holder, which is what a take-over and a forced release need.
-	 * @param int $contentsprache_id
-	 * @param string|null $uid
-	 * @return stdClass
-	 */
-	public function closeOpenEntries($contentsprache_id, $uid = null)
-	{
-		$query = 'UPDATE campus.tbl_contentlog SET ende = now()
-			WHERE contentsprache_id = ? AND ende IS NULL';
-		$params = [$contentsprache_id];
-
-		if ($uid !== null)
-		{
-			$query .= ' AND uid = ?';
-			$params[] = $uid;
-		}
-
-		return $this->execQuery($query, $params);
-	}
-
-	/**
-	 * @param int $contentsprache_id
-	 * @return stdClass
-	 */
-	public function deleteByContentsprache($contentsprache_id)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentlog WHERE contentsprache_id = ?',
-			[$contentsprache_id]
-		);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @return stdClass
-	 */
-	public function deleteByContent($content_id)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentlog WHERE contentsprache_id IN
-				(SELECT contentsprache_id FROM campus.tbl_contentsprache WHERE content_id = ?)',
-			[$content_id]
-		);
-	}
 }

application/models/content/Contentsprache_model.php

@@ -38,177 +38,5 @@ class Contentsprache_model extends DB_Model
 
 		return success(!!getData($result));
 	}
-
-	/**
-	 * All versions of a language, ascending by version.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getVersions($content_id, $sprache)
-	{
-		$query = '
-			SELECT contentsprache_id, version, sichtbar, titel,
-				insertamum, insertvon, updateamum, updatevon, gesperrt_uid
-			FROM campus.tbl_contentsprache
-			WHERE content_id = ? AND sprache = ?
-			ORDER BY version ASC
-		';
-
-		return $this->execReadOnlyQuery($query, [$content_id, $sprache]);
-	}
-
-	/**
-	 * Distinct languages for a content. Returns a flat array of strings.
-	 * @param int $content_id
-	 * @return stdClass success with array of strings or error
-	 */
-	public function getLanguages($content_id)
-	{
-		$query = '
-			SELECT DISTINCT sprache
-			FROM campus.tbl_contentsprache
-			WHERE content_id = ?
-			ORDER BY sprache
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$content_id]);
-		if (isError($result))
-			return $result;
-
-		$languages = [];
-		if (getData($result))
-		{
-			foreach (getData($result) as $row)
-				$languages[] = $row->sprache;
-		}
-
-		return success($languages);
-	}
-
-	/**
-	 * Highest version number. Returns 0 if no row exists.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return stdClass success with int or error
-	 */
-	public function getMaxVersion($content_id, $sprache)
-	{
-		$query = '
-			SELECT COALESCE(MAX(version), 0) AS max_version
-			FROM campus.tbl_contentsprache
-			WHERE content_id = ? AND sprache = ?
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$content_id, $sprache]);
-		if (isError($result))
-			return $result;
-
-		return success((int) getData($result)[0]->max_version);
-	}
-
-	/**
-	 * Row count for a content+language. Used for the delete guard.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @return stdClass success with int or error
-	 */
-	public function getNumberOfVersions($content_id, $sprache)
-	{
-		$query = '
-			SELECT COUNT(*) AS cnt
-			FROM campus.tbl_contentsprache
-			WHERE content_id = ? AND sprache = ?
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$content_id, $sprache]);
-		if (isError($result))
-			return $result;
-
-		return success((int) getData($result)[0]->cnt);
-	}
-
-	/**
-	 * One version, all columns. If $version is empty, returns the highest version.
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param int|null $version
-	 * @return stdClass success with single row or error
-	 */
-	public function getOne($content_id, $sprache, $version = null)
-	{
-		$params = [$content_id, $sprache];
-
-		$versionClause = '';
-		if (!empty($version))
-		{
-			$versionClause = ' AND version = ?';
-			$params[] = $version;
-		}
-
-		$query = '
-			SELECT * FROM campus.tbl_contentsprache
-			WHERE content_id = ? AND sprache = ?' . $versionClause . '
-			ORDER BY version DESC LIMIT 1
-		';
-
-		$result = $this->execReadOnlyQuery($query, $params);
-		if (isError($result))
-			return $result;
-
-		$data = getData($result);
-		if (empty($data))
-			return error('Version not found');
-
-		return success($data[0]);
-	}
-
-	/**
-	 * Clears the lock of a version. Without a uid it clears whoever holds it, which is
-	 * what a forced release needs.
-	 * @param int $contentsprache_id
-	 * @param string|null $uid
-	 * @return stdClass
-	 */
-	public function releaseLock($contentsprache_id, $uid = null)
-	{
-		$query = 'UPDATE campus.tbl_contentsprache SET gesperrt_uid = NULL
-			WHERE contentsprache_id = ?';
-		$params = [$contentsprache_id];
-
-		if ($uid !== null)
-		{
-			$query .= ' AND gesperrt_uid = ?';
-			$params[] = $uid;
-		}
-
-		return $this->execQuery($query, $params);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @return stdClass
-	 */
-	public function deleteByContent($content_id)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentsprache WHERE content_id = ?',
-			[$content_id]
-		);
-	}
-
-	/**
-	 * @param int $content_id
-	 * @param string $sprache
-	 * @param int $version
-	 * @return stdClass
-	 */
-	public function deleteVersion($content_id, $sprache, $version)
-	{
-		return $this->execQuery(
-			'DELETE FROM campus.tbl_contentsprache
-				WHERE content_id = ? AND sprache = ? AND version = ?',
-			[$content_id, $sprache, $version]
-		);
-	}
+	
 }

application/models/content/Dms_model.php

@@ -30,241 +30,4 @@ class Dms_model extends DB_Model
 		
 		return $returnArray;
 	}
-
-	/**
-	 * Reads a DMS category and the access facts a listing needs.
-	 *
-	 * Mirrors the rule of cms/dms.php and dms.class.php at category level:
-	 * a category is locked when any category in its parent chain grants a group or
-	 * carries a berechtigung_kurzbz. The caller decides, this method only reports.
-	 *
-	 * @param string $kategorie_kurzbz
-	 * gesperrt and in_gruppe come back as 0 or 1, not as a boolean. A PostgreSQL boolean
-	 * reaches PHP as the string 'f' when the driver conversion does not run, and 'f' is
-	 * truthy. The int cast is correct in both cases.
-	 *
-	 * @param string $uid
-	 * @return object one row, or an empty result when the category does not exist
-	 */
-	public function getKategorieZugriff($kategorie_kurzbz, $uid)
-	{
-		// tiefe guards against a cyclic parent chain.
-		$query = '
-			WITH RECURSIVE chain(kategorie_kurzbz, parent_kategorie_kurzbz, berechtigung_kurzbz, tiefe) AS (
-				SELECT kategorie_kurzbz, parent_kategorie_kurzbz, berechtigung_kurzbz, 1
-				FROM campus.tbl_dms_kategorie
-				WHERE kategorie_kurzbz = ?
-				UNION ALL
-				SELECT k.kategorie_kurzbz, k.parent_kategorie_kurzbz, k.berechtigung_kurzbz, c.tiefe + 1
-				FROM campus.tbl_dms_kategorie k
-					JOIN chain c ON k.kategorie_kurzbz = c.parent_kategorie_kurzbz
-				WHERE c.tiefe < 32
-			)
-			SELECT
-				kat.kategorie_kurzbz,
-				kat.bezeichnung,
-				kat.beschreibung,
-				kat.berechtigung_kurzbz,
-				(
-					EXISTS (SELECT 1 FROM chain WHERE chain.berechtigung_kurzbz IS NOT NULL)
-					OR EXISTS (
-						SELECT 1
-						FROM campus.tbl_dms_kategorie_gruppe g
-							JOIN chain ON chain.kategorie_kurzbz = g.kategorie_kurzbz
-					)
-				)::int AS gesperrt,
-				(EXISTS (
-					SELECT 1
-					FROM campus.tbl_dms_kategorie_gruppe g
-						JOIN chain ON chain.kategorie_kurzbz = g.kategorie_kurzbz
-						JOIN public.tbl_benutzergruppe b ON b.gruppe_kurzbz = g.gruppe_kurzbz
-					WHERE b.uid = ?
-				))::int AS in_gruppe
-			FROM campus.tbl_dms_kategorie kat
-			WHERE kat.kategorie_kurzbz = ?
-		';
-
-		return $this->execReadOnlyQuery($query, array($kategorie_kurzbz, $uid, $kategorie_kurzbz));
-	}
-
-	/**
-	 * Lists the newest version of every document in one DMS category.
-	 *
-	 * filename stays out of the result. The reader gets the document through
-	 * cms/dms.php?id=<dms_id>, never through the name on disk.
-	 *
-	 * @param string $kategorie_kurzbz
-	 * @return object
-	 */
-	public function getKategorieDokumente($kategorie_kurzbz)
-	{
-		$query = '
-			SELECT
-				d.dms_id,
-				v.version,
-				v.name,
-				v.beschreibung,
-				v.mimetype,
-				COALESCE(v.updateamum, v.insertamum) AS geaendert
-			FROM campus.tbl_dms d
-				JOIN campus.tbl_dms_version v ON v.dms_id = d.dms_id
-			WHERE d.kategorie_kurzbz = ?
-				-- cis_suche marks a document as published to CIS readers. A category also
-				-- holds working files, and those must not appear on a content page.
-				AND v.cis_suche
-				AND v.version = (
-					SELECT MAX(version) FROM campus.tbl_dms_version WHERE dms_id = d.dms_id
-				)
-				-- A project document carries its own rule in dms.class.php and does not
-				-- belong in a CMS category listing.
-				AND NOT EXISTS (
-					SELECT 1 FROM fue.tbl_projekt_dokument pd WHERE pd.dms_id = d.dms_id
-				)
-			ORDER BY LOWER(v.name)
-		';
-
-		return $this->execReadOnlyQuery($query, array($kategorie_kurzbz));
-	}
-
-	/**
-	 * Newest version of the named documents, in no particular order.
-	 *
-	 * Unlike getKategorieDokumente() this does NOT filter on cis_suche. An editor who names
-	 * a dms_id has chosen that document on purpose, and the flag only marks a document for
-	 * the CIS search. The category rule still applies, and the caller enforces it.
-	 *
-	 * @param array $ids dms_id values
-	 * @return object
-	 */
-	public function getDokumenteByIds($ids)
-	{
-		if (empty($ids))
-			return success(array());
-
-		$platzhalter = implode(', ', array_fill(0, count($ids), '?'));
-
-		$query = '
-			SELECT
-				d.dms_id,
-				d.kategorie_kurzbz,
-				v.version,
-				v.name,
-				v.beschreibung,
-				v.mimetype,
-				COALESCE(v.updateamum, v.insertamum) AS geaendert
-			FROM campus.tbl_dms d
-				JOIN campus.tbl_dms_version v ON v.dms_id = d.dms_id
-			WHERE d.dms_id IN (' . $platzhalter . ')
-				AND v.version = (
-					SELECT MAX(version) FROM campus.tbl_dms_version WHERE dms_id = d.dms_id
-				)
-				AND NOT EXISTS (
-					SELECT 1 FROM fue.tbl_projekt_dokument pd WHERE pd.dms_id = d.dms_id
-				)
-		';
-
-		return $this->execReadOnlyQuery($query, array_values($ids));
-	}
-
-	/**
-	 * Every document of one category, for the editor picker.
-	 *
-	 * Unlike getKategorieDokumente() this does NOT filter on cis_suche, because
-	 * dms-dokumente renders named documents regardless of that flag. The flag travels with
-	 * the row so the picker can mark a document that no reader would find by search.
-	 *
-	 * @param string $kategorie_kurzbz
-	 * @return object
-	 */
-	public function getKategorieDokumenteAlle($kategorie_kurzbz)
-	{
-		$query = '
-			SELECT
-				d.dms_id,
-				v.name,
-				v.cis_suche::int AS cis_suche
-			FROM campus.tbl_dms d
-				JOIN LATERAL (
-					SELECT v.name, v.cis_suche
-					FROM campus.tbl_dms_version v
-					WHERE v.dms_id = d.dms_id
-					ORDER BY v.version DESC
-					LIMIT 1
-				) v ON TRUE
-			WHERE d.kategorie_kurzbz = ?
-				AND NOT EXISTS (
-					SELECT 1 FROM fue.tbl_projekt_dokument pd WHERE pd.dms_id = d.dms_id
-				)
-			ORDER BY LOWER(v.name)
-		';
-
-		return $this->execReadOnlyQuery($query, array($kategorie_kurzbz));
-	}
-
-	/**
-	 * Lists every DMS category with the number of documents it holds.
-	 * Used by the insert dialog of the CMS content component "dms-liste".
-	 *
-	 * @return object
-	 */
-	public function getKategorien()
-	{
-		$query = '
-			SELECT
-				k.kategorie_kurzbz,
-				k.bezeichnung,
-				k.oe_kurzbz,
-				COALESCE(a.anzahl, 0) AS anzahl
-			FROM campus.tbl_dms_kategorie k
-				LEFT JOIN (
-					SELECT d.kategorie_kurzbz, COUNT(*) AS anzahl
-					FROM campus.tbl_dms d
-						JOIN (
-							SELECT DISTINCT ON (dms_id) dms_id, cis_suche
-							FROM campus.tbl_dms_version
-							ORDER BY dms_id, version DESC
-						) v ON v.dms_id = d.dms_id
-					WHERE v.cis_suche
-					GROUP BY d.kategorie_kurzbz
-				) a ON a.kategorie_kurzbz = k.kategorie_kurzbz
-			ORDER BY LOWER(COALESCE(k.bezeichnung, k.kategorie_kurzbz))
-		';
-
-		return $this->execReadOnlyQuery($query);
-	}
-
-	/**
-	 * The category itself plus its sub categories, down to a depth.
-	 *
-	 * tiefe 0 returns only the category named. The depth bound also ends a cycle: a
-	 * category whose parent chain leads back to itself would otherwise recurse forever.
-	 *
-	 * The caller must still check the entitlement of every category it gets back. A sub
-	 * category carries its own group rule and may be closed while the parent is open.
-	 *
-	 * @param string $kategorie_kurzbz root of the walk
-	 * @param int $tiefe how many levels below the root to include
-	 * @return object success with array of rows or error
-	 */
-	public function getMitUnterkategorien($kategorie_kurzbz, $tiefe)
-	{
-		$query = '
-			WITH RECURSIVE unter(kategorie_kurzbz, tiefe) AS (
-				SELECT kategorie_kurzbz, 0
-				FROM campus.tbl_dms_kategorie
-				WHERE kategorie_kurzbz = ?
-				UNION ALL
-				SELECT k.kategorie_kurzbz, unter.tiefe + 1
-				FROM campus.tbl_dms_kategorie k
-					JOIN unter ON k.parent_kategorie_kurzbz = unter.kategorie_kurzbz
-				WHERE unter.tiefe < ?
-			)
-			SELECT kategorie_kurzbz, MIN(tiefe) AS tiefe
-			FROM unter
-			GROUP BY kategorie_kurzbz
-			ORDER BY MIN(tiefe), kategorie_kurzbz
-		';
-
-		return $this->execReadOnlyQuery($query, [$kategorie_kurzbz, (int) $tiefe]);
-	}
 }

application/models/content/Template_model.php

@@ -11,30 +11,4 @@ class Template_model extends DB_Model
 		$this->dbTable = 'campus.tbl_template';
 		$this->pk = 'template_kurzbz';
 	}
-
-	/**
-	 * True if the template carries a CIS4 stylesheet of its own, which is not true for every template.
-	 *
-	 * @param string $template_kurzbz
-	 * @return stdClass success(bool) or error
-	 */
-	public function hasCis4Stylesheet($template_kurzbz)
-	{
-		$query = '
-			SELECT (xslt_xhtml_c4 IS NOT NULL
-					AND xslt_xhtml_c4::text IS DISTINCT FROM xslt_xhtml::text) AS eigen
-			FROM campus.tbl_template
-			WHERE template_kurzbz = ?
-		';
-
-		$result = $this->execReadOnlyQuery($query, [$template_kurzbz]);
-		if (isError($result))
-			return $result;
-
-		$data = getData($result);
-		if (empty($data))
-			return success(false);
-
-		return success($data[0]->eigen === 't' || $data[0]->eigen === true);
-	}
 }

application/models/crm/Prestudentstatus_model.php

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

application/models/education/Lehreinheitmitarbeiter_model.php

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

application/models/education/Lehrveranstaltung_model.php

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

application/models/education/Paabgabe_model.php

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

application/models/education/Projektarbeit_model.php

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

application/models/organisation/Organisationseinheit_model.php

@@ -259,37 +259,4 @@ class Organisationseinheit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
 	}
-
-	/**
-	 * The unit itself plus its sub units, down to a depth.
-	 *
-	 * tiefe 0 returns only the unit named, which is what a caller without a depth wants.
-	 * The depth bound also ends a cycle: a unit whose parent chain leads back to itself
-	 * would otherwise recurse forever.
-	 *
-	 * @param string $oe_kurzbz root of the walk
-	 * @param int $tiefe how many levels below the root to include
-	 * @return object success with array of rows or error
-	 */
-	public function getMitUntereinheiten($oe_kurzbz, $tiefe)
-	{
-		$query = '
-			WITH RECURSIVE unter(oe_kurzbz, tiefe) AS (
-				SELECT oe_kurzbz, 0
-				FROM public.tbl_organisationseinheit
-				WHERE oe_kurzbz = ?
-				UNION ALL
-				SELECT o.oe_kurzbz, unter.tiefe + 1
-				FROM public.tbl_organisationseinheit o
-					JOIN unter ON o.oe_parent_kurzbz = unter.oe_kurzbz
-				WHERE unter.tiefe < ?
-			)
-			SELECT oe_kurzbz, MIN(tiefe) AS tiefe
-			FROM unter
-			GROUP BY oe_kurzbz
-			ORDER BY MIN(tiefe), oe_kurzbz
-		';
-
-		return $this->execReadOnlyQuery($query, [$oe_kurzbz, (int) $tiefe]);
-	}
 }

application/models/organisation/Studiensemester_model.php

@@ -218,7 +218,7 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemester of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
 		$query = "
 			SELECT  studiensemester_kurzbz, start, ende
 			FROM	public.tbl_studiensemester

application/models/person/Freebusytyp_model.php

@@ -11,4 +11,14 @@ class Freebusytyp_model extends DB_Model
 		$this->dbTable = 'campus.tbl_freebusytyp';
 		$this->pk = 'freebusytyp_kurzbz';
 	}
+
+	public function getAllFreeBusyTypes()
+	{
+		return $this->execReadOnlyQuery("SELECT * FROM " . $this->dbTable);
+	}
+
+	public function getActiveFreeBusyTypes()
+	{
+		return $this->execReadOnlyQuery("SELECT * FROM " . $this->dbTable . " WHERE is_active");
+	}
 }

application/models/person/Notiz_model.php

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

application/models/person/Person_model.php

@@ -243,58 +243,6 @@ class Person_model extends DB_Model
 	 * @param $uid
 	 * @return array
 	 */
-	/**
-	 * Contact data of the named users, for the CMS content components.
-	 *
-	 * The joins follow Benutzerfunktion_model::getBenutzerFunktionenDetailed() and the view
-	 * Cis/Cms/News/Xml/Address/Detailed.php, so a person reads the same everywhere.
-	 *
-	 * foto_sperre is honoured. A person who blocked their photo never gets one on a public
-	 * content page, no matter what the page asks for.
-	 *
-	 * @param array $uids
-	 * @param boolean $mitFoto photos are large, so they are read only on request
-	 * @return object
-	 */
-	public function getCmsKontakt($uids, $mitFoto = false)
-	{
-		if (empty($uids))
-			return success(array());
-
-		$platzhalter = implode(', ', array_fill(0, count($uids), '?'));
-		$fotoSpalte = $mitFoto
-			? 'CASE WHEN p.foto_sperre THEN NULL ELSE p.foto END'
-			: 'NULL';
-
-		$query = '
-			SELECT
-				b.uid,
-				b.alias,
-				p.vorname,
-				p.nachname,
-				p.titelpre,
-				p.titelpost,
-				m.telefonklappe,
-				k.kontakt,
-				o.planbezeichnung,
-				' . $fotoSpalte . ' AS foto
-			FROM public.tbl_benutzer b
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-				LEFT JOIN public.tbl_mitarbeiter m ON m.mitarbeiter_uid = b.uid
-				LEFT JOIN public.tbl_kontakt k
-					ON k.standort_id = m.standort_id AND k.kontakttyp = ?
-				LEFT JOIN public.tbl_ort o ON o.ort_kurzbz = m.ort_kurzbz
-			WHERE b.uid IN (' . $platzhalter . ')
-				AND b.aktiv
-		';
-
-		$parameter = array('telefon');
-		foreach ($uids as $uid)
-			$parameter[] = $uid;
-
-		return $this->execReadOnlyQuery($query, $parameter);
-	}
-
 	public function getByUid($uid)
 	{
 		$this->addSelect('vorname, nachname, gebdatum, person_id, bpk, matr_nr, foto');

application/models/ressource/CoodleSurveyExternalParticipant_model.php

@@ -0,0 +1,151 @@
+<?php
+class CoodleSurveyExternalParticipant_model extends DB_Model
+{
+
+	private $_ci; // Code igniter instance
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_coodle_survey_external_participants';
+		$this->pk = 'id';
+
+		$this->_ci =& get_instance();
+	}
+
+	public function getExternalParticipants($surveyId, $includeAccessKeys = false)
+	{
+		$selectedColumns = $includeAccessKeys ? "*" : "id, survey_id, name, email, selection";
+		$query = "SELECT $selectedColumns
+				FROM $this->dbTable
+				WHERE survey_id = $surveyId
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getExternalParticipant($externalParticipantId, $includeAccessKey = false)
+	{
+		$selectedColumns = $includeAccessKey ? "*" : "id, survey_id, name, email, selection";
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE id = $externalParticipantId
+			LIMIT 1
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getExternalParticipantByAccessKey($surveyId, $accessKey)
+	{
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE survey_id = $surveyId AND access_key = '$accessKey'
+			LIMIT 1
+		";
+		return $this->execQuery($query);
+	}
+
+	public function updateExternalParticipants($surveyId, $externalParticipants, $timeslots)
+	{
+		$participantsQuery = "SELECT *
+			FROM $this->dbTable
+			WHERE survey_id = $surveyId
+			";
+		$oldExternalParticipants = getData($this->execQuery($participantsQuery));
+		$oldExternalParticipantIds = array_map(
+			function ($oldExternalParticipant) {
+				return $oldExternalParticipant->id;
+			},
+			$oldExternalParticipants
+		);
+
+		$persistingExternalParticipants = array_filter(
+			$externalParticipants,
+			function ($externalParticipant) {
+				return isset($externalParticipant["id"]) && $externalParticipant["id"];
+			}
+		);
+		$persistingExternalParticipantIds = array_map(
+			function ($persistingExternalParticipant) {
+				return $persistingExternalParticipant["id"];
+			},
+			$persistingExternalParticipants
+		);
+
+		$redundantExternalParticipantIds = array_diff(
+			$oldExternalParticipantIds,
+			$persistingExternalParticipantIds
+		);
+
+		$newExternalParticipants = array_filter(
+			$externalParticipants,
+			function ($externalParticipant) {
+				return !isset($externalParticipant["id"]) || !$externalParticipant["id"];
+			}
+		);
+
+
+		if (count($redundantExternalParticipantIds)) {
+			$idsToBeDeleted = "(" . implode(", ", $redundantExternalParticipantIds) . ")";
+			$deleteQuery = "DELETE FROM $this->dbTable WHERE id IN $idsToBeDeleted";
+			$this->execQuery($deleteQuery);
+		}
+
+		if (count($newExternalParticipants)) {
+			$insertValues = array_map(
+				function ($newExternalParticipant) use ($surveyId) {
+					$name = $newExternalParticipant["name"];
+					$email = $newExternalParticipant["email"];
+					$accessKey = uniqid();
+					return "($surveyId, '$name', '$email', '$accessKey', NULL)";
+				},
+				$newExternalParticipants
+			);
+			$insertValues = implode(", ", $insertValues);
+			$insertQuery = "INSERT INTO $this->dbTable (survey_id, name, email, access_key, selection) VALUES $insertValues";
+			$this->execQuery($insertQuery);
+		}
+
+		$updatedExternalParticipants = getData($this->execQuery($participantsQuery));
+		$timeslotIds = array_map(
+			function ($timeslot) {
+				return $timeslot->id;
+			},
+			$timeslots
+		);
+
+		foreach ($updatedExternalParticipants as $externalParticipant) {
+			if (!$externalParticipant->selection)
+				continue;
+
+			$selection = json_decode($externalParticipant->selection, true);
+			if (!count($selection))
+				continue;
+
+			$obsoleteSelectedTimeslotIds = array_diff($selection, $timeslotIds);
+			if (!count($obsoleteSelectedTimeslotIds))
+				continue;
+
+			$updatedSelection = null;
+			if (count($obsoleteSelectedTimeslotIds) !== count($selection)) {
+				$updatedSelection = array_filter(
+					$selection,
+					function ($timeslotId) use ($obsoleteSelectedTimeslotIds) {
+						return !in_array($timeslotId, $obsoleteSelectedTimeslotIds);
+					}
+				);
+			}
+
+			$this->updateSelection($externalParticipant->id, $updatedSelection);
+		}
+	}
+
+	public function updateSelection($externalParticipantId, $selection)
+	{
+		$selection = $selection !== null ? "'" . json_encode($selection) . "'" : "NULL";
+		$selectionUpdateQuery = "UPDATE $this->dbTable SET selection = $selection WHERE id = $externalParticipantId";
+		$this->execQuery($selectionUpdateQuery);
+	}
+}

application/models/ressource/CoodleSurveyParticipant_model.php

@@ -0,0 +1,137 @@
+<?php
+class CoodleSurveyParticipant_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_coodle_survey_participants';
+	}
+
+	public function getParticipants($surveyId)
+	{
+		$query = "
+			SELECT
+				surveyParticipant.participant_uid as uid,
+				surveyParticipant.selection as selection,
+				person.vorname || ' ' || person.nachname AS name
+				FROM $this->dbTable surveyParticipant
+				JOIN public.tbl_benutzer benutzer ON(benutzer.uid = surveyParticipant.participant_uid)
+				JOIN public.tbl_person person ON(person.person_id = benutzer.person_id)
+				WHERE survey_id = $surveyId
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getParticipantEntriesByUid($uid)
+	{
+		$query = "SELECT * FROM $this->dbTable WHERE participant_uid = '$uid'";
+		return $this->execQuery($query);
+	}
+
+	public function getActiveParticipantEntriesByUid($uid)
+	{
+		$query = "SELECT
+		surveyParticipant.survey_id as survey_id,
+		surveyParticipant.participant_uid as participant_uid,
+		surveyParticipant.selection as selection
+		FROM $this->dbTable surveyParticipant
+		JOIN campus.tbl_coodle_surveys survey ON(survey.id = surveyParticipant.survey_id)
+		WHERE surveyParticipant.participant_uid = '$uid'
+		AND survey.completed_at IS NULL
+		AND survey.canceled_at IS NULL";
+		return $this->execQuery($query);
+	}
+
+	public function updateParticipants($surveyId, $participants, $timeslots)
+	{
+		$participantUids = array_map(function ($participant) {
+			return $participant["uid"];
+		}, $participants);
+
+		$existingParticipantsQuery = "SELECT * FROM " . $this->dbTable . " WHERE survey_id = " . $surveyId;
+		$existingParticipants = getData($this->execQuery($existingParticipantsQuery));
+		$existingParticipantUids = array_map(
+			function ($existingParticipant) {
+				return $existingParticipant->participant_uid;
+			},
+			$existingParticipants
+		);
+
+		$newParticipantUids = array_filter(
+			$participantUids,
+			function ($participantUid) use ($existingParticipantUids) {
+				return !in_array($participantUid, $existingParticipantUids);
+			}
+		);
+		$redundantParticipantUids = array_filter(
+			$existingParticipantUids,
+			function ($existingParticipantUid) use ($participantUids) {
+				return !in_array($existingParticipantUid, $participantUids);
+			}
+		);
+
+		if (count($newParticipantUids)) {
+			$insertQuery = "INSERT INTO $this->dbTable VALUES ";
+			$newParticipantInsertValues = array_map(
+				function ($newParticipantUid) use ($surveyId) {
+					return "('$surveyId', '$newParticipantUid', NULL)";
+				},
+				$newParticipantUids
+			);
+			$newParticipantInsertValues = implode(", ", $newParticipantInsertValues);
+			$insertQuery .= $newParticipantInsertValues;
+			$insertQuery .= ";";
+
+			$this->execQuery($insertQuery);
+		}
+
+		if (count($redundantParticipantUids)) {
+			$deleteQuery = "DELETE FROM $this->dbTable WHERE survey_id = $surveyId AND participant_uid IN ('" . implode("', '", $redundantParticipantUids) . "');";
+			$this->execQuery($deleteQuery);
+		}
+
+		$timeslotIds = array_map(
+			function ($timeslot) {
+				return $timeslot->id;
+			},
+			$timeslots
+		);
+
+		$updatedExistingParticipants = getData($this->execQuery($existingParticipantsQuery));
+		foreach ($updatedExistingParticipants as $participant) {
+			if (!$participant->selection)
+				continue;
+
+			$selection = json_decode($participant->selection, true);
+			if (!count($selection))
+				continue;
+
+			$obsoleteSelectedTimeslotIds = array_diff($selection, $timeslotIds);
+			if (!count($obsoleteSelectedTimeslotIds))
+				continue;
+
+			$updatedSelection = null;
+			if (count($obsoleteSelectedTimeslotIds) !== count($selection)) {
+				$updatedSelection = array_filter(
+					$selection,
+					function ($timeslotId) use ($obsoleteSelectedTimeslotIds) {
+						return !in_array($timeslotId, $obsoleteSelectedTimeslotIds);
+					}
+				);
+			}
+
+			$this->updateSelection($surveyId, $participant->participant_uid, $updatedSelection);
+		}
+	}
+
+	public function updateSelection($surveyId, $participantUid, $selection)
+	{
+		$selection = $selection !== null ? "'" . json_encode($selection) . "'" : "NULL";
+		$selectionUpdateQuery = "UPDATE $this->dbTable SET selection = $selection WHERE survey_id = $surveyId AND participant_uid = '$participantUid'";
+		$this->execQuery($selectionUpdateQuery);
+	}
+}

application/models/ressource/CoodleSurveyTimeslot_model.php

@@ -0,0 +1,100 @@
+<?php
+class CoodleSurveyTimeslot_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_coodle_survey_timeslots';
+		$this->pk = 'id';
+	}
+
+	public function getTimeslots($surveyId)
+	{
+		$query = "SELECT id, starts_at
+			FROM $this->dbTable
+			WHERE survey_id = $surveyId
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getTimeslotsForMultipleSurveys($surveyIds)
+	{
+		if (!count($surveyIds)) return [];
+
+		$surveyIds = "(" . implode(", ", $surveyIds) . ")";
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE survey_id IN $surveyIds
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getTimeslot($timeslotId)
+	{
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE id = $timeslotId
+			LIMIT 1
+		";
+		return $this->execQuery($query);
+	}
+
+	public function updateTimeslots($surveyId, $timeslots)
+	{
+		$newTimeslots = array_filter(
+			$timeslots,
+			function ($timeslot) {
+				return !$timeslot["id"];
+			}
+		);
+		$persistedTimeslots = array_filter(
+			$timeslots,
+			function ($timeslot) {
+				return $timeslot["id"];
+			}
+		);
+		$persistedTimeslotIds = array_map(
+			function ($persistedTimeslot) {
+				return $persistedTimeslot["id"];
+			},
+			$persistedTimeslots
+		);
+
+		$existingTimeslotsQuery = "SELECT id, starts_at
+			FROM $this->dbTable
+			WHERE survey_id = $surveyId
+		";
+		$existingTimeslots = getData($this->execQuery($existingTimeslotsQuery));
+		$existingTimeslotIds = array_map(
+			function ($existingTimeslot) {
+				return $existingTimeslot->id;
+			},
+			$existingTimeslots
+		);
+
+		$obsoleteTimeslotIds = array_diff($existingTimeslotIds, $persistedTimeslotIds);
+		if (count($obsoleteTimeslotIds)) {
+			$deleteQuery = "DELETE FROM $this->dbTable WHERE id IN ('" . implode("', '", $obsoleteTimeslotIds) . "');";
+			$this->execQuery($deleteQuery);
+		}
+
+		if (count($newTimeslots)) {
+			$insertQuery = "INSERT INTO $this->dbTable (survey_id, starts_at) VALUES ";
+			$newTimeslotInsertValues = array_map(
+				function ($newTimeslot) use ($surveyId) {
+					return "('$surveyId', '" . $newTimeslot["startsAt"] . "')";
+				},
+				$newTimeslots
+			);
+			$newTimeslotInsertValues = implode(", ", $newTimeslotInsertValues);
+			$insertQuery .= $newTimeslotInsertValues;
+			$insertQuery .= ";";
+
+			$this->execQuery($insertQuery);
+		}
+	}
+}

application/models/ressource/CoodleSurvey_model.php

@@ -0,0 +1,164 @@
+<?php
+class CoodleSurvey_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_coodle_surveys';
+		$this->pk = 'id';
+
+		$this->load->model('ressource/CoodleSurveyParticipant_model', 'CoodleSurveyParticipantModel');
+	}
+
+	public function getSurvey($surveyId)
+	{
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE id = $surveyId
+			LIMIT 1
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getSurveys($surveyIds)
+	{
+		if (!count($surveyIds)) return [];
+
+		$surveyIds = "(" . implode(", ", $surveyIds) . ")";
+		$query = "SELECT *
+			FROM $this->dbTable
+			WHERE id IN $surveyIds
+		";
+		return $this->execQuery($query);
+	}
+
+	public function getActiveSurveys($uid)
+	{
+		$userParticipantEntries = getData($this->CoodleSurveyParticipantModel->getParticipantEntriesByUid($uid));
+		$surveyIdsWhereUserIsParticipant = array_map(
+			function ($userParticipantEntry) {
+				return $userParticipantEntry->survey_id;
+			},
+			$userParticipantEntries
+		);
+		$surveyIdsWhereUserIsParticipantValue = implode(", ", $surveyIdsWhereUserIsParticipant);
+
+		$query = "SELECT
+			survey.id as id,
+			survey.creator_uid as creator_uid,
+			survey.title as title,
+			survey.ends_at as ends_at,
+			survey.created_at as created_at,
+			person.vorname || ' ' || person.nachname AS creator_name
+		 	FROM $this->dbTable as survey
+			JOIN public.tbl_benutzer benutzer ON(benutzer.uid = survey.creator_uid)
+			JOIN public.tbl_person person ON(person.person_id = benutzer.person_id)
+			WHERE (";
+		if (strlen($surveyIdsWhereUserIsParticipantValue)) {
+			$query .= "id IN ($surveyIdsWhereUserIsParticipantValue) OR ";
+		}
+		$query .= "creator_uid = '$uid')
+			AND completed_at IS NULL
+			AND canceled_at IS NULL";
+
+		return $this->execQuery($query);
+	}
+
+	public function getInactiveSurveys($uid)
+	{
+		$userParticipantEntries = getData($this->CoodleSurveyParticipantModel->getParticipantEntriesByUid($uid));
+		$surveyIdsWhereUserIsParticipant = array_map(
+			function ($userParticipantEntry) {
+				return $userParticipantEntry->survey_id;
+			},
+			$userParticipantEntries
+		);
+		$surveyIdsWhereUserIsParticipantValue = implode(", ", $surveyIdsWhereUserIsParticipant);
+
+		$query = "SELECT 
+			survey.id as id,
+			survey.creator_uid as creator_uid,
+			survey.title as title,
+			survey.created_at as created_at,
+			survey.completed_at as completed_at,
+			survey.canceled_at as canceled_at,
+			person.vorname || ' ' || person.nachname AS creator_name
+		 	FROM $this->dbTable as survey
+			JOIN public.tbl_benutzer benutzer ON(benutzer.uid = survey.creator_uid)
+			JOIN public.tbl_person person ON(person.person_id = benutzer.person_id)
+			WHERE (";
+		if (strlen($surveyIdsWhereUserIsParticipantValue)) {
+			$query .= "id IN ($surveyIdsWhereUserIsParticipantValue) OR ";
+		}
+		$query .= "creator_uid = '$uid')
+			AND (completed_at IS NOT NULL OR canceled_at IS NOT NULL)";
+
+		return $this->execQuery($query);
+	}
+
+	public function createSurvey($surveyData, $creatorUid)
+	{
+		$surveyCreationResult = $this->insert([
+			"creator_uid" => $creatorUid,
+			"title" => $surveyData["title"],
+			"description" => $surveyData["description"] ?? "",
+			"timeslot_duration" => $surveyData["timeslotDuration"],
+			"are_selections_anonymized" => !!$surveyData["areSelectionsAnonymized"],
+			"are_participants_anonymized" => !!$surveyData["areParticipantsAnonymized"],
+			"max_selections" => $surveyData["maxSelections"] ?? 1,
+			"selected_timeslot_id" => null,
+			"ends_at" => $surveyData["endsAt"],
+			"completed_at" => null,
+			"canceled_at" => null,
+			"created_at" => "NOW()",
+			"updated_at" => "NOW()",
+		]);
+
+		if (isError($surveyCreationResult)) {
+			return error('Something went wrong during survey creation!');
+		}
+
+		return $surveyCreationResult;
+	}
+
+	public function updateSurvey($surveyId, $surveyData)
+	{
+		$surveyUpdateResult = $this->update($surveyId, [
+			"title" => $surveyData["title"],
+			"description" => $surveyData["description"],
+			"timeslot_duration" => $surveyData["timeslotDuration"],
+			"are_selections_anonymized" => $surveyData["areSelectionsAnonymized"],
+			"are_participants_anonymized" => $surveyData["areParticipantsAnonymized"],
+			"max_selections" => $surveyData["maxSelections"],
+			"ends_at" => $surveyData["endsAt"],
+			"updated_at" => "NOW()",
+		]);
+
+		if (isError($surveyUpdateResult)) {
+			return error('Something went wrong during survey update!');
+		}
+
+		return $surveyUpdateResult;
+	}
+
+	public function cancelSurvey($surveyId)
+	{
+		$this->update($surveyId, [
+			"canceled_at" => "NOW()",
+			"updated_at" => "NOW()",
+		]);
+	}
+
+	public function completeSurvey($surveyId, $timeslotId)
+	{
+		$this->update($surveyId, [
+			"selected_timeslot_id" => $timeslotId,
+			"completed_at" => "NOW()",
+			"updated_at" => "NOW()",
+		]);
+	}
+}

application/models/ressource/Mitarbeiter_model.php

@@ -98,31 +98,6 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
-	/**
-	 * Active staff, names only, for a picker.
-	 *
-	 * getPersonal() returns tbl_person.* including svnr, bpk and
-	 * gebdatum, which is not needed in a CMS endpoint.
-	 *
-	 * @return object
-	 */
-	public function getAktivesPersonalNamen()
-	{
-		$query = '
-			SELECT
-				b.uid,
-				p.vorname,
-				p.nachname
-			FROM public.tbl_benutzer b
-				JOIN public.tbl_mitarbeiter m ON m.mitarbeiter_uid = b.uid
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-			WHERE b.aktiv
-			ORDER BY LOWER(p.nachname), LOWER(p.vorname)
-		';
-
-		return $this->execReadOnlyQuery($query);
-	}
-
 	/**
 	 * gibt Personen mit Übersicht von Vertragsdaten aus
 	 *

application/models/ressource/Zeitsperre_model.php

@@ -12,6 +12,12 @@ class Zeitsperre_model extends DB_Model
 		$this->pk = 'zeitsperre_id';
 	}
 
+	public function getZeitsperre($uid)
+	{
+		$query = "SELECT * from campus.tbl_zeitsperre WHERE mitarbeiter_uid = '$uid'";
+		return $this->execQuery($query);
+	}
+
     /**
      * Save or update Zeitsperre.
      *

application/models/system/Webservicelog_model.php

@@ -12,72 +12,4 @@ class Webservicelog_model extends DB_Model
 		$this->dbTable = 'system.tbl_webservicelog';
 		$this->pk = 'webservicelog_id';
 	}
-
-	/**
-	 * The most viewed contents since a date, with the title of each one.
-	 * request_id is a varchar, so the join casts the content_id to text. A cast of
-	 * request_id to a number would fail on a row that holds no number.
-	 * The join also drops a log row whose content is deleted.
-	 * @param string|null $since timestamp in the form Y-m-d H:i:s, null for the whole log
-	 * @param string $sprache language of the title
-	 * @param int $limit length of the ranking
-	 * @return stdClass success with array of rows or error
-	 */
-	public function getContentClickCounts($since, $sprache, $limit)
-	{
-		$params = [$sprache, 'content'];
-		$sinceCondition = '';
-
-		if ($since !== null)
-		{
-			$sinceCondition = ' AND w.execute_time >= ?';
-			$params[] = $since;
-		}
-
-		$params[] = $limit;
-
-		$query = '
-			SELECT c.content_id, COUNT(*) AS hits,
-				(SELECT titel FROM campus.tbl_contentsprache
-				 WHERE content_id = c.content_id AND sprache = ?
-				 ORDER BY version LIMIT 1) AS titel
-			FROM system.tbl_webservicelog w
-				JOIN campus.tbl_content c ON c.content_id::text = w.request_id
-			WHERE w.webservicetyp_kurzbz = ?' . $sinceCondition . '
-			GROUP BY c.content_id
-			ORDER BY COUNT(*) DESC, c.content_id
-			LIMIT ?
-		';
-
-		return $this->execReadOnlyQuery($query, $params);
-	}
-
-	/**
-	 * Views of one content since a date. A content outside the ranking still needs its
-	 * own number.
-	 * @param int $content_id
-	 * @param string|null $since timestamp in the form Y-m-d H:i:s, null for the whole log
-	 * @return stdClass success with int or error
-	 */
-	public function getContentClickCount($content_id, $since)
-	{
-		$query = '
-			SELECT COUNT(*) AS hits
-			FROM system.tbl_webservicelog
-			WHERE webservicetyp_kurzbz = ? AND request_id = ?
-		';
-		$params = ['content', (string) $content_id];
-
-		if ($since !== null)
-		{
-			$query .= ' AND execute_time >= ?';
-			$params[] = $since;
-		}
-
-		$result = $this->execReadOnlyQuery($query, $params);
-		if (isError($result))
-			return $result;
-
-		return success((int) getData($result)[0]->hits);
-	}
 }

application/views/CisRouterView/CisRouterView.php

@@ -23,7 +23,6 @@ $includesArray = array(
 		'public/css/components/FormUnderline.css',
 		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
-		'public/css/Cis4/Contentcomponents.css',
 		'public/css/Cis4/Studium.css'
 	),
 	'customJSs' => array(

application/views/Cms.php

@@ -1,35 +0,0 @@
-<?php
-	$includesArray = array(
-		'title'      => 'CMS',
-		'axios027'   => true,
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3'       => true,
-		'primevue3'  => true,
-		'tabulator6' => true,
-		'tinymce5'   => true,
-		'phrases'    => array('global', 'ui', 'cms'),
-		'customCSSs' => [
-			'public/css/components/verticalsplit.css',
-			'public/css/components/horizontalsplit.css',
-			'public/css/Cms.css'
-		],
-		'customJSs' => [
-			'vendor/npm-asset/primevue/tree/tree.min.js',
-			'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
-			'vendor/npm-asset/primevue/textarea/textarea.min.js',
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Cms.js']
-	);
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-	<div id="main">
-		<router-view
-			cms-root="<?= site_url('cms'); ?>"
-			auth-uid="<?= getAuthUID(); ?>"
-			default-language="<?= defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : 'German'; ?>"
-			<?= !empty($clickstats) ? 'clickstats' : ''; ?>
-		></router-view>
-	</div>
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/lehre/lehrauftrag/acceptLehrauftragData.php

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

application/views/lehre/lehrauftrag/approveLehrauftragData.php

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

application/views/lehre/lehrauftrag/orderLehrauftragData.php

@@ -272,8 +272,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
-                    pa.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
+                    le.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -310,7 +310,8 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -320,7 +321,7 @@ FROM
                     /* filter studiengang */
                     lv.studiengang_kz IN ('. implode(',', $STUDIENGANG) . ')
                     /* filter studiensemester */
-                  AND pa.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
+                  AND le.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter ausbildungssemester */

application/views/system/infocenter/infocenterFreigegebenData.php

@@ -8,7 +8,6 @@
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'Attempt to register with existing mailadress\', \'Access code sent\', \'Personal data saved\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
-	$QUALIFIKATIONSKURS = $this->config->item('infocenter_qualifikationskurs_kz');
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
 	$ORG_NAME = '\'InfoCenter\'';
@@ -278,26 +277,7 @@ $query = '
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
-			) AS "Kaution",
-			(
-				SELECT 1
-				  FROM public.tbl_prestudentstatus pss
-				  JOIN public.tbl_prestudent ps USING(prestudent_id)
-				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
-				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
-				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
-				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
-				   AND ps.person_id = p.person_id
-				   AND sg.studiengang_kz in('.$QUALIFIKATIONSKURS.')
-				   AND NOT EXISTS (
-					   SELECT 1
-						 FROM tbl_prestudentstatus spss
-						WHERE spss.prestudent_id = ps.prestudent_id
-						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-					)
-				 LIMIT 1
-			) AS "Qualikurs"
+			) AS "Kaution"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -371,8 +351,7 @@ $query = '
 			'ZGV Nation MA',
 			'InfoCenter Mitarbeiter',
 			'Identitätsnachweis',
-			ucfirst($this->p->t('infocenter', 'kaution')),
-			'Qualikurs'
+			ucfirst($this->p->t('infocenter', 'kaution'))
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -501,14 +480,6 @@ $query = '
 				$datasetRaw->{'Kaution'} = 'Offen';
 			}
 
-			if ($datasetRaw->{'Qualikurs'} === null)
-			{
-				$datasetRaw->{'Qualikurs'} = 'Nein';
-			}
-			else
-			{
-				$datasetRaw->{'Qualikurs'} = 'Ja';
-			}
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {

application/views/system/infocenter/stammdaten.php

@@ -92,14 +92,6 @@
 		</table>
 	</div>
 	<div class="col-lg-6 table-responsive">
-		<?php if ($onboarding_first_login): ?>
-			<div class="row" id="onboardingRow">
-				<?php if ($created_by_onboarding): ?>
-					<div class="col-xs-5"><strong><?php echo $this->p->t('infocenter','onboardingRegistriert') ?></strong></div>
-				<?php endif; ?>
-				<div class="col-xs-7<?php echo $created_by_onboarding ? ' text-right' : '' ?>"><strong><?php echo $this->p->t('infocenter','ersterOnboardingLogin').': '.date_format(date_create($onboarding_first_login), 'd.m.Y') ?></strong></div>
-			</div>
-		<?php endif; ?>
 		<table class="table table-bordered stammdaten_form">
 			<thead>
 			<tr>
@@ -199,12 +191,12 @@
 				</div>
 			<?php endif; ?>
 			<div class="col-xs-6">
-				<a class="editStammdaten" href="javascript:void(0);">
+				<a class="editStammdaten">
 					<i class="fa fa-edit"></i>&nbsp;<?php echo $this->p->t('ui','bearbeiten'); ?></a>
 				<div class="editActionStammdaten" style="display:none">
-					<a class="cancelStammdaten" href="javascript:void(0);">
+					<a class="cancelStammdaten">
 						<i class="fa fa-trash"></i>&nbsp;<?php echo $this->p->t('ui','abbrechen');?></a>
-					<a class="saveStammdaten" href="javascript:void(0);">
+					<a class="saveStammdaten">
 						<i class="fa fa-save"></i>&nbsp;<?php echo $this->p->t('ui','speichern'); ?></a>
 				</div>
 			</div>

application/views/templates/CISVUE-Header.php

@@ -29,10 +29,11 @@ $this->load->view('templates/FHC-Header', $includesArray);
 	<cis-menu 
 		root-url="<?= site_url(''); ?>" 
 		logo-url="<?= base_url($this->config->item('theme_logo')); ?>" 
-		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
+		avatar-url="<?= isset($isExternal) && $isExternal ? '' : site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction"
+		:is-external="<?= isset($isExternal) && $isExternal ? 1 : 0 ?>"
 		></cis-menu>
 </header>
 

cis/private/profile/lva_liste.php

@@ -345,10 +345,11 @@ $qry = "SELECT
 			 WHERE uid=student_uid) as student, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester,
 			 tbl_studiengang.email, tbl_betreuerart.beschreibung AS beutreuerart_beschreibung, tbl_projektbetreuer.stunden
 		FROM
-			lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
+			lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
 		WHERE
-			tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_projektarbeit.lehrveranstaltung_id AND
-			tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($stdsem)." AND
+			tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
+			tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+			tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stdsem)." AND
 			tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 			tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz AND
 			tbl_projektbetreuer.betreuerart_kurzbz=tbl_betreuerart.betreuerart_kurzbz AND

cis/private/tools/projektabgabe.php

@@ -143,6 +143,7 @@ if($aktion!='zip')
 							JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 							LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 							LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+							LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 							WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
@@ -213,6 +214,7 @@ if(isset($_REQUEST['ok']) || (isset($_REQUEST['aktion']) && $_REQUEST['aktion']=
 			JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 			LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 			LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+			LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 			LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 			LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 			WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')

cis/private/tools/projektabgabe_autocomplete.php

@@ -87,6 +87,7 @@ cellSeparator (default value: "|")
 							JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 							LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 							LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+							LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 							WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')

cis/public/freebusy_coodle.php

@@ -25,77 +25,10 @@
  * http://www.example.com/cis/public/freebusy_coodle.php/oesi
  */
 require_once('../../config/cis.config.inc.php');
-require_once('../../include/benutzer.class.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/coodle.class.php');
-require_once('../../include/ical.class.php');
 
-$uid = mb_substr($_SERVER['PATH_INFO'],1);
+$uid = mb_substr($_SERVER['PATH_INFO'], 1);
+$excludeSurveyQueryParam = isset($_GET['excludeSurvey']) ? '?excludeSurvey=' . $_GET['excludeSurvey'] : '';
 
-$bn = new benutzer();
-if(!$bn->load($uid))
-	die('User invalid');
-	
-header("Content-Type: text/calendar; charset=UTF-8");
-
-echo "BEGIN:VCALENDAR\n";
-echo "VERSION:2.0\n";
-echo "PRODID:-//FH TECHNIKUM WIEN//EN\n";
-echo "METHOD:PUBLISH\n";
-echo 'ORGANIZER;CN=',$bn->vorname,' ',$bn->nachname,':mailto:',$uid,'@',DOMAIN,"\n";
-echo 'DTSTAMP;TZID=Europe/Vienna:',date('Ymd', mktime(date('H'),date('i'),date('s'),date('m'),date('d')-5,date('Y'))),'T',date('Hms'),"\n";
-echo 'DTSTART;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')-5,date('Y'))),"T000000\n";
-echo 'DTEND;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')+30,date('Y'))),"T000000\n";
-echo 'URL:',APP_ROOT,'cis/public/freebusy_coodle.php/',$uid,"\n";
-echo "BEGIN:VFREEBUSY";
-
-// Alle Umfragen holen an denen der User beteiligt ist
-$umfragen = new coodle();
-$umfragen->getCoodleFromUser($uid);
-foreach($umfragen->result as $umfrage)
-{	
-	if($umfrage->coodle_status_kurzbz=='laufend')
-	{
-		// Bei laufenden Umfragen werden alle angekreuzten Vorschlaege zur FreeBusy hinzugefuegt
-		$ressource = new coodle();
-		if($ressource_id = $ressource->RessourceExists($umfrage->coodle_id, $uid))
-		{	
-			// Terminvorschlaege laden die angekreuzt wurden
-			$termine = new coodle();
-			$termine->getRessourceTermin($umfrage->coodle_id, $ressource_id);
-			foreach($termine->result as $termin)
-			{
-				//Start und Ende berechnen
-			    $date = new DateTime($termin->datum.' '.$termin->uhrzeit);
-			    $dtstart = $date->format('Ymd\THis');
-		    	$interval =new DateInterval('PT'.$umfrage->dauer.'M');
-			    $date->add($interval);
-		    	$uhrzeit_ende = $date->format('H:i:s');
-		    	$dtende = $date->format('Ymd\THis');
-		    	echo "\nFREEBUSY;TZID=Europe/Vienna: $dtstart/$dtende";
-			}
-		}
-	}
-	elseif($umfrage->coodle_status_kurzbz=='abgeschlossen')
-	{
-		// Bei abgeschlossenen Umfragen wird nur mehr der ausgewaehlte Termin zur FreeBusy hinzugefuegt
-		$termin = new coodle();
-		$coodle_termin_id=$termin->getTerminAuswahl($umfrage->coodle_id);
-		if($termin->loadTermin($coodle_termin_id))
-		{
-			//Start und Ende berechnen
-		    $date = new DateTime($termin->datum.' '.$termin->uhrzeit);
-		    $dtstart = $date->format('Ymd\THis');
-	    	$interval =new DateInterval('PT'.$umfrage->dauer.'M');
-		    $date->add($interval);
-	    	$uhrzeit_ende = $date->format('H:i:s');
-	    	$dtende = $date->format('Ymd\THis');
-	    	echo "\nFREEBUSY;TZID=Europe/Vienna: $dtstart/$dtende";
-		}
-	}
-	// stornierte Umfragen werden nicht beruecksichtigt
-}
-
-echo "\nEND:VFREEBUSY";
-echo "\nEND:VCALENDAR";
+header('Location: ' . APP_ROOT . 'cis.php/CoodleFreeBusy/' . $uid . $excludeSurveyQueryParam);
+exit;
 ?>

cis/public/ical_coodle.php

@@ -23,140 +23,21 @@
  * Aufruf: http://www.example.com/cis/public/ical_coodle.php/[uid]
  */
 require_once('../../config/cis.config.inc.php');
-require_once('../../include/benutzer.class.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/coodle.class.php');
-require_once('../../include/ical.class.php');
-
 
 $params = mb_substr($_SERVER['PATH_INFO'],1);
 $paramsArray = explode('/',$params);
-$private = false;
 
+// redirect to new coodle ical
 if ($paramsArray[0] == 'cipher_encryption')
 {
-	$uid = decryptData($paramsArray[1],LVPLAN_CYPHER_KEY);
-	$private = true;
+	$encryptedKey = $paramsArray[1];
+	header('Location: '.APP_ROOT.'cis.php/CoodleIcal/encrypted/' . $encryptedKey);
+	exit;
 }
 else
 {
 	$uid = $paramsArray[0];
+	header('Location: '.APP_ROOT.'cis.php/CoodleIcal/' . $uid);
+	exit;
 }
-
-$bn = new benutzer();
-if(!$bn->load($uid))
-	die('User invalid');
-	
-header("Content-Type: text/calendar; charset=UTF-8");
-header("Content-disposition: filename=Coodle Terminzusagen.ics");
-
-echo "BEGIN:VCALENDAR\n";
-echo "VERSION:2.0\n";
-echo "PRODID:-//FH TECHNIKUM WIEN//EN\n";
-//echo "METHOD:PUBLISH\n";
-//echo 'ORGANIZER;CN=',$bn->vorname,' ',$bn->nachname,':mailto:',$uid,'@',DOMAIN,"\n";
-//echo 'DTSTAMP;TZID=Europe/Vienna:',date('Ymd', mktime(date('H'),date('i'),date('s'),date('m'),date('d')-5,date('Y'))),'T',date('Hms'),"\n";
-echo 'DTSTART;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')-5,date('Y'))),"T000000\n";
-echo 'DTEND;TZID=Europe/Vienna:',date('Ymd', mktime(0,0,0,date('m'),date('d')+30,date('Y'))),"T000000\n";
-echo "BEGIN:VTIMEZONE
-TZID:Europe/Vienna
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE\n";
-//echo 'URL:',APP_ROOT,'cis/public/ical_coodle.php/',$uid,"\n";
-
-// Alle Umfragen holen an denen der User beteiligt ist
-$umfragen = new coodle();
-$umfragen->getCoodleFromUser($uid);
-$i = 0;
-if (count($umfragen->result) > 0)
-{
-	//echo "BEGIN:VEVENT";
-}
-foreach($umfragen->result as $umfrage)
-{
-	if($umfrage->coodle_status_kurzbz=='laufend')
-	{
-		// Bei laufenden Umfragen werden alle angekreuzten Vorschlaege zur FreeBusy hinzugefuegt
-		$ressource = new coodle();
-		if($ressource_id = $ressource->RessourceExists($umfrage->coodle_id, $uid))
-		{	
-			// Terminvorschlaege laden die angekreuzt wurden
-			$termine = new coodle($umfrage->coodle_id);
-			$termine->getRessourceTermin($umfrage->coodle_id, $ressource_id);
-			foreach($termine->result as $termin)
-			{
-				//Start und Ende berechnen
-				$date = new DateTime($termin->datum.' '.$termin->uhrzeit);
-				$dtstart = $date->format('Ymd\THis');
-				$interval =new DateInterval('PT'.$umfrage->dauer.'M');
-				$date->add($interval);
-				$uhrzeit_ende = $date->format('H:i:s');
-				$dtende = $date->format('Ymd\THis');
-				$ersteller = new benutzer($termine->ersteller_uid);
-				if ($private == true)
-				{
-					$summary = 'Coodle Terminoption '.strip_tags($termine->titel);
-					$description = 'Erstellt von '.$ersteller->vorname.' '.$ersteller->nachname;
-				}
-				else
-				{
-					$summary = 'Coodle Terminoption';
-					$description = '';
-				}
-
-				echo "\nBEGIN:VEVENT";
-				echo "\nUID:Coodle_Terminoption".$dtstart."_".$dtende;
-				echo "\nSUMMARY:".$summary;
-				echo "\nDESCRIPTION:".$description;
-				echo "\nDTSTART;TZID=Europe/Vienna:$dtstart";
-				echo "\nDTEND;TZID=Europe/Vienna:$dtende";
-				echo "\nTRANSP:OPAQUE";
-				echo "\nEND:VEVENT";
-
-				$i++;
-			}
-		}
-	}
-	// Bei abgeschlossene Umfragen wird ein iCal File mitgeschickt,
-	// deshalb müssen diese Termine nicht berücksichtigt werden
-	/*elseif($umfrage->coodle_status_kurzbz=='abgeschlossen')
-	{
-		// Bei abgeschlossenen Umfragen wird nur mehr der ausgewaehlte Termin zur FreeBusy hinzugefuegt
-		$termin = new coodle();
-		$coodle_termin_id=$termin->getTerminAuswahl($umfrage->coodle_id);
-		if($termin->loadTermin($coodle_termin_id))
-		{
-			//Start und Ende berechnen
-			$date = new DateTime($termin->datum.' '.$termin->uhrzeit);
-			$dtstart = $date->format('Ymd\THis');
-			$interval =new DateInterval('PT'.$umfrage->dauer.'M');
-			$date->add($interval);
-			$uhrzeit_ende = $date->format('H:i:s');
-			$dtende = $date->format('Ymd\THis');
-
-			echo "\nBEGIN:VEVENT";
-			echo "\nSUMMARY:Coodle Terminzusage";
-			echo "\nDTSTART;TZID=Europe/Vienna: $dtstart";
-			echo "\nDTEND;TZID=Europe/Vienna: $dtende";
-			echo "\nTRANSP:OPAQUE";
-			echo "\nEND:VEVENT";
-		}
-	}*/
-	// stornierte Umfragen werden nicht beruecksichtigt
-}
-
-echo "\nEND:VCALENDAR";
 ?>

cis/testtool/login.php

@@ -632,7 +632,6 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
-				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,7 +29,6 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
-require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -199,8 +198,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT * FROM (SELECT DISTINCT ON
-			(gebiet_id)
+		SELECT DISTINCT ON
+			(gebiet_id, semester, reihung)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -227,7 +226,13 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					tbl_ablauf.semester <= prestudent_data.semester
+					(
+						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+						OR
+						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
+						OR
+						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					)
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -254,7 +259,9 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					tbl_ablauf.semester <= prestudent_data.semester
+					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+				OR
+					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
 				)
 			) temp
 		) temp2
@@ -263,7 +270,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." ) temp3
+			". $bezeichnung_mehrsprachig_sel ." 
 
 		ORDER BY
 			semester,
@@ -276,8 +283,6 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
-	$gebiet_pruefling = new gebiet_pruefling();
-	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -289,25 +294,8 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			if ($row->semester == '1')
-			{
-				// Basisgebiete anzeigen
-				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
-			}
-			else
-			{
-				if (!$quereinsteiger_menu)
-				{
-					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
-					$quereinsteiger_menu = true;
-				}
-				else
-				{
-					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; margin-top: 5px;">';
+			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -406,12 +394,6 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
-			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
-			{
-				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
-				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
-				$gebiet_pruefling->saveGebietForPruefling();
-			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

cms/tinymce_dms.php

@@ -83,40 +83,12 @@ if (! $rechte->isberechtigt('basis/dms', null, 's', null))
 		return confirm('Möchten Sie das File wirklich löschen?');
 	}
 
-	/*
-	 * CIS4 bridge, ticket 78489.
-	 *
-	 * The TinyMCE 5 editor of the new CMS admin cannot receive a selection through the
-	 * TinyMCE 3 API below, so this window posts the URL back to its opener instead.
-	 *
-	 *     message: { typ: 'fhc-dms-selection', url: 'dms.php?id=<dms_id>' }
-	 *     target:  window.opener, origin checked on both sides
-	 *
-	 * The path is chosen by window.name, which the opener sets and which survives the
-	 * internal navigation of this browser.
-	 *
-	 * Receiving side: public/js/components/Cms/Form/FieldWysiwyg.js
-	 */
 	var FileBrowserDialog=
 	{
 		init: function(){
 		},
 		mySubmit : function (id) {
 			var URL = "dms.php?id="+id;
-
-			// CIS4 path: see the comment block above this function. Do not test for
-			// tinyMCEPopup, this page loads tiny_mce_popup.js itself and always defines it.
-			if (window.name === 'DMS_CIS4' && window.opener && !window.opener.closed) {
-				window.opener.postMessage({ typ: 'fhc-dms-selection', url: URL }, window.location.origin);
-				window.close();
-				return;
-			}
-
-			if (typeof tinyMCEPopup === 'undefined') {
-				alert('The calling window is no longer available.');
-				return;
-			}
-
 				var win = tinyMCEPopup.getWindowArg("window");
 
 				// insert information now

content/mitarbeiter/lehrtaetigkeit.pdf.php

@@ -122,7 +122,8 @@ foreach ($project_arr as $project)
 
 	// * get studiensemester
 	$pa = new Projektarbeit($pa_id);
-	$studiensemester_kurzbz = $pa->studiensemester_kurzbz;
+	$le = new Lehreinheit($pa->lehreinheit_id);
+	$studiensemester_kurzbz = $le->studiensemester_kurzbz;
 
 	// * get begin- and end date of studiensemester
 	$ss = new Studiensemester($studiensemester_kurzbz);

content/statistik/alvsstatistik.php

@@ -107,14 +107,16 @@ SELECT
 FROM
 	lehre.tbl_projektarbeit,
 	lehre.tbl_lehrveranstaltung,
+	lehre.tbl_lehreinheit,
 	lehre.tbl_projektbetreuer,
 	public.tbl_person
 WHERE
 	tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-	tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+	tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
+	tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 	tbl_projektbetreuer.person_id=tbl_person.person_id AND
 	tbl_projektbetreuer.stunden<>0 AND
-	tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
+	tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
 GROUP BY studiengang_kz,geschlecht";
 
 if(!$result = $db->db_query($qry))
@@ -229,7 +231,7 @@ if($format=='xls')
 				if(!isset($stunden['w']))
 					$stunden['w']=0;
 				$summe_w+=$stunden['w'];
-				if(!isset($summe_oe[$oe]['w']))
+				if(!isset($summe_oe[$oe]['w']))
 					$summe_oe[$oe]['w']=0;
 				$summe_oe[$oe]['w']+=$stunden['w'];
 				$worksheet->write($zeile,$organisationseinheiten_idx[$oe]+1,$stunden['w'],$format_data);

content/statistik/lehrauftragsliste_gst.xls.php

@@ -85,7 +85,7 @@ $db = new basis_db();
 //Daten holen
 $qry = "SELECT * FROM (
 		SELECT
-			tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
+			tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
 			tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
 			tbl_mitarbeiter.fixangestellt,
 			tbl_lehreinheitmitarbeiter.stundensatz as stundensatz,
@@ -109,20 +109,21 @@ if($semester!='')
 //Projektsbetreuungen
 $qry.= " UNION
 		 SELECT
-		 	tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
+		 	tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
 		 	tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
 			tbl_mitarbeiter.fixangestellt,
 			0 as stundensatz,
 			0 as semesterstunden
 		 FROM
-		 	lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer,
+		 	lehre.tbl_lehreinheit, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer,
 		 	public.tbl_mitarbeiter, public.tbl_benutzer, lehre.tbl_lehrveranstaltung, public.tbl_person
 		 WHERE
 		 	tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid AND
 		 	tbl_benutzer.person_id = tbl_projektbetreuer.person_id AND
 		 	tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id AND
-		 	tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-			tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+		 	tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
+		 	tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+		 	tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
 		 	tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
 		 	tbl_person.person_id = tbl_projektbetreuer.person_id";
 if($semester!='')
@@ -163,15 +164,16 @@ if($result = $db->db_query($qry))
 		$qry = "
 			SELECT
 				tbl_projektbetreuer.stunden, tbl_projektbetreuer.stundensatz
-			FROM lehre.tbl_projektbetreuer, lehre.tbl_lehrveranstaltung,
+			FROM lehre.tbl_projektbetreuer, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
 				public.tbl_benutzer, lehre.tbl_projektarbeit, campus.vw_student
 			WHERE
 				tbl_projektbetreuer.person_id=tbl_benutzer.person_id
 				AND tbl_benutzer.uid=".$db->db_add_param($uid)."
 				AND tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id
 				AND student_uid=vw_student.uid
-				AND tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
-				AND tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+				AND tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id
+				AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 				AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 		if($semester!='')
 			$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);

content/statistik/lehrauftragsliste_mail.xls.php

@@ -99,9 +99,10 @@ $qry_stg = "SELECT distinct studiengang_kz, typ, kurzbz
 					studiengang_kz
 				FROM
 					lehre.tbl_projektbetreuer JOIN lehre.tbl_projektarbeit ON tbl_projektbetreuer.projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-					JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_projektarbeit.lehrveranstaltung_id
+					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_projektarbeit.lehreinheit_id
+					JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id
 				WHERE
-					lehre.tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+					lehre.tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				) as foo
 				JOIN public.tbl_studiengang USING (studiengang_kz)
 				";
@@ -505,9 +506,10 @@ if ($result_stg = $db->db_query($qry_stg))
 						JOIN public.tbl_benutzer ON tbl_benutzer.person_id=tbl_person.person_id
 						JOIN public.tbl_mitarbeiter ON tbl_mitarbeiter.mitarbeiter_uid=tbl_benutzer.uid
 						JOIN lehre.tbl_projektarbeit ON tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id
-						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_projektarbeit.lehrveranstaltung_id
+						JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id
+						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id
 					WHERE
-						tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+						tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 						tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
 						NOT EXISTS (SELECT
 										mitarbeiter_uid
@@ -587,11 +589,12 @@ if ($result_stg = $db->db_query($qry_stg))
 					FROM
 						lehre.tbl_projektbetreuer JOIN public.tbl_benutzer ON tbl_projektbetreuer.person_id = tbl_benutzer.person_id
 						JOIN lehre.tbl_projektarbeit ON tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
-						JOIN lehre.tbl_lehrveranstaltung ON tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+						JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_projektarbeit.lehreinheit_id
+						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 						JOIN campus.vw_student ON vw_student.uid = student_uid
 					WHERE
 						tbl_benutzer.uid = ".$db->db_add_param($uid)."
-						AND tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+						AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 						AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 
 				if ($result = $db->db_query($qry))
@@ -822,14 +825,15 @@ if ($result_stg = $db->db_query($qry_stg))
 	$worksheet =& $workbook->addWorksheet('Betreuerstunden');
 	$worksheet->setInputEncoding('utf-8');
 	$qry = "SELECT
-				lehre.tbl_projektarbeit.studiensemester_kurzbz, nachname, vorname, sum(stunden) AS stunden, titelpre,
+				studiensemester_kurzbz, nachname, vorname, sum(stunden) AS stunden, titelpre,
 				sum(tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)::numeric(8, 2) AS euro, person_id
 			FROM
 				public.tbl_person JOIN lehre.tbl_projektbetreuer USING (person_id)
 				JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+				JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 				JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 			WHERE
-				lehre.tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+				studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
 				stunden > 0";
 
 	if (count($stg_arr) > 0)
@@ -837,7 +841,7 @@ if ($result_stg = $db->db_query($qry_stg))
 
 	$qry .= "
 			GROUP BY
-				lehre.tbl_projektarbeit.studiensemester_kurzbz, person_id, nachname, vorname, titelpre
+				studiensemester_kurzbz, person_id, nachname, vorname, titelpre
 			ORDER BY
 				nachname, vorname
 			";

content/statistik/lvplanung.php

@@ -304,14 +304,15 @@ if($studiengang_kz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung,
+				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
 				lehre.tbl_projektbetreuer, public.tbl_person
 			WHERE
-				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 
 	if($semester!='')
@@ -322,13 +323,14 @@ elseif($mitarbeiter_uid!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person
+				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person
 			WHERE
-				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_projektbetreuer.person_id=".$db->db_add_param($mitarbeiter->person_id, FHC_INTEGER)." AND
-				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 }
 elseif($oe_kurzbz!='')
@@ -336,14 +338,15 @@ elseif($oe_kurzbz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
+				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
 				public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach
 			WHERE
-				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-				tbl_projektarbeit.lehrveranstaltung_id=lehrfach.lehrveranstaltung_id AND
+				tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
-				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 				lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz)."
 				";
 }

content/statistik/lvplanung.xls.php

@@ -490,13 +490,15 @@ if($result = $db->db_query($qry))
 				tbl_projektbetreuer.person_id,
 				tbl_lehrveranstaltung.orgform_kurzbz
 			FROM lehre.tbl_projektarbeit,
+				lehre.tbl_lehreinheit,
 				lehre.tbl_lehrveranstaltung,
 				lehre.tbl_projektbetreuer,
 				PUBLIC.tbl_person
-			WHERE tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+			WHERE tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 				AND tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
 				AND tbl_person.person_id = tbl_projektbetreuer.person_id
-				AND tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
+				AND tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
 
 	if($uid!=='')
 	{

content/statistik/projektarbeitexport.xls.php

@@ -84,14 +84,15 @@ $qry = "SELECT
 			ende, CASE WHEN freigegeben THEN 'Ja' ELSE 'Nein' END, gesperrtbis, themenbereich,
 			tbl_projektarbeit.anmerkung, projektarbeit_id
 		FROM
-			lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung,
+			lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
 			public.tbl_benutzer, public.tbl_person, lehre.tbl_projekttyp
 		WHERE
-			tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
+			tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
+			tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id AND
 			tbl_projektarbeit.student_uid = tbl_benutzer.uid AND
 			tbl_benutzer.person_id = tbl_person.person_id AND
 			tbl_projektarbeit.projekttyp_kurzbz = tbl_projekttyp.projekttyp_kurzbz AND
-			tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)." AND
+			tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)." AND
 			tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz)." AND
 			tbl_projektarbeit.projekttyp_kurzbz IN ('Bachelor','Diplom','Projekt')";
 

content/student/studentDBDML.php

@@ -4374,8 +4374,6 @@ if(!$error)
 			$projektarbeit->titel = $_POST['titel'];
 			$projektarbeit->titel_english = $_POST['titel_english'];
 			$projektarbeit->lehreinheit_id = $_POST['lehreinheit_id'];
-			$projektarbeit->lehrveranstaltung_id = $_POST['lehrveranstaltung_id'];
-			$projektarbeit->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
 			$projektarbeit->student_uid = $_POST['student_uid'];
 			$projektarbeit->firma_id = $_POST['firma_id'];
 			$projektarbeit->note = $_POST['note'];

content/student/studentprojektarbeit.js.php

@@ -239,7 +239,6 @@ function StudentProjektarbeitDetailDisableFields(val)
 	document.getElementById('student-projektarbeit-button-speichern').disabled=val;
 	document.getElementById('student-projektarbeit-menulist-projekttyp').disabled=val;
 	document.getElementById('student-projektarbeit-menulist-lehrveranstaltung').disabled=val;
-	document.getElementById('student-projektarbeit-menulist-studiensemester').disabled=val;
 	document.getElementById('student-projektarbeit-menulist-lehreinheit').disabled=val;
 	document.getElementById('student-projektarbeit-menulist-firma').disabled=val;
 	document.getElementById('student-projektarbeit-menulist-note').disabled=val;
@@ -291,7 +290,6 @@ function StudentProjektarbeitResetFields()
 	document.getElementById('student-projektarbeit-menulist-firma').value='';
 	document.getElementById('student-projektarbeit-menulist-note').value='';
 	document.getElementById('student-projektarbeit-checkbox-final').checked=true;
-	document.getElementById('student-projektarbeit-menulist-studiensemester').value=getStudiensemester();
 
 	var stg_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;
 
@@ -381,7 +379,6 @@ function StudentProjektarbeitAuswahl()
 	lehreinheit_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehreinheit_id" ));
 	lehrveranstaltung_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehrveranstaltung_id" ));
 	lehreinheit_stsem = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehreinheit_stsem" ));
-	projektarbeit_stsem = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#projektarbeit_stsem" ));
 	student_uid = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#student_uid" ));
 	firma_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#firma_id" ));
 	note = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#note" ));
@@ -402,7 +399,7 @@ function StudentProjektarbeitAuswahl()
 
 	//Lehrveranstaltung DropDown laden
 	var LvDropDown = document.getElementById('student-projektarbeit-menulist-lehrveranstaltung');
-	url='<?php echo APP_ROOT;?>rdf/lehrveranstaltung.rdf.php?uid='+student_uid+"&stg_kz="+stg_kz+"&projektarbeit=true&withlv="+lehrveranstaltung_id+"&"+gettimestamp();
+	url='<?php echo APP_ROOT;?>rdf/lehrveranstaltung.rdf.php?uid='+student_uid+"&projektarbeit=true&withlv="+lehrveranstaltung_id+"&"+gettimestamp();
 
 	//Alte DS entfernen
 	var oldDatasources = LvDropDown.database.GetDataSources();
@@ -423,7 +420,7 @@ function StudentProjektarbeitAuswahl()
 
 	// Lehreinheit Drop Down laden
 	var LeDropDown = document.getElementById('student-projektarbeit-menulist-lehreinheit');
-	url='<?php echo APP_ROOT;?>rdf/lehreinheit.rdf.php?lehrveranstaltung_id='+lehrveranstaltung_id+"&studiensemester_kurzbz="+projektarbeit_stsem+"&"+gettimestamp();
+	url='<?php echo APP_ROOT;?>rdf/lehreinheit.rdf.php?lehrveranstaltung_id='+lehrveranstaltung_id+"&studiensemester_kurzbz="+lehreinheit_stsem+"&"+gettimestamp();
 
 	//Alte DS entfernen
 	var oldDatasources = LeDropDown.database.GetDataSources();
@@ -445,7 +442,6 @@ function StudentProjektarbeitAuswahl()
 	//Werte setzen
 	document.getElementById('student-projektarbeit-textbox-projektarbeit_id').value=projektarbeit_id;
 	document.getElementById('student-projektarbeit-textbox-lehreinheit_stsem').value=lehreinheit_stsem;
-	document.getElementById('student-projektarbeit-menulist-studiensemester').value=projektarbeit_stsem;
 	document.getElementById('student-projektarbeit-menulist-projekttyp').value=projekttyp_kurzbz;
 	document.getElementById('student-projektarbeit-menulist-lehrveranstaltung').value=lehrveranstaltung_id;
 	document.getElementById('student-projektarbeit-menulist-lehreinheit').value=lehreinheit_id;
@@ -543,7 +539,6 @@ function StudentProjektarbeitSpeichern()
 	projektarbeit_id = document.getElementById('student-projektarbeit-textbox-projektarbeit_id').value;
 	projekttyp_kurzbz = document.getElementById('student-projektarbeit-menulist-projekttyp').value;
 	lehrveranstaltung_id = document.getElementById('student-projektarbeit-menulist-lehrveranstaltung').value;
-	studiensemester_kurzbz = document.getElementById('student-projektarbeit-menulist-studiensemester').value;
 	lehreinheit_id = document.getElementById('student-projektarbeit-menulist-lehreinheit').value;
 	titel = document.getElementById('student-projektarbeit-textbox-titel').value;
 	titel_english = document.getElementById('student-projektarbeit-textbox-titel_english').value;
@@ -590,18 +585,12 @@ function StudentProjektarbeitSpeichern()
 		return false;
 	}
 
-	if(lehrveranstaltung_id=='')
+	if(lehreinheit_id=='')
 	{
-		alert('Bitte eine Lehrveranstaltung auswaehlen');
+		alert('Bitte einen LV-Teil auswaehlen');
 		return false;
 	}
 
-	if(studiensemester_kurzbz=='')
-	{
-		alert('Bitte ein Studiensemester auswaehlen');
-		return false;
-	}
-	
 	if(isNaN(gesamtstunden))
 		gesamtstunden=0;
 
@@ -614,8 +603,6 @@ function StudentProjektarbeitSpeichern()
 	req.add('projekttyp_kurzbz', projekttyp_kurzbz );
 	req.add('titel', titel);
 	req.add('titel_english', titel_english);
-	req.add('lehrveranstaltung_id', lehrveranstaltung_id);
-	req.add('studiensemester_kurzbz', studiensemester_kurzbz);
 	req.add('lehreinheit_id', lehreinheit_id);
 	req.add('student_uid', student_uid);
 	req.add('firma_id', firma_id);
@@ -751,7 +738,7 @@ function StudentProjektarbeitLVAChange()
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
 	lehrveranstaltung_id = document.getElementById('student-projektarbeit-menulist-lehrveranstaltung').value;
-	studiensemester_kurzbz = document.getElementById('student-projektarbeit-menulist-studiensemester').value;
+	studiensemester_kurzbz = getStudiensemester();
 
 	// Lehreinheit Drop Down laden
 	var LeDropDown = document.getElementById('student-projektarbeit-menulist-lehreinheit');
@@ -910,8 +897,8 @@ function StudentProjektbetreuerAuswahl()
 	document.getElementById('student-projektbetreuer-textbox-person_id').value=person_id;
 	document.getElementById('student-projektbetreuer-checkbox-neu').checked=false;
 
-	var projektarbeitstsem = document.getElementById('student-projektarbeit-menulist-studiensemester').value;
-	var default_stundensatz = StudentProjektbetreuerLoadStundensatz(person_id, projektarbeitstsem);
+	var lehreinheitstsem = document.getElementById('student-projektarbeit-textbox-lehreinheit_stsem').value;
+	var default_stundensatz = StudentProjektbetreuerLoadStundensatz(person_id, lehreinheitstsem);
 
 	if (default_stundensatz != '')
 		default_stundensatz = 'Stundensatz (Default '+default_stundensatz+'):';
@@ -1423,10 +1410,9 @@ function StudentProjektbetreuerLoadStundensatz(person_id, studiensemester)
 function StudentProjektbetreuerLoadMitarbeiterDaten()
 {
 	var person_id = MenulistGetSelectedValue('student-projektbetreuer-menulist-person');
-	var projektarbeitstsem = document.getElementById('student-projektarbeit-menulist-studiensemester').value;
+	var lehreinheitstsem = document.getElementById('student-projektarbeit-textbox-lehreinheit_stsem').value;
 
-
-	var stundensatz = StudentProjektbetreuerLoadStundensatz(person_id, projektarbeitstsem);
+	var stundensatz = StudentProjektbetreuerLoadStundensatz(person_id, lehreinheitstsem);
 
 	if (stundensatz != '')
 		default_stundensatz = 'Stundensatz (Default '+stundensatz+'):';

content/student/studentprojektarbeitoverlay.xul.php

@@ -104,10 +104,6 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/projektarbeit/rdf#projektarbeit_id" />
 				<splitter class="tree-splitter"/>
-				<treecol id="student-projektarbeit-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true"
-						 class="sortDirectionIndicator"
-						 sort="rdf:http://www.technikum-wien.at/projektarbeit/rdf#lehrveranstaltung_id" />
-				<splitter class="tree-splitter"/>
 				<treecol id="student-projektarbeit-tree-lehreinheit_id" label="LehreinheitID" flex="2" hidden="true"
 					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/projektarbeit/rdf#lehreinheit_id" />
@@ -135,7 +131,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 						<treeitem uri="rdf:*">
 						<treerow>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#bezeichnung"/>
-							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#projektarbeit_stsem"/>
+							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#lehreinheit_stsem"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#titel"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#note"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#beginn"/>
@@ -145,7 +141,6 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#themenbereich"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#anmerkung"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#projektarbeit_id"/>
-							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#lehrveranstaltung_id"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#lehreinheit_id"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#student_uid"/>
 							<treecell label="rdf:http://www.technikum-wien.at/projektarbeit/rdf#firma_id"/>
@@ -254,20 +249,6 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 								</template>
 							</menulist>
 						</row>
-						<row>
-							<label value="Studiensemester" control="student-projektarbeit-menulist-studiensemester"/>
-							<menulist id="student-projektarbeit-menulist-studiensemester" disabled="true"
-									  datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php?order=desc" flex="1"
-									  ref="http://www.technikum-wien.at/studiensemester/liste">
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
-												  label="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
-												  uri="rdf:*"/>
-									</menupopup>
-								</template>
-							</menulist>
-						</row>
 						<row>
 							<label value="LV-Teil" control="student-projektarbeit-menulist-lehreinheit"/>
 							<menulist id="student-projektarbeit-menulist-lehreinheit" disabled="true"

content/zutrittskarte.php

@@ -271,8 +271,7 @@ foreach ($uid_arr as $uid)
 					'matr_nr' => $person->matr_nr,
 					'ausstellungsdatum' => date('M.Y'),
 					'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y'),
-                    'gueltigbis_3jahre' => date('d.m.Y', strtotime('+3 years')),
-					'gueltigbis_2jahre' => date('d.m.Y', strtotime('+2 years'))
+                    'gueltigbis_3jahre' => date('d.m.Y', strtotime('+3 years'))
 				);
 			}
 		}

include/adresse.class.php

@@ -521,63 +521,5 @@ class adresse extends basis_db
 		}
 		return true;
 	}
-
-	/**
-	 * Laedt die österreichische Zustell Adresse einer Person
-	 * @param  $person_id ID der Person
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function loadOesterreichischeZustellAdresse($person_id, $typ = null)
-	{
-		//Pruefen ob person_id eine gueltige Zahl ist
-		if(!is_numeric($person_id) || $person_id == '')
-		{
-			$this->errormsg = 'PersonID muss eine Zahl sein';
-			return false;
-		}
-		$typ_clause = '';
-		if (isset($typ)) $typ_clause = "AND typ=".$this->db_add_param($typ);
-
-		//Daten aus der Datenbank lesen
-		$qry = "SELECT * FROM public.tbl_adresse WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER, false)."
-			AND nation = 'A'
-			{$typ_clause}
-			ORDER BY zustelladresse DESC, adresse_id DESC LIMIT 1";
-
-		if(!$this->db_query($qry))
-		{
-			$this->errormsg = 'Fehler bei einer Datenbankabfrage';
-			return false;
-		}
-
-		if($row = $this->db_fetch_object())
-		{
-			$this->adresse_id		= $row->adresse_id;
-			$this->heimatadresse 	= $this->db_parse_bool($row->heimatadresse);
-			$this->zustelladresse	= $this->db_parse_bool($row->zustelladresse);
-			$this->gemeinde			= $row->gemeinde;
-			$this->name				= $row->name;
-			$this->nation			= $row->nation;
-			$this->ort				= $row->ort;
-			$this->person_id		= $row->person_id;
-			$this->plz				= $row->plz;
-			$this->strasse			= $row->strasse;
-			$this->typ				= $row->typ;
-			$this->updateamum		= $row->updateamum;
-			$this->updatevon		= $row->updatevon;
-			$this->insertamum		= $row->insertamum;
-			$this->insertvon		= $row->insertvon;
-			$this->firma_id			= $row->firma_id;
-			$this->rechnungsadresse = $this->db_parse_bool($row->rechnungsadresse);
-			$this->anmerkung        = $row->anmerkung;
-			$this->co_name			= $row->co_name;
-		}
-		else
-		{
-			$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
-			return false;
-		}
-		return true;
-	}
 }
 ?>

include/bisarchiv.class.php

@@ -48,7 +48,7 @@ class bisarchiv extends basis_db
 	 */
 	protected function validate()
 	{
-		if($this->studiensemester_kurzbz == null || mb_strlen($this->studiensemester_kurzbz) > 6)
+		if($this->studiensemster_kurzbz == null || mb_strlen($this->studiensemster_kurzbz) > 6)
 		{
 			$this->errormsg = "Studiensemester ist ungueltig";
 			return false;
@@ -107,7 +107,7 @@ class bisarchiv extends basis_db
 			return false;
 		
 		$qry = "INSERT INTO bis.tbl_archiv (studiensemester_kurzbz, meldung, html, studiengang_kz, insertamum, insertvon, typ) VALUES ("
-			. $this->db_add_param($this->studiensemester_kurzbz) . ","
+			. $this->db_add_param($this->studiensemster_kurzbz) . ","
 			. $this->db_add_param($this->meldung) . ","
 			. $this->db_add_param($this->html) . ","
 			. $this->db_add_param($this->studiengang_kz) . ","

include/gebiet_pruefling.class.php

@@ -1,97 +0,0 @@
-<?php
-/* Copyright (C) 2024 Technikum-Wien
- *
- * 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.
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-
-class gebiet_pruefling extends basis_db
-{
-	//Tabellenspalten
-	public $prueflinggebiet_id;
-	public $pruefling_id;
-	public $gebiet_id;
-	public $insertamum;
-
-
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function loadByPruefling($pruefling_id)
-	{
-		$qry = "SELECT *
-     			FROM testtool.tbl_pruefling_gebiet
-     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
-				$this->pruefling_id = $row->pruefling_id;
-				$this->gebiet_id = $row->gebiet_id;
-				return true;
-			}
-			else
-			{
-				$this->errormsg = "Pruefling nicht gefunden";
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
-			return false;
-		}
-	}
-
-	public function checkIfExists($pruefling_id, $gebiet_id)
-	{
-		$qry = "SELECT 1 
-				FROM testtool.tbl_pruefling_gebiet 
-				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
-
-		if ($result = $this->db_query($qry))
-		{
-			if ($this->db_num_rows($result) > 0)
-				return true;
-			else
-				return false;
-		}
-	}
-
-	public function saveGebietForPruefling()
-	{
-		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
-    					(pruefling_id, gebiet_id)
-				VALUES(".
-			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
-			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
-
-		if ($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return true;
-		}
-	}
-
-}
-?>

include/lehrveranstaltung.class.php

@@ -2088,7 +2088,7 @@ class lehrveranstaltung extends basis_db
 	/**
 	 * lädt die Lehrveranstaltungen zum zugehörigen Mitarbeiter
 	 * @param String $uid User ID des Mitarbeiters
-	 * @param String $studiensemester_kurzbz Kurzbezeichnung des Studiensemesters
+	 * @param String $studiensemster_kurzbz Kurzbezeichnung des Studiensemesters
 	 */
 	public function getLVByMitarbeiter($uid, $studiensemester_kurzbz = null)
 	{
@@ -2911,176 +2911,5 @@ class lehrveranstaltung extends basis_db
 		return null;
 
 	}
-
-	/**
-	 * Filtert die geladenen Lehrveranstaltungen gegen den aktuellen Studienplan des Studenten.
-	 * Ermittelt den Studienplan über den Prestudent-Status (aktuellster Eintrag) und gleicht
-	 * die vorhandenen IDs mit der Tabelle tbl_studienplan_lehrveranstaltung ab.
-	 * Die interne Liste wird nur bei gefundenen Treffern aktualisiert.
-	 *
-	 * @param string $student_uid Student uid.
-	 * @return bool True bei erfolgreicher Abwicklung oder leeren Ausgangsdaten, False bei Datenbankfehlern.
-	 */
-	public function checkLvaAgainstStudentCurrentStudienplan($student_uid) {
-		$qryStudent = "SELECT prestudent_id FROM tbl_student WHERE student_uid = ".$this->db_add_param($student_uid)."";
-		
-		if($result = $this->db_query($qryStudent))
-		{
-			if($row = $this->db_fetch_object($result))
-			{
-				$prestudent_id = $row->prestudent_id;
-			}
-			else
-			{
-				$this->errormsg = 'Fehler beim Ermitteln der des aktuellen studienplan für studenten über prestudent';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
-			return false;
-		}
-		
-		$qryHistory = "SELECT studienplan_id
-					   FROM public.tbl_prestudentstatus 
-					   WHERE prestudent_id = ".$this->db_add_param($prestudent_id)."
-					   ORDER BY public.tbl_prestudentstatus.datum DESC";
-		if($result = $this->db_query($qryHistory))
-		{
-			if($row = $this->db_fetch_object($result))
-			{
-				$studienplan_id = $row->studienplan_id;
-			}
-			else
-			{
-				$this->errormsg = 'Fehler beim Ermitteln der des aktuellen studienplan für studenten über prestudentstatus';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
-			return false;
-		}
-
-		// needs to have lva_ids from previous query in this context
-		$lvsIDs = array_column($this->lehrveranstaltungen, 'lehrveranstaltung_id');
-
-		if (empty($lvsIDs)) {
-			// exit without modifying object state if no lva_id to query by are found 
-			return true; 
-		}
-		
-		$ids = $this->db_implode4SQL($lvsIDs);
-		
-		$qry = "SELECT tbl_lehrveranstaltung.*,
-				tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
-				tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
-				tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
-				tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
-				tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
-				tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
-				tbl_studienplan_lehrveranstaltung.curriculum,
-				tbl_studienplan_lehrveranstaltung.export,
-				tbl_studienplan_lehrveranstaltung.genehmigung
-			FROM lehre.tbl_lehrveranstaltung
-			JOIN lehre.tbl_studienplan_lehrveranstaltung
-			USING(lehrveranstaltung_id)
-			WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ".$this->db_add_param($studienplan_id)."
-				AND tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN (".$ids.");";
-
-		if($result = $this->db_query($qry))
-		{
-			// reset the lva array and fill it with the new set
-			$temp_lvas = array();
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new lehrveranstaltung();
-
-				$obj->lehrveranstaltung_id = $row->lehrveranstaltung_id;
-				$obj->studiengang_kz = $row->studiengang_kz;
-				$obj->bezeichnung = $row->bezeichnung;
-				$obj->kurzbz = $row->kurzbz;
-				$obj->lehrform_kurzbz = $row->lehrform_kurzbz;
-				$obj->semester = $row->semester;
-				$obj->ects = $row->ects;
-				$obj->semesterstunden = $row->semesterstunden;
-				$obj->anmerkung = $row->anmerkung;
-				$obj->lehre = $this->db_parse_bool($row->lehre);
-				$obj->lehreverzeichnis = $row->lehreverzeichnis;
-				$obj->aktiv = $this->db_parse_bool($row->aktiv);
-				$obj->ext_id = $row->ext_id;
-				$obj->insertamum = $row->insertamum;
-				$obj->insertvon = $row->insertvon;
-				$obj->planfaktor = $row->planfaktor;
-				$obj->planlektoren = $row->planlektoren;
-				$obj->planpersonalkosten = $row->planpersonalkosten;
-				$obj->plankostenprolektor = $row->plankostenprolektor;
-				$obj->updateamum = $row->updateamum;
-				$obj->updatevon = $row->updatevon;
-				$obj->sprache = $row->sprache;
-				$obj->sort = $row->sort;
-				$obj->incoming = $row->incoming;
-				$obj->zeugnis = $this->db_parse_bool($row->zeugnis);
-				$obj->projektarbeit = $this->db_parse_bool($row->projektarbeit);
-				$obj->koordinator = $row->koordinator;
-				$obj->bezeichnung_english = $row->bezeichnung_english;
-				$obj->orgform_kurzbz = $row->orgform_kurzbz;
-				$obj->lehrtyp_kurzbz = $row->lehrtyp_kurzbz;
-				$obj->lehrmodus_kurzbz = $row->lehrmodus_kurzbz;
-				$obj->oe_kurzbz = $row->oe_kurzbz;
-				$obj->raumtyp_kurzbz = $row->raumtyp_kurzbz;
-				$obj->anzahlsemester = $row->anzahlsemester;
-				$obj->semesterwochen = $row->semesterwochen;
-				$obj->lvnr = $row->lvnr;
-				$obj->semester_alternativ = $row->semester_alternativ;
-				$obj->farbe = $row->farbe;
-				$obj->lehrveranstaltung_template_id = $row->lehrveranstaltung_template_id;
-				$obj->stpllv_sort = $row->stpllv_sort;
-				$obj->benotung = $this->db_parse_bool($row->benotung);
-				$obj->lvinfo = $this->db_parse_bool($row->lvinfo);
-				$obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
-				$obj->evaluierung = $this->db_parse_bool($row->evaluierung);
-
-				$obj->bezeichnung_arr['German'] = $row->bezeichnung;
-				$obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
-				if ($obj->bezeichnung_arr['English'] == '')
-					$obj->bezeichnung_arr['English'] = $obj->bezeichnung_arr['German'];
-
-				$obj->sws = $row->sws;
-				$obj->lvs = $row->lvs;
-				$obj->alvs = $row->alvs;
-				$obj->lvps = $row->lvps;
-				$obj->las = $row->las;
-
-				$obj->stpllv_semester = $row->stpllv_semester;
-				$obj->stpllv_pflicht = $this->db_parse_bool($row->stpllv_pflicht);
-				$obj->stpllv_koordinator = $row->stpllv_koordinator;
-				$obj->studienplan_lehrveranstaltung_id = $row->studienplan_lehrveranstaltung_id;
-				$obj->studienplan_lehrveranstaltung_id_parent = $row->studienplan_lehrveranstaltung_id_parent;
-				$obj->curriculum = $this->db_parse_bool($row->curriculum);
-				$obj->export = $this->db_parse_bool($row->export);
-				$obj->genehmigung = $this->db_parse_bool($row->genehmigung);
-				$obj->new = false;
-
-				$temp_lvas[] = $obj;
-			}
-			
-			// Only update the class property if we actually found matching records.
-			// If $temp_lvas is empty, $this->lehrveranstaltungen remains unchanged.
-			if (!empty($temp_lvas)) {
-				$this->lehrveranstaltungen = $temp_lvas;
-			}
-
-			return true;
-		}
-		else
-		{
-			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
-			return false;
-		}
-		
-	}
 }
 ?>

include/projektarbeit.class.php

@@ -37,8 +37,6 @@ class projektarbeit extends basis_db
 	public $titel;				// string
 	public $titel_english;		// string
 	public $lehreinheit_id;		// integer
-	public $lehrveranstaltung_id; // integer
-	public $studiensemester_kurzbz; // string
 	public $student_uid;		// integer
 	public $firma_id;			// integer
 	public $note;				// integer
@@ -131,8 +129,6 @@ class projektarbeit extends basis_db
 				$this->titel = $row->titel;
 				$this->titel_english = $row->titel_english;
 				$this->lehreinheit_id = $row->lehreinheit_id;
-				$this->lehrveranstaltung_id = $row->lehrveranstaltung_id;
-				$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
 				$this->student_uid = $row->student_uid;
 				$this->firma_id = $row->firma_id;
 				$this->note = $row->note;
@@ -182,13 +178,9 @@ class projektarbeit extends basis_db
 		{
 			$this->errormsg='Projekttyp_kurzbz darf nicht NULL sein!';
 		}
-		if ($this->lehrveranstaltung_id==null)
+		if ($this->lehreinheit_id==null)
 		{
-			$this->errormsg='Lehrveranstaltung_id darf nicht NULL sein!';
-		}
-		if ($this->studiensemester_kurzbz==null)
-		{
-			$this->errormsg='Studiensemester_kurzbz darf nicht NULL sein!';
+			$this->errormsg='Lehreinheit_id darf nicht NULL sein!';
 		}
 		if(mb_strlen($this->projekttyp_kurzbz)>16)
 		{
@@ -269,15 +261,12 @@ class projektarbeit extends basis_db
 		{
 			//Neuen Datensatz einfuegen
 
-			$qry='BEGIN; INSERT INTO lehre.tbl_projektarbeit (projekttyp_kurzbz, titel, lehreinheit_id, 
-				lehrveranstaltung_id, studiensemester_kurzbz, student_uid, firma_id, note, punkte,
+			$qry='BEGIN; INSERT INTO lehre.tbl_projektarbeit (projekttyp_kurzbz, titel, lehreinheit_id, student_uid, firma_id, note, punkte,
 				beginn, ende, faktor, freigegeben, gesperrtbis, stundensatz, gesamtstunden, themenbereich, anmerkung,
 				insertamum, insertvon, updateamum, updatevon, titel_english, final) VALUES('.
 				 $this->db_add_param($this->projekttyp_kurzbz).', '.
 				 $this->db_add_param($this->titel).', '.
 				 $this->db_add_param($this->lehreinheit_id, FHC_INTEGER).', '.
-				 $this->db_add_param($this->lehrveranstaltung_id, FHC_INTEGER).', '.
-				 $this->db_add_param($this->studiensemester_kurzbz).', '.
 				 $this->db_add_param($this->student_uid).', '.
 				 $this->db_add_param($this->firma_id, FHC_INTEGER).', '.
 				 $this->db_add_param($this->note).', '.
@@ -312,8 +301,6 @@ class projektarbeit extends basis_db
 				'titel='.$this->db_add_param($this->titel).', '.
 				'titel_english='.$this->db_add_param($this->titel_english).', '.
 				'lehreinheit_id='.$this->db_add_param($this->lehreinheit_id, FHC_INTEGER).', '.
-				'lehrveranstaltung_id='.$this->db_add_param($this->lehrveranstaltung_id, FHC_INTEGER).', '.
-				'studiensemester_kurzbz='.$this->db_add_param($this->studiensemester_kurzbz).', '.
 				'student_uid='.$this->db_add_param($this->student_uid).', '.
 				'firma_id='.$this->db_add_param($this->firma_id, FHC_INTEGER).', '.
 				'note='.$this->db_add_param($this->note).', '.
@@ -419,8 +406,6 @@ class projektarbeit extends basis_db
 				$obj->titel = $row->titel;
 				$obj->titel_english = $row->titel_english;
 				$obj->lehreinheit_id = $row->lehreinheit_id;
-				$obj->lehrveranstaltung_id = $row->lehrveranstaltung_id;
-				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
 				$obj->student_uid = $row->student_uid;
 				$obj->firma_id = $row->firma_id;
 				$obj->note = $row->note;
@@ -464,13 +449,14 @@ class projektarbeit extends basis_db
 					tbl_projektarbeit.* , tbl_projekttyp.bezeichnung
 				FROM
 					lehre.tbl_projektarbeit
-				JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-				JOIN lehre.tbl_lehrveranstaltung ON (lehre.tbl_projektarbeit.lehrveranstaltung_id = lehre.tbl_lehrveranstaltung.lehrveranstaltung_id)
+				JOIN
+					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung
 
 				WHERE
-					tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+					tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+					tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
 					tbl_lehrveranstaltung.studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-					tbl_projektarbeit.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+					tbl_lehreinheit.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 
 		if($this->db_query($qry))
 		{
@@ -484,8 +470,6 @@ class projektarbeit extends basis_db
 				$obj->titel = $row->titel;
 				$obj->titel_english = $row->titel_english;
 				$obj->lehreinheit_id = $row->lehreinheit_id;
-				$obj->lehrveranstaltung_id = $row->lehrveranstaltung_id;
-				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
 				$obj->student_uid = $row->student_uid;
 				$obj->firma_id = $row->firma_id;
 				$obj->note = $row->note;
@@ -550,6 +534,7 @@ class projektarbeit extends basis_db
 				pa.projekttyp_kurzbz
 			FROM
 				lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
 				LEFT JOIN (
 					SELECT

include/vertrag.class.php

@@ -371,14 +371,14 @@ class vertrag extends basis_db
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_projektarbeit.studiensemester_kurzbz,
+			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 		WHERE
 			tbl_projektbetreuer.person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
 			AND vertrag_id IS NULL";
@@ -461,8 +461,9 @@ class vertrag extends basis_db
 					OR
 					EXISTS (SELECT 1 FROM lehre.tbl_projektbetreuer
 								JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+								JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							WHERE
-								tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
+								tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
 								AND tbl_projektbetreuer.person_id=tbl_person.person_id
 								AND tbl_projektbetreuer.vertrag_id IS NULL
 							)
@@ -534,12 +535,12 @@ class vertrag extends basis_db
 		UNION
 		SELECT
 			'Betreuung' as type,
-			NULL as lehreinheit_id,
+			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
 			null as mitarbeiter_uid,
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_projektarbeit.studiensemester_kurzbz,
+			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung,
@@ -548,6 +549,7 @@ class vertrag extends basis_db
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 			JOIN lehre.tbl_vertrag USING (vertrag_id)
 		WHERE
 			vertrag_id=".$this->db_add_param($vertrag_id, FHC_INTEGER).";";
@@ -940,16 +942,17 @@ class vertrag extends basis_db
 								JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							WHERE
 								vertrag_id=tbl_vertrag.vertrag_id
-								AND lehre.tbl_lehreinheit.studiensemester_kurzbz=".$this->db_add_param($stsem).")
+								AND studiensemester_kurzbz=".$this->db_add_param($stsem).")
 					OR
 					EXISTS (SELECT
 								1
 							FROM
 								lehre.tbl_projektbetreuer
 								JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+								JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							WHERE
 								vertrag_id=tbl_vertrag.vertrag_id
-								AND lehre.tbl_projektarbeit.studiensemester_kurzbz=".$this->db_add_param($stsem).")
+								AND studiensemester_kurzbz=".$this->db_add_param($stsem).")
 				 	OR
 					(NOT EXISTS (SELECT
 								1
@@ -977,7 +980,7 @@ class vertrag extends basis_db
 										JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 									WHERE
 										vertrag_id=tbl_vertrag.vertrag_id
-										AND lehre.tbl_lehreinheit.studiensemester_kurzbz=".$this->db_add_param($stsem).")
+										AND studiensemester_kurzbz=".$this->db_add_param($stsem).")
 						)
 					AND tbl_benutzer.uid=".$this->db_add_param($mitarbeiter_uid);
 
@@ -1074,7 +1077,7 @@ class vertrag extends basis_db
 					JOIN lehre.tbl_lehreinheitmitarbeiter USING(vertrag_id)
 					JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				WHERE
-					lehre.tbl_lehreinheit.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
 					AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT IN(SELECT uid FROM public.tbl_benutzer WHERE person_id=tbl_vertrag.person_id)
 				UNION
 				SELECT
@@ -1083,8 +1086,9 @@ class vertrag extends basis_db
 					lehre.tbl_vertrag
 					JOIN lehre.tbl_projektbetreuer USING(vertrag_id)
 					JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+					JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				WHERE
-					tbl_projektarbeit.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
 					AND tbl_projektbetreuer.person_id!=tbl_vertrag.person_id";
 
 		if($result = $this->db_query($qry))

include/zeitaufzeichnung.class.php

@@ -748,14 +748,17 @@ or not exists
 			UNION
 			SELECT sum(pb.stunden) AS semstunden
 			FROM
-				lehre.tbl_projektarbeit pa 
-					JOIN lehre.tbl_projektbetreuer pb ON(pa.projektarbeit_id = pb.projektarbeit_id)
-					JOIN public.tbl_benutzer b ON(pb.person_id = b.person_id)
-					JOIN lehre.tbl_lehreinheit l ON(pa.lehrveranstaltung_id = l.lehrveranstaltung_id AND pa.studiensemester_kurzbz = l.studiensemester_kurzbz)
-					JOIN lehre.tbl_lehrveranstaltung lv ON (l.lehrveranstaltung_id = lv.lehrveranstaltung_id)
-					JOIN public.tbl_studiengang s USING (studiengang_kz)
+				lehre.tbl_projektarbeit pa,
+				lehre.tbl_projektbetreuer pb,
+				public.tbl_benutzer b,
+				lehre.tbl_lehreinheit l
+			JOIN
+				lehre.tbl_lehrveranstaltung lv using (lehrveranstaltung_id)
+			JOIN
+				public.tbl_studiengang s using (studiengang_kz)
 
 			WHERE
+				pa.lehreinheit_id = l.lehreinheit_id AND
 				pb.projektarbeit_id = pa.projektarbeit_id AND
 				pb.person_id = b.person_id AND
 				b.uid = ".$this->db_add_param($user)." AND

public/css/Cis4/Cis.css

@@ -33,6 +33,10 @@ html {
 	background-color: var(--fhc-primary) !important;
 }
 
+.fhc-primary-border-color {
+	border-color: var(--fhc-primary) !important;
+}
+
 .fhc-primary-highlight-bg {
 	background-color: var(--fhc-primary-highlight) !important;
 }
@@ -840,11 +844,8 @@ html {
 	color: var(--fhc-light);
 }
 
-/* the bootstrap opacity 0.5 reaches 2.9:1 on the blue header, 0.75 reaches 4.5:1 (WCAG 1.4.11) */
 #cis-main .modal-header .btn-close{
 	filter: invert(1);
-	--bs-btn-close-opacity: 0.75;
-	--bs-btn-close-hover-opacity: 1;
 }
 
 #cis-main .modal-footer {
@@ -856,4 +857,67 @@ html {
 	border: 1px solid rgba(0, 0, 0, 0.15);
 	border-radius: 0.5rem;
 	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
+}
+
+#coodleParticipantsSearchResults {
+	background-color: var(--fhc-background);
+    border: 1px solid var(--fhc-border);
+}
+.coodleParticipantSearchResult:hover {
+	opacity: 80%;	
+}
+
+.coodleCalendarTimeslotCard:hover {
+	background-color: var(--fhc-background);
+}
+
+.coodlePrimaryHover:hover {
+	color: var(--fhc-primary);
+}
+
+#coodleCalendar .fhc-calendar-base .part-body {
+	z-index: 1 !important;
+}
+
+#coodleCalendar .fhc-calendar-base .fhc-calendar-base-grid-line-background {
+	z-index: 1 !important;
+	pointer-events: none;
+}
+
+#coodleCalendar .fhc-calendar-base-grid-line-event {
+	pointer-events: none;
+}
+
+#coodleCalendar .coodle-calendar-event-clear {
+	pointer-events: auto;
+}
+
+#freeBusyTable th {
+	background-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
+#freeBusyTable .action:hover {
+	opacity:80%;
+}
+
+.fhcPrimaryHover:hover {
+	color: var(--fhc-primary);
+}
+
+.fhcPrimaryBorderHover:hover {
+	border-color: var(--fhc-primary) !important;
+}
+
+button.tabulator-page {
+	background-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
+button.tabulator-page:hover {
+	opacity: 90%;
+}
+
+button.tabulator-page.active {
+	border: solid 2px var(--fhc-primary) !important;
 }

public/css/Cis4/Contentcomponents.css

@@ -1,196 +0,0 @@
-/* Contentcomponents in CIS4 content.
- *
- * A contentcomponent renders inside its marker div, below #fhc-cms-content. The
- * components themselves carry Bootstrap utility classes only, so without this file they
- * read as unstyled Bootstrap.
- *
- * The class names are the contract with the components. A root class follows the pattern
- * fhc-contentcomponent-<name> and is set in the template of the component.
- *
- * Colours come from the theme. public/css/theme/default.css declares the semantic
- * variables under :root.light and :root.dark, never on bare :root, so every var() below
- * carries a fallback. The fallback repeats the light value.
- *
- * Two themes are covered: light and dark. purple takes the light values.
- */
-
-:root {
-	--fhc-cc-muted: #6c757d;
-	--fhc-cc-accent: var(--fhc-primary, #006095);
-	--fhc-cc-surface: var(--fhc-secondary, #f6f6f6);
-	--fhc-cc-hover: var(--fhc-tertiary, #e9ecef);
-	--fhc-cc-border: var(--fhc-border, #dee2e6);
-	--fhc-cc-radius: 0.3rem;
-}
-
-/* Two values need a step of their own. #006095 and #6c757d both fall under 3:1 on the
-   dark background, which is too little even for secondary text and for an icon. */
-:root.dark {
-	--fhc-cc-muted: var(--fhc-white-90, #aeb3b8);
-	--fhc-cc-accent: var(--fhc-blue-40, #61aed8);
-}
-
-/* --------------------------------------------------------------------------------- */
-/* The marker                                                                          */
-/* --------------------------------------------------------------------------------- */
-
-/* The marker stays in the DOM and wraps the component. scan.js empties it, Teleport
-   renders the component root into it. It is therefore the place for the outer spacing. */
-.fhc-contentcomponent {
-	display: block;
-	margin: 1.25rem 0;
-}
-
-.fhc-contentcomponent:first-child {
-	margin-top: 0;
-}
-
-.fhc-contentcomponent:last-child {
-	margin-bottom: 0;
-}
-
-.fhc-contentcomponent .alert {
-	margin-bottom: 0;
-}
-
-/* --------------------------------------------------------------------------------- */
-/* Person block                                                                        */
-/* --------------------------------------------------------------------------------- */
-
-/* PersonBlock.js. It carries person-block and every row of oe-personen. */
-.fhc-contentcomponent-person {
-	/* flow-root contains the floated photo. It spares the clearfix element, which the
-	   component does not render. */
-	display: flow-root;
-	padding: 0.75rem 1rem;
-	border: 1px solid var(--fhc-cc-border);
-	border-radius: var(--fhc-cc-radius);
-	background-color: var(--fhc-cc-surface);
-	/* The block carries mb-3. The gap of the two lists below owns the spacing instead,
-	   so the last block does not push the content under it. Bootstrap writes the utility
-	   with !important, so this needs it as well. */
-	margin-bottom: 0 !important;
-}
-
-/* The photo carries its width and its object-fit as an inline style. No rule here can
-   beat that, so only the placement is set. */
-.fhc-contentcomponent-person > img {
-	float: left;
-	margin-right: 1rem;
-	border-radius: var(--fhc-cc-radius);
-}
-
-/* The name. It is the first div, with or without a photo above it. */
-.fhc-contentcomponent-person > div:first-of-type {
-	font-size: 1.05em;
-	font-weight: 600;
-	line-height: 1.4;
-}
-
-/* Function, phone, room and mail. The mail and phone links keep the link colour. */
-.fhc-contentcomponent-person > div:not(:first-of-type) {
-	font-size: 0.95em;
-	color: var(--fhc-cc-muted);
-}
-
-/* --------------------------------------------------------------------------------- */
-/* oe-personen, person-block                                                           */
-/* --------------------------------------------------------------------------------- */
-
-.fhc-contentcomponent-oepersonen,
-.fhc-contentcomponent-personkontakt {
-	display: grid;
-	gap: 0.75rem;
-}
-
-/* --------------------------------------------------------------------------------- */
-/* dms-liste, dms-dokumente                                                            */
-/* --------------------------------------------------------------------------------- */
-
-/* Both render DokumentListe.js: ul.list-unstyled with one li per document. */
-.fhc-contentcomponent-dmsliste ul,
-.fhc-contentcomponent-dmsdokumente ul {
-	border: 1px solid var(--fhc-cc-border);
-	border-radius: var(--fhc-cc-radius);
-	/* Keeps the first and the last row inside the rounded corners. */
-	overflow: hidden;
-}
-
-.fhc-contentcomponent-dmsliste li,
-.fhc-contentcomponent-dmsdokumente li {
-	padding: 0.5rem 0.75rem;
-	border-top: 1px solid var(--fhc-cc-border);
-	/* The row carries mb-2. The line above separates the rows instead. */
-	margin-bottom: 0 !important;
-}
-
-.fhc-contentcomponent-dmsliste li:first-child,
-.fhc-contentcomponent-dmsdokumente li:first-child {
-	border-top: 0;
-}
-
-.fhc-contentcomponent-dmsliste li:hover,
-.fhc-contentcomponent-dmsdokumente li:hover {
-	background-color: var(--fhc-cc-surface);
-}
-
-/* The file type icon sits inside the link and would take the link colour. A fixed width
-   lines the names up over every row, whatever the icon is. */
-.fhc-contentcomponent-dmsliste li i,
-.fhc-contentcomponent-dmsdokumente li i {
-	width: 1.25rem;
-	margin-right: 0.25rem;
-	text-align: center;
-	color: var(--fhc-cc-accent);
-}
-
-.fhc-contentcomponent-dmsliste li a,
-.fhc-contentcomponent-dmsdokumente li a {
-	text-decoration: none;
-}
-
-.fhc-contentcomponent-dmsliste li a:hover,
-.fhc-contentcomponent-dmsliste li a:focus,
-.fhc-contentcomponent-dmsdokumente li a:hover,
-.fhc-contentcomponent-dmsdokumente li a:focus {
-	text-decoration: underline;
-}
-
-/* The description is the only block element in the row. It starts below the icon, so it
-   takes the width of the icon as an indent and lines up with the document name. */
-.fhc-contentcomponent-dmsliste li > div,
-.fhc-contentcomponent-dmsdokumente li > div {
-	padding-left: 1.5rem;
-}
-
-/* --------------------------------------------------------------------------------- */
-/* contentchild-menu                                                                   */
-/* --------------------------------------------------------------------------------- */
-
-/* The successor of the legacy menubox. The accent rule replaces its grey background as
-   the mark that says: this is a menu, not running text. */
-.fhc-contentcomponent-contentchildmenu ul {
-	padding: 0.5rem;
-	border-left: 3px solid var(--fhc-cc-accent);
-	border-radius: 0 var(--fhc-cc-radius) var(--fhc-cc-radius) 0;
-	background-color: var(--fhc-cc-surface);
-}
-
-.fhc-contentcomponent-contentchildmenu li {
-	/* The entry carries mb-1. The link padding owns the spacing instead. */
-	margin-bottom: 0 !important;
-}
-
-/* A block link makes the whole row the target, not the length of the title. */
-.fhc-contentcomponent-contentchildmenu a {
-	display: block;
-	padding: 0.35rem 0.5rem;
-	border-radius: var(--fhc-cc-radius);
-	text-decoration: none;
-}
-
-.fhc-contentcomponent-contentchildmenu a:hover,
-.fhc-contentcomponent-contentchildmenu a:focus {
-	background-color: var(--fhc-cc-hover);
-	text-decoration: underline;
-}

public/css/Cms.css

@@ -1,97 +0,0 @@
-/* Full-height shell. Without a height chain down to .cms-admin the page itself scrolls
-   and the tabs leave the screen while paging through the tree. */
-html,
-body {
-	height: 100%;
-}
-
-body {
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-}
-
-#main {
-	flex: 1 1 auto;
-	min-height: 0;
-}
-
-.cms-admin {
-	min-height: 0;
-}
-
-/* The split component only caps its height with max-height, so give it a definite one. */
-.cms-admin .horizontalsplit-container {
-	height: 100%;
-}
-
-.cms-admin .horizontalsplitted {
-	min-width: 0;
-	overscroll-behavior: contain;
-}
-
-.cms-admin-main {
-	min-width: 0;
-	overflow: hidden;
-}
-
-.cms-admin-tab-content {
-	min-height: 0;
-}
-
-/* Anchor for the overlay that blocks the view during a content switch. */
-.cms-admin {
-	position: relative;
-}
-
-.cms-admin-overlay {
-	position: absolute;
-	inset: 0;
-	z-index: 1050;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background: rgba(255, 255, 255, 0.6);
-	cursor: wait;
-}
-
-/* content locker to groups get a gold padlock - resembles legacy cms */
-.cms-tree-lock {
-	color: #f0c000;
-	text-shadow: 0 0 1px #8a6000;
-}
-
-/* A frame swallows the mouse events that reach it, so dragging the split handle over the
-   preview ends the drag. Both frames go through for the length of the drag, so the events
-   reach the page underneath. Only a drag sets this class, so the preview stays clickable
-   the rest of the time. */
-.cms-preview-dragging iframe {
-	pointer-events: none;
-}
-
-/* The path down to a search hit, and the subtree under it. Both are context, so they step
-   back and let the hit itself carry the normal weight. */
-.cms-tree-ancestor {
-	font-size: 0.8em;
-	color: #6c757d;
-	line-height: 1.4;
-}
-
-/* The path is context and keeps the grey, but it leads somewhere, so it underlines on
-   hover like any other link. */
-.cms-tree-ancestor a {
-	color: inherit;
-	text-decoration: none;
-}
-
-.cms-tree-ancestor a:hover,
-.cms-tree-ancestor a:focus {
-	color: var(--bs-link-color, #0d6efd);
-	text-decoration: underline;
-}
-
-.cms-tree-context > div > a,
-.cms-tree-context > div > span {
-	font-size: 0.85em;
-	color: #6c757d;
-}

public/css/Tabulator5.css

@@ -121,9 +121,8 @@
 	background-color: #000;
 }
 
-/* contrast: #777 reaches 4.48:1 on the odd and 4:1 on the even rows (#f2f2f2), #6c6c6c 5.3:1 and 4.7:1 */
 .tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
-	color: #6c6c6c !important;
+	color: #777 !important;
 }
 
 .tabulator-cell .btn {
@@ -157,23 +156,3 @@
 	color: #fff;
 	background: #1d68cd;
 }
-
-/* contrast (WCAG 1.4.11): tabulator_simple draws the inactive sort arrow in #bbb (1.9:1) and the
- * placeholder in #ccc (1.6:1). #8f8f8f (3.2:1) is close to the grey of the active arrow, so the
- * active arrow gets the primary color (6.8:1) */
-.tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-col-sorter .tabulator-arrow,
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="none"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-bottom-color: #8f8f8f;
-}
-
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="ascending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-bottom-color: var(--fhc-primary, #006095);
-}
-
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="descending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-top-color: var(--fhc-primary, #006095);
-}
-
-.tabulator .tabulator-tableholder .tabulator-placeholder .tabulator-placeholder-contents {
-	color: #6c757d;
-}